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

jenkinsci · Jul 6, 2011 · 27fdfa4 · 27fdfa4
1 parent ecee21a
commit 27fdfa4
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 5 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.23</version>
+      <version>1.24-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/checkstyle/tokens/CheckStyleResultTokenMacro.java b/src/main/java/hudson/plugins/checkstyle/tokens/CheckStyleResultTokenMacro.java
@@ -2,6 +2,7 @@
 
 import hudson.Extension;
 import hudson.plugins.analysis.tokens.AbstractResultTokenMacro;
+import hudson.plugins.checkstyle.CheckStyleMavenResultAction;
 import hudson.plugins.checkstyle.CheckStyleResultAction;
 
 /**
@@ -14,8 +15,9 @@ public class CheckStyleResultTokenMacro extends AbstractResultTokenMacro {
     /**
      * Creates a new instance of {@link CheckStyleResultTokenMacro}.
      */
+    @SuppressWarnings("unchecked")
     public CheckStyleResultTokenMacro() {
-        super(CheckStyleResultAction.class, "CHECKSTYLE_RESULT");
+        super("CHECKSTYLE_RESULT", CheckStyleResultAction.class, CheckStyleMavenResultAction.class);
     }
 }
 
diff --git a/src/main/java/hudson/plugins/checkstyle/tokens/CheckStyleWarningCountTokenMacro.java b/src/main/java/hudson/plugins/checkstyle/tokens/CheckStyleWarningCountTokenMacro.java
@@ -1,7 +1,8 @@
 package hudson.plugins.checkstyle.tokens;
 
 import hudson.Extension;
-import hudson.plugins.analysis.tokens.AbstractResultTokenMacro;
+import hudson.plugins.analysis.tokens.AbstractAnnotationsCountTokenMacro;
+import hudson.plugins.checkstyle.CheckStyleMavenResultAction;
 import hudson.plugins.checkstyle.CheckStyleResultAction;
 
 /**
@@ -10,12 +11,13 @@
  * @author Ulli Hafner
  */
 @Extension(optional = true)
-public class CheckStyleWarningCountTokenMacro extends AbstractResultTokenMacro {
+public class CheckStyleWarningCountTokenMacro extends AbstractAnnotationsCountTokenMacro {
     /**
      * Creates a new instance of {@link CheckStyleWarningCountTokenMacro}.
      */
+    @SuppressWarnings("unchecked")
     public CheckStyleWarningCountTokenMacro() {
-        super(CheckStyleResultAction.class, "CHECKSTYLE_COUNT");
+        super("CHECKSTYLE_COUNT", CheckStyleResultAction.class, CheckStyleMavenResultAction.class);
     }
 }
 
diff --git a/src/main/java/hudson/plugins/checkstyle/tokens/FixedCheckStyleWarningsTokenMacro.java b/src/main/java/hudson/plugins/checkstyle/tokens/FixedCheckStyleWarningsTokenMacro.java
@@ -0,0 +1,23 @@
+package hudson.plugins.checkstyle.tokens;
+
+import hudson.Extension;
+import hudson.plugins.analysis.tokens.AbstractFixedAnnotationsTokenMacro;
+import hudson.plugins.checkstyle.CheckStyleMavenResultAction;
+import hudson.plugins.checkstyle.CheckStyleResultAction;
+
+/**
+ * Provides a token that evaluates to the number of fixed Checkstyle warnings.
+ *
+ * @author Ulli Hafner
+ */
+@Extension(optional = true)
+public class FixedCheckStyleWarningsTokenMacro extends AbstractFixedAnnotationsTokenMacro {
+    /**
+     * Creates a new instance of {@link FixedCheckStyleWarningsTokenMacro}.
+     */
+    @SuppressWarnings("unchecked")
+    public FixedCheckStyleWarningsTokenMacro() {
+        super("CHECKSTYLE_FIXED", CheckStyleResultAction.class, CheckStyleMavenResultAction.class);
+    }
+}
+
diff --git a/src/main/java/hudson/plugins/checkstyle/tokens/NewCheckStyleWarnningsTokenMacro.java b/src/main/java/hudson/plugins/checkstyle/tokens/NewCheckStyleWarnningsTokenMacro.java
@@ -0,0 +1,23 @@
+package hudson.plugins.checkstyle.tokens;
+
+import hudson.Extension;
+import hudson.plugins.analysis.tokens.AbstractNewAnnotationsTokenMacro;
+import hudson.plugins.checkstyle.CheckStyleMavenResultAction;
+import hudson.plugins.checkstyle.CheckStyleResultAction;
+
+/**
+ * Provides a token that evaluates to the number of new Checkstyle warnings.
+ *
+ * @author Ulli Hafner
+ */
+@Extension(optional = true)
+public class NewCheckStyleWarnningsTokenMacro extends AbstractNewAnnotationsTokenMacro {
+    /**
+     * Creates a new instance of {@link NewCheckStyleWarnningsTokenMacro}.
+     */
+    @SuppressWarnings("unchecked")
+    public NewCheckStyleWarnningsTokenMacro() {
+        super("CHECKSTYLE_NEW", CheckStyleResultAction.class, CheckStyleMavenResultAction.class);
+    }
+}
+
diff --git a/...n/resources/hudson/plugins/checkstyle/tokens/FixedCheckStyleWarningsTokenMacro/help.jelly b/...n/resources/hudson/plugins/checkstyle/tokens/FixedCheckStyleWarningsTokenMacro/help.jelly
@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core">
+
+  <dt>$${CHECKSTYLE_FIXED}</dt>
+  <dd>
+    Expands to the total number of fixed Checkstyle warnings in a build.
+  </dd>
+
+</j:jelly>
diff --git a/...ain/resources/hudson/plugins/checkstyle/tokens/NewCheckStyleWarningsTokenMacro/help.jelly b/...ain/resources/hudson/plugins/checkstyle/tokens/NewCheckStyleWarningsTokenMacro/help.jelly
@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core">
+
+  <dt>$${CHECKSTYLE_NEW}</dt>
+  <dd>
+    Expands to the total number of new Checkstyle warnings in a build.
+  </dd>
+
+</j:jelly>