[JENKINS-12424] Use messages from base class.

jenkinsci · May 8, 2012 · 3b34bf6 · 3b34bf6 · buildhive · May 8, 2012
1 parent 8eab2e0
commit 3b34bf6
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 285 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>analysis-core</artifactId>
-      <version>1.40</version>
+      <version>1.41-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/hudson/plugins/dry/DryResult.java b/src/main/java/hudson/plugins/dry/DryResult.java
@@ -70,12 +70,13 @@ protected void configure(final XStream xstream) {
 
     @Override
     public String getSummary() {
-        return ResultSummary.createSummary(this);
+        return Messages.DRY_ProjectAction_Name() + ": "
+                + createDefaultSummary(DryDescriptor.RESULT_URL, getNumberOfAnnotations(), getNumberOfModules());
     }
 
     @Override
     protected String createDeltaMessage() {
-        return ResultSummary.createDeltaMessage(this);
+        return createDefaultDeltaMessage(DryDescriptor.RESULT_URL, getNumberOfNewWarnings(), getNumberOfFixedWarnings());
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/dry/ResultSummary.java b/src/main/java/hudson/plugins/dry/ResultSummary.java
diff --git a/src/main/resources/hudson/plugins/dry/Messages.properties b/src/main/resources/hudson/plugins/dry/Messages.properties
@@ -7,14 +7,6 @@ DRY.Warning.Type=Duplicate Code
 DRY.Trend.Name=Duplicate Code Trend
 
 DRY.ResultAction.Header=Duplicate Code Result
-DRY.ResultAction.OneWarning=1 warning
-DRY.ResultAction.MultipleWarnings={0} warnings
-DRY.ResultAction.OneNewWarning=1 new warning
-DRY.ResultAction.MultipleNewWarnings={0} new warnings
-DRY.ResultAction.OneFixedWarning=1 fixed warning
-DRY.ResultAction.MultipleFixedWarnings={0} fixed warnings
-DRY.ResultAction.OneFile=from one analysis.
-DRY.ResultAction.MultipleFiles=from {0} analyses.
 
 DRY.ResultAction.HealthReportNoItem=Duplicate code: no warnings found.
 DRY.ResultAction.HealthReportSingleItem=Duplicate code: one warning found.

diff --git a/src/main/resources/hudson/plugins/dry/Messages_de.properties b/src/main/resources/hudson/plugins/dry/Messages_de.properties
@@ -7,14 +7,6 @@ DRY.Warning.Type=Duplizierter Quelltext
 DRY.Trend.Name=Duplizierter Quelltext Trend
 
 DRY.ResultAction.Header=Duplizierter Quelltext Ergebnis
-DRY.ResultAction.OneWarning=eine Warnung
-DRY.ResultAction.MultipleWarnings={0} Warnungen
-DRY.ResultAction.OneNewWarning=eine neue Warnung
-DRY.ResultAction.MultipleNewWarnings={0} neue Warnungen
-DRY.ResultAction.OneFixedWarning=eine behobene Warnung
-DRY.ResultAction.MultipleFixedWarnings={0} behobene Warnungen
-DRY.ResultAction.OneFile=aus einer Analyse-Datei.
-DRY.ResultAction.MultipleFiles=aus {0} Analyse-Dateien.
 
 DRY.ResultAction.HealthReportNoItem=Duplizierter Quelltext: Keine Warnungen gefunden.
 DRY.ResultAction.HealthReportSingleItem=Duplizierter Quelltext: Eine Warnung gefunden.

diff --git a/src/main/resources/hudson/plugins/dry/Messages_ja.properties b/src/main/resources/hudson/plugins/dry/Messages_ja.properties
@@ -10,14 +10,6 @@ DRY.ResultAction.OneHighScore=\u8B66\u544A0\u7D99\u7D9A\u4E2D: \u6628\u65E5\u304
 DRY.ResultAction.MultipleHighScore=\u8B66\u544A0\u7D99\u7D9A\u4E2D: {0}\u65E5\u9593\u91CD\u8907\u30B3\u30FC\u30C9\u306E\u8B66\u544A\u306F\u3042\u308A\u307E\u305B\u3093!
 DRY.ResultAction.OneNoHighScore=\u3042\u30681\u65E5\u3067\u8B66\u544A0\u306E\u7D99\u7D9A\u8A18\u9332\u306B\u4E26\u3073\u307E\u3059\u3002
 DRY.ResultAction.MultipleNoHighScore=\u3042\u3068{0}\u65E5\u3067\u8B66\u544A0\u306E\u7D99\u7D9A\u8A18\u9332\u306B\u4E26\u3073\u307E\u3059\u3002
-DRY.ResultAction.OneWarning=1 \u500B\u306E\u8B66\u544A
-DRY.ResultAction.MultipleWarnings={0} \u500B\u306E\u8B66\u544A
-DRY.ResultAction.OneNewWarning=1 \u500B\u306E\u65B0\u3057\u3044\u8B66\u544A
-DRY.ResultAction.MultipleNewWarnings={0} \u500B\u306E\u65B0\u3057\u3044\u8B66\u544A
-DRY.ResultAction.OneFixedWarning=1 \u500B\u306E\u4FEE\u6B63\u3055\u308C\u305F\u8B66\u544A
-DRY.ResultAction.MultipleFixedWarnings={0} \u500B\u306E\u4FEE\u6B63\u3055\u308C\u305F\u8B66\u544A
-DRY.ResultAction.OneFile=\u304C\u30011\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-DRY.ResultAction.MultipleFiles=\u304C\u3001{0} \u500B\u306E\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
 
 DRY.ResultAction.HealthReportNoItem=\u91CD\u8907\u30B3\u30FC\u30C9: \u8B66\u544A\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 DRY.ResultAction.HealthReportSingleItem=\u91CD\u8907\u30B3\u30FC\u30C9:\u8B66\u544A\u304C1\u3064\u3042\u308A\u307E\u3059\u3002

diff --git a/src/test/java/hudson/plugins/dry/ResultSummaryTest.java b/src/test/java/hudson/plugins/dry/ResultSummaryTest.java