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

jenkinsci · Jul 6, 2011 · 30fcd3e · 30fcd3e
1 parent 20fe69e
commit 30fcd3e
Show file tree

Hide file tree

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

diff --git a/src/main/java/hudson/plugins/dry/tokens/DryResultTokenMacro.java b/src/main/java/hudson/plugins/dry/tokens/DryResultTokenMacro.java
@@ -2,6 +2,7 @@
 
 import hudson.Extension;
 import hudson.plugins.analysis.tokens.AbstractResultTokenMacro;
+import hudson.plugins.dry.DryMavenResultAction;
 import hudson.plugins.dry.DryResultAction;
 
 /**
@@ -14,8 +15,9 @@ public class DryResultTokenMacro extends AbstractResultTokenMacro {
     /**
      * Creates a new instance of {@link DryResultTokenMacro}.
      */
+    @SuppressWarnings("unchecked")
     public DryResultTokenMacro() {
-        super(DryResultAction.class, "DRY_RESULT");
+        super("DRY_RESULT", DryResultAction.class, DryMavenResultAction.class);
     }
 }
 
diff --git a/src/main/java/hudson/plugins/dry/tokens/DryWarningCountTokenMacro.java b/src/main/java/hudson/plugins/dry/tokens/DryWarningCountTokenMacro.java
@@ -1,7 +1,8 @@
 package hudson.plugins.dry.tokens;
 
 import hudson.Extension;
-import hudson.plugins.analysis.tokens.AbstractResultTokenMacro;
+import hudson.plugins.analysis.tokens.AbstractAnnotationsCountTokenMacro;
+import hudson.plugins.dry.DryMavenResultAction;
 import hudson.plugins.dry.DryResultAction;
 
 /**
@@ -10,12 +11,13 @@
  * @author Ulli Hafner
  */
 @Extension(optional = true)
-public class DryWarningCountTokenMacro extends AbstractResultTokenMacro {
+public class DryWarningCountTokenMacro extends AbstractAnnotationsCountTokenMacro {
     /**
      * Creates a new instance of {@link DryWarningCountTokenMacro}.
      */
+    @SuppressWarnings("unchecked")
     public DryWarningCountTokenMacro() {
-        super(DryResultAction.class, "DRY_COUNT");
+        super("DRY_COUNT", DryResultAction.class, DryMavenResultAction.class);
     }
 }
 
diff --git a/src/main/java/hudson/plugins/dry/tokens/FixedDryWarningsTokenMacro.java b/src/main/java/hudson/plugins/dry/tokens/FixedDryWarningsTokenMacro.java
@@ -0,0 +1,23 @@
+package hudson.plugins.dry.tokens;
+
+import hudson.Extension;
+import hudson.plugins.analysis.tokens.AbstractFixedAnnotationsTokenMacro;
+import hudson.plugins.dry.DryMavenResultAction;
+import hudson.plugins.dry.DryResultAction;
+
+/**
+ * Provides a token that evaluates to the number of fixed duplicate code warnings.
+ *
+ * @author Ulli Hafner
+ */
+@Extension(optional = true)
+public class FixedDryWarningsTokenMacro extends AbstractFixedAnnotationsTokenMacro {
+    /**
+     * Creates a new instance of {@link FixedDryWarningsTokenMacro}.
+     */
+    @SuppressWarnings("unchecked")
+    public FixedDryWarningsTokenMacro() {
+        super("DRY_FIXED", DryResultAction.class, DryMavenResultAction.class);
+    }
+}
+
diff --git a/src/main/java/hudson/plugins/dry/tokens/NewDryWarningsTokenMacro.java b/src/main/java/hudson/plugins/dry/tokens/NewDryWarningsTokenMacro.java
@@ -0,0 +1,23 @@
+package hudson.plugins.dry.tokens;
+
+import hudson.Extension;
+import hudson.plugins.analysis.tokens.AbstractNewAnnotationsTokenMacro;
+import hudson.plugins.dry.DryMavenResultAction;
+import hudson.plugins.dry.DryResultAction;
+
+/**
+ * Provides a token that evaluates to the number of new duplicate code warnings.
+ *
+ * @author Ulli Hafner
+ */
+@Extension(optional = true)
+public class NewDryWarningsTokenMacro extends AbstractNewAnnotationsTokenMacro {
+    /**
+     * Creates a new instance of {@link NewDryWarningsTokenMacro}.
+     */
+    @SuppressWarnings("unchecked")
+    public NewDryWarningsTokenMacro() {
+        super("DRY_NEW", DryResultAction.class, DryMavenResultAction.class);
+    }
+}
+
diff --git a/src/main/resources/hudson/plugins/dry/tokens/DryResultTokenMacro/help.jelly b/src/main/resources/hudson/plugins/dry/tokens/DryResultTokenMacro/help.jelly
@@ -2,7 +2,7 @@
 
   <dt>$${DRY_RESULT}</dt>
   <dd>
-    Expands to the build result of the DRY plug-in.
+    Expands to the build result of the duplicate code scanner plug-in.
   </dd>
 
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/dry/tokens/DryWarningCountTokenMacro/help.jelly b/src/main/resources/hudson/plugins/dry/tokens/DryWarningCountTokenMacro/help.jelly
@@ -2,7 +2,7 @@
 
   <dt>$${DRY_COUNT}</dt>
   <dd>
-    Expands to the total number of DRY warnings in a build.
+    Expands to the total number of duplicate code warnings in a build.
   </dd>
 
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/dry/tokens/FixedDryWarningsTokenMacro/help.jelly b/src/main/resources/hudson/plugins/dry/tokens/FixedDryWarningsTokenMacro/help.jelly
@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core">
+
+  <dt>$${DRY_FIXED}</dt>
+  <dd>
+    Expands to the total number of fixed duplicate code warnings in a build.
+  </dd>
+
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/dry/tokens/NewDryWarningsTokenMacro/help.jelly b/src/main/resources/hudson/plugins/dry/tokens/NewDryWarningsTokenMacro/help.jelly
@@ -0,0 +1,8 @@
+<j:jelly xmlns:j="jelly:core">
+
+  <dt>$${DRY_NEW}</dt>
+  <dd>
+    Expands to the total number of new duplicate code warnings in a build.
+  </dd>
+
+</j:jelly>