diff options
author | Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com> | 2013-04-16 15:35:56 +0200 |
---|---|---|
committer | Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com> | 2013-04-16 15:35:56 +0200 |
commit | 0375b26acba1f97b715864a52c08dca3b9413b72 (patch) | |
tree | ce28983a06e9bd106e2d800da617e5d832a5b019 /sonar-server | |
parent | bd54127720ea1254ea838c8fdb8cddabecc67002 (diff) | |
download | sonarqube-0375b26acba1f97b715864a52c08dca3b9413b72.tar.gz sonarqube-0375b26acba1f97b715864a52c08dca3b9413b72.zip |
SONAR-3893 HTML source decoration using both syntax highlighting and symbol data
Diffstat (limited to 'sonar-server')
-rw-r--r-- | sonar-server/src/main/java/org/sonar/server/platform/Platform.java | 4 | ||||
-rw-r--r-- | sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java | 4 |
2 files changed, 4 insertions, 4 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 727c65eeb49..caf57e60754 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 @@ -57,7 +57,7 @@ import org.sonar.core.persistence.SemaphoresImpl; import org.sonar.core.qualitymodel.DefaultModelFinder; import org.sonar.core.resource.DefaultResourcePermissions; import org.sonar.core.rule.DefaultRuleFinder; -import org.sonar.core.source.SourceDecorator; +import org.sonar.core.source.HtmlSourceDecorator; import org.sonar.core.test.TestPlanPerspectiveLoader; import org.sonar.core.test.TestablePerspectiveLoader; import org.sonar.core.timemachine.Periods; @@ -274,7 +274,7 @@ public final class Platform { servicesContainer.addSingleton(TestablePerspectiveLoader.class); servicesContainer.addSingleton(TestPlanPerspectiveLoader.class); servicesContainer.addSingleton(SnapshotPerspectives.class); - servicesContainer.addSingleton(SourceDecorator.class); + servicesContainer.addSingleton(HtmlSourceDecorator.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 934320ab8bf..9155ed6da24 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 @@ -56,7 +56,7 @@ import org.sonar.core.persistence.DryRunDatabaseFactory; import org.sonar.core.purge.PurgeDao; import org.sonar.core.resource.ResourceIndexerDao; import org.sonar.core.resource.ResourceKeyUpdaterDao; -import org.sonar.core.source.SourceDecorator; +import org.sonar.core.source.HtmlSourceDecorator; import org.sonar.core.timemachine.Periods; import org.sonar.core.workflow.WorkflowEngine; import org.sonar.markdown.Markdown; @@ -561,7 +561,7 @@ public final class JRubyFacade { } public Collection<String> getHighlightedSourceLines(long snapshotId) { - return get(SourceDecorator.class).getDecoratedSourceAsHtml(snapshotId); + return get(HtmlSourceDecorator.class).getDecoratedSourceAsHtml(snapshotId); } // public IssueFilter getIssueFilter() { |