[JENKINS-12424] Use messages from base class.

jenkinsci · May 8, 2012 · fbbb1fe · fbbb1fe · buildhive · May 8, 2012
1 parent 527bd3e
commit fbbb1fe
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 292 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -40,7 +40,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/plugin/src/main/java/hudson/plugins/findbugs/FindBugsResult.java b/plugin/src/main/java/hudson/plugins/findbugs/FindBugsResult.java
@@ -100,7 +100,12 @@ protected void configure(final XStream xstream) {
 
     @Override
     public String getSummary() {
-        return ResultSummary.createSummary(this);
+        return "FindBugs: " + createDefaultSummary(FindBugsDescriptor.RESULT_URL, getNumberOfAnnotations(), getNumberOfModules());
+    }
+
+    @Override
+    protected String createDeltaMessage() {
+        return createDefaultDeltaMessage(FindBugsDescriptor.RESULT_URL, getNumberOfNewWarnings(), getNumberOfFixedWarnings());
     }
 
     /**
@@ -121,11 +126,6 @@ public int getNotInCloud() {
         return notInCloud;
     }
 
-    @Override
-    protected String createDeltaMessage() {
-        return ResultSummary.createDeltaMessage(this);
-    }
-
     @Override
     protected String getSerializationFileName() {
         return "findbugs-warnings.xml";

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

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

diff --git a/plugin/src/main/resources/hudson/plugins/findbugs/Messages_ja.properties b/plugin/src/main/resources/hudson/plugins/findbugs/Messages_ja.properties
@@ -4,15 +4,6 @@ FindBugs.ProjectAction.Name=FindBugs\u8b66\u544a
 
 FindBugs.Trend.Name=FindBugs\u8b66\u544a\u306e\u63a8\u79fb
 
-FindBugs.ResultAction.OneWarning=1\u500b\u306e\u8b66\u544a
-FindBugs.ResultAction.MultipleWarnings={0}\u500b\u306e\u8b66\u544a
-FindBugs.ResultAction.OneNewWarning=1\u500b\u306e\u65b0\u3057\u3044\u8b66\u544a
-FindBugs.ResultAction.MultipleNewWarnings={0}\u500b\u306e\u65b0\u3057\u3044\u8b66\u544a
-FindBugs.ResultAction.OneFixedWarning=1\u500b\u306e\u4fee\u6b63\u3055\u308c\u305f\u8b66\u544a
-FindBugs.ResultAction.MultipleFixedWarnings={0}\u500b\u306e\u4fee\u6b63\u3055\u308c\u305f\u8b66\u544a
-FindBugs.ResultAction.OneFile=\u304c\u30011\u500b\u306eFindBugs\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002
-FindBugs.ResultAction.MultipleFiles=\u304c\u3001{0}\u500b\u306eFindBugs\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002
-
 FindBugs.ResultAction.HealthReportNoItem=FindBugs: \u8b66\u544a\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 FindBugs.ResultAction.HealthReportSingleItem=FindBugs: 1\u500b\u306e\u8b66\u544a\u304c\u3042\u308a\u307e\u3059\u3002
 FindBugs.ResultAction.HealthReportMultipleItem=FindBugs: {0}\u500b\u306e\u8b66\u544a\u304c\u3042\u308a\u307e\u3059\u3002

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