diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-01-29 09:51:25 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-01-29 09:51:25 +0100 |
| commit | 62806519276a867d5f243f18fc5e8b12e34f5b69 (patch) | |
| tree | 6a7678d560052c5043f189c48cdc21957cc2f50f /sonar-server | |
| parent | cc8788c9ea25a29e55aadab81d3468c9ee74c9aa (diff) | |
| download | sonarqube-62806519276a867d5f243f18fc5e8b12e34f5b69.tar.gz sonarqube-62806519276a867d5f243f18fc5e8b12e34f5b69.zip | |
SONAR-2501 refactor BeanGraph layer
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/java/org/sonar/server/platform/Platform.java | 9 | ||||
| -rw-r--r-- | sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index f87b6a1b68d..7d94eaf2e81 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -36,9 +36,7 @@ import org.sonar.api.utils.TimeProfiler; import org.sonar.api.utils.UriReader; import org.sonar.api.workflow.internal.DefaultWorkflow; import org.sonar.core.PicoUtils; -import org.sonar.core.component.ComponentGraph; -import org.sonar.core.component.PerspectiveBuilders; -import org.sonar.core.component.PerspectiveLoaders; +import org.sonar.core.component.SnapshotPerspectives; import org.sonar.core.config.Logback; import org.sonar.core.i18n.GwtI18n; import org.sonar.core.i18n.I18nManager; @@ -261,11 +259,10 @@ public final class Platform { servicesContainer.addSingleton(DefaultNotificationManager.class); servicesContainer.addSingleton(ReviewsNotificationManager.class); - servicesContainer.addSingleton(ComponentGraph.class); + // graphs servicesContainer.addSingleton(TestPlanBuilder.class); servicesContainer.addSingleton(TestableBuilder.class); - servicesContainer.addSingleton(PerspectiveBuilders.class); - servicesContainer.addSingleton(PerspectiveLoaders.class); + servicesContainer.addSingleton(SnapshotPerspectives.class); ServerExtensionInstaller extensionRegistrar = servicesContainer.getComponentByType(ServerExtensionInstaller.class); extensionRegistrar.registerExtensions(servicesContainer); diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 91ad3935e97..99edfc505a1 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -36,6 +36,7 @@ import org.sonar.api.resources.ResourceType; import org.sonar.api.resources.ResourceTypes; import org.sonar.api.rules.RulePriority; import org.sonar.api.rules.RuleRepository; +import org.sonar.api.test.MutableTestPlan; import org.sonar.api.test.TestPlan; import org.sonar.api.utils.ValidationMessages; import org.sonar.api.web.Footer; @@ -47,7 +48,7 @@ import org.sonar.api.workflow.Review; import org.sonar.api.workflow.internal.DefaultReview; import org.sonar.api.workflow.internal.DefaultWorkflowContext; import org.sonar.api.workflow.screen.Screen; -import org.sonar.core.component.PerspectiveLoaders; +import org.sonar.core.component.SnapshotPerspectives; import org.sonar.core.i18n.RuleI18nManager; import org.sonar.core.measure.MeasureFilterEngine; import org.sonar.core.measure.MeasureFilterResult; @@ -542,7 +543,7 @@ public final class JRubyFacade { } public TestPlan getTestPlan(long snapshotId) { - return (TestPlan) get(PerspectiveLoaders.class).as(snapshotId, "testplan"); + return get(SnapshotPerspectives.class).as(MutableTestPlan.class, snapshotId); } } |