[JENKINS-12424] Use messages from base class.

jenkinsci · May 8, 2012 · c9863ac · c9863ac · buildhive · May 8, 2012
1 parent c6fd177
commit c9863ac
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 299 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,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/checkstyle/CheckStyleResult.java b/src/main/java/hudson/plugins/checkstyle/CheckStyleResult.java
@@ -68,19 +68,14 @@ protected void configure(final XStream xstream) {
         xstream.alias("warning", Warning.class);
     }
 
-    /**
-     * Returns a summary message for the summary.jelly file.
-     *
-     * @return the summary message
-     */
     @Override
     public String getSummary() {
-        return ResultSummary.createSummary(this);
+        return "Checkstyle: " + createDefaultSummary(CheckStyleDescriptor.RESULT_URL, getNumberOfAnnotations(), getNumberOfModules());
     }
 
     @Override
     protected String createDeltaMessage() {
-        return ResultSummary.createDeltaMessage(this);
+        return createDefaultDeltaMessage(CheckStyleDescriptor.RESULT_URL, getNumberOfNewWarnings(), getNumberOfFixedWarnings());
     }
 
     /**

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

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

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

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