[FIXED JENKINS-10027] Added new tokens for new and fixed warnings.

jenkinsci · Jul 6, 2011 · 716e061 · 716e061
1 parent 5b1b2c0
commit 716e061
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>analysis-core</artifactId>
-      <version>1.23</version>
+      <version>1.24-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/analysis/collector/tokens/FixedWarningsCountTokenMacro.java b/src/main/java/hudson/plugins/analysis/collector/tokens/FixedWarningsCountTokenMacro.java
@@ -0,0 +1,22 @@
+package hudson.plugins.analysis.collector.tokens;
+
+import hudson.Extension;
+import hudson.plugins.analysis.collector.AnalysisResultAction;
+import hudson.plugins.analysis.tokens.AbstractFixedAnnotationsTokenMacro;
+
+/**
+ * Provides a token that evaluates to the number of new warnings.
+ *
+ * @author Ulli Hafner
+ */
+@Extension(optional = true)
+public class FixedWarningsCountTokenMacro extends AbstractFixedAnnotationsTokenMacro {
+    /**
+     * Creates a new instance of {@link FixedWarningsCountTokenMacro}.
+     */
+    @SuppressWarnings("unchecked")
+    public FixedWarningsCountTokenMacro() {
+        super("ANALYSIS_FIXED", AnalysisResultAction.class);
+    }
+}
+
diff --git a/src/main/java/hudson/plugins/analysis/collector/tokens/NewWarningsCountTokenMacro.java b/src/main/java/hudson/plugins/analysis/collector/tokens/NewWarningsCountTokenMacro.java
@@ -0,0 +1,22 @@
+package hudson.plugins.analysis.collector.tokens;
+
+import hudson.Extension;
+import hudson.plugins.analysis.collector.AnalysisResultAction;
+import hudson.plugins.analysis.tokens.AbstractNewAnnotationsTokenMacro;
+
+/**
+ * Provides a token that evaluates to the number of new warnings.
+ *
+ * @author Ulli Hafner
+ */
+@Extension(optional = true)
+public class NewWarningsCountTokenMacro extends AbstractNewAnnotationsTokenMacro {
+    /**
+     * Creates a new instance of {@link NewWarningsCountTokenMacro}.
+     */
+    @SuppressWarnings("unchecked")
+    public NewWarningsCountTokenMacro() {
+        super("ANALYSIS_NEW", AnalysisResultAction.class);
+    }
+}
+
diff --git a/src/main/java/hudson/plugins/analysis/collector/tokens/WarningsCountTokenMacro.java b/src/main/java/hudson/plugins/analysis/collector/tokens/WarningsCountTokenMacro.java
@@ -2,20 +2,21 @@
 
 import hudson.Extension;
 import hudson.plugins.analysis.collector.AnalysisResultAction;
-import hudson.plugins.analysis.tokens.AbstractResultTokenMacro;
+import hudson.plugins.analysis.tokens.AbstractAnnotationsCountTokenMacro;
 
 /**
  * Provides a token that evaluates to the number of warnings.
  *
  * @author Ulli Hafner
  */
 @Extension(optional = true)
-public class WarningsCountTokenMacro extends AbstractResultTokenMacro {
+public class WarningsCountTokenMacro extends AbstractAnnotationsCountTokenMacro {
     /**
      * Creates a new instance of {@link WarningsCountTokenMacro}.
      */
+    @SuppressWarnings("unchecked")
     public WarningsCountTokenMacro() {
-        super(AnalysisResultAction.class, "ANALYSIS_COUNT");
+        super("ANALYSIS_COUNT", AnalysisResultAction.class);
     }
 }
 
diff --git a/src/main/java/hudson/plugins/analysis/collector/tokens/WarningsResultTokenMacro.java b/src/main/java/hudson/plugins/analysis/collector/tokens/WarningsResultTokenMacro.java
@@ -14,8 +14,9 @@ public class WarningsResultTokenMacro extends AbstractResultTokenMacro {
     /**
      * Creates a new instance of {@link WarningsResultTokenMacro}.
      */
+    @SuppressWarnings("unchecked")
     public WarningsResultTokenMacro() {
-        super(WarningsResultAction.class, "ANALYSIS_RESULT");
+        super("ANALYSIS_RESULT", WarningsResultAction.class);
     }
 }
 
diff --git a/...esources/hudson/plugins/analysis/collector/tokens/FixedWarningsCountTokenMacro/help.jelly b/...esources/hudson/plugins/analysis/collector/tokens/FixedWarningsCountTokenMacro/help.jelly
@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core">
+
+  <dt>$${ANALYSIS_FIXED}</dt>
+  <dd>
+    Expands to the total number of new warnings in a build.
+  </dd>
+
+</j:jelly>
diff --git a/.../resources/hudson/plugins/analysis/collector/tokens/NewWarningsCountTokenMacro/help.jelly b/.../resources/hudson/plugins/analysis/collector/tokens/NewWarningsCountTokenMacro/help.jelly
@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core">
+
+  <dt>$${ANALYSIS_NEW}</dt>
+  <dd>
+    Expands to the total number of new warnings in a build.
+  </dd>
+
+</j:jelly>
diff --git a/...tokens/WarningsCountTokenMacro/help.jelly → ...tokens/WarningsCountTokenMacro/help.jelly b/...tokens/WarningsCountTokenMacro/help.jelly → ...tokens/WarningsCountTokenMacro/help.jelly
diff --git a/...okens/WarningsResultTokenMacro/help.jelly → ...okens/WarningsResultTokenMacro/help.jelly b/...okens/WarningsResultTokenMacro/help.jelly → ...okens/WarningsResultTokenMacro/help.jelly