[JENKINS-12424] Use messages from base class.

jenkinsci · May 8, 2012 · 933785d · 933785d · buildhive · May 8, 2012
1 parent 1f64808
commit 933785d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 293 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,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.jvnet.hudson.plugins</groupId>

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

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

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

diff --git a/src/main/resources/hudson/plugins/pmd/Messages_fr.properties b/src/main/resources/hudson/plugins/pmd/Messages_fr.properties
@@ -4,13 +4,5 @@ PMD.ProjectAction.Name=R
 
 PMD.ResultAction.Header=R\u00E9sultat de PMD
 PMD.ResultAction.NoWarningsSince=Pas de warnings depuis le build {0}
-PMD.ResultAction.OneWarning=1 warning
-PMD.ResultAction.MultipleWarnings={0} warnings
-PMD.ResultAction.OneNewWarning=1 nouveau warning
-PMD.ResultAction.MultipleNewWarnings={0} nouveaux warnings
-PMD.ResultAction.OneFixedWarning=1 warning corrigé
-PMD.ResultAction.MultipleFixedWarnings={0} warnings corrigés
-PMD.ResultAction.OneFile=dans 1 fichier PMD.
-PMD.ResultAction.MultipleFiles=dans {0} fichiers PMD.
 PMD.ResultAction.HealthReportSingleItem=PMD: 1 warning découvert.
 PMD.ResultAction.HealthReportMultipleItem=PMD: {0} warnings découverts.
diff --git a/src/main/resources/hudson/plugins/pmd/Messages_ja.properties b/src/main/resources/hudson/plugins/pmd/Messages_ja.properties
@@ -5,15 +5,6 @@ PMD.ProjectAction.Name=PMD\u8B66\u544A
 PMD.Trend.Name=PMD\u8B66\u544A\u306E\u63A8\u79FB
 
 PMD.ResultAction.Header=PMD \u8B66\u544A
-PMD.ResultAction.OneWarning=1 \u500B\u306E\u8B66\u544A
-PMD.ResultAction.MultipleWarnings={0} \u500B\u306E\u8B66\u544A
-PMD.ResultAction.OneNewWarning=1 \u500B\u306E\u65B0\u3057\u3044\u8B66\u544A
-PMD.ResultAction.MultipleNewWarnings={0} \u500B\u306E\u65B0\u3057\u3044\u8B66\u544A
-PMD.ResultAction.OneFixedWarning=1 \u500B\u306E\u4FEE\u6B63\u3055\u308C\u305F\u8B66\u544A
-PMD.ResultAction.MultipleFixedWarnings={0} \u500B\u306E\u4FEE\u6B63\u3055\u308C\u305F\u8B66\u544A
-PMD.ResultAction.OneFile=\u304C\u30011\u3064\u306EPMD\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-PMD.ResultAction.MultipleFiles=\u304C\u3001{0} \u500B\u306EPMD\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-
 PMD.ResultAction.HealthReportNoItem=PMD: \u8B66\u544A\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 PMD.ResultAction.HealthReportSingleItem=PMD: \u8B66\u544A\u304C1\u3064\u3042\u308A\u307E\u3059\u3002
 PMD.ResultAction.HealthReportMultipleItem=PMD: {0} \u500B\u306E\u8B66\u544A\u304C\u3042\u308A\u307E\u3059\u3002

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