From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 30 Jun 2014 06:17:33 +0000 (+0600)
Subject: SONAR-5209 Duplications inside deleted resources
X-Git-Tag: 4.4-RC1~110
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0047b0489f6e87d951c0d2836499f48e3a2ea04a;p=sonarqube.git

SONAR-5209 Duplications inside deleted resources
---

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 302023e7cec..0e99bdfbadc 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1343,6 +1343,7 @@ issues_viewer.issue_filter.unplanned=Unplanned
 
 duplications.no_duplicated_block=No duplicated blocks.
 duplications.dups_found_on_deleted_resource=This file contains duplicated blocks with some deleted resources. This project should be reanalyzed to remove these obsolete duplicated blocks.
+duplications.block_was_duplicated_by_a_deleted_resource=This block was duplicated by a resource that has been deleted.
 duplications.old_format_should_reanalyze=This file contains duplications but a new analysis must be done in order to be able to display them.
 duplications.blocks=Blocks
 duplications.number_of_lines=Nb Lines
diff --git a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs b/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs
index fcc21de99c5..5ca853ca564 100644
--- a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs
@@ -20,6 +20,8 @@
         {{/joinEach}}
       </div>
     </div>
+  {{else}}
+    {{t 'duplications.block_was_duplicated_by_a_deleted_resource'}}
   {{/each}}
 </div>
 
diff --git a/sonar-server/src/main/hbs/component-viewer/source.hbs b/sonar-server/src/main/hbs/component-viewer/source.hbs
index 7105d7739cb..1e7a2b40766 100644
--- a/sonar-server/src/main/hbs/component-viewer/source.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/source.hbs
@@ -1,11 +1,11 @@
 {{#if state.sourceSecurity}}
 
-<p>{{t 'code_viewer.no_source_code_displayed_due_to_security'}}</p>
+  <p>{{t 'code_viewer.no_source_code_displayed_due_to_security'}}</p>
 
 {{else}}
 
   {{#if state.duplicationsInDeletedFiles}}
-      <p>{{t 'duplications.dups_found_on_deleted_resource'}}</p>
+    <p class="marginbottom10">{{t 'duplications.dups_found_on_deleted_resource'}}</p>
   {{/if}}
 
   <table class="code">