Changeset 1496

Timestamp:

06/07/09 17:28:52 (3 years ago)

Author:

amandel

Message:

Take care for findings.

Location:

trunk

Files:

• src/java/org/jcoderz/commons/LoggableImpl.java (modified) (1 diff)
• src/java/org/jcoderz/phoenix/report/HTMLRenderAntTask.java (modified) (4 diffs)
• src/java/org/jcoderz/phoenix/report/ReportMerger.java (modified) (3 diffs)
• src/java/org/jcoderz/phoenix/report/Syntax.java (modified) (1 diff)
• test/java/org/jcoderz/phoenix/report/Java2HtmlTest.java (modified) (1 diff)

trunk/src/java/org/jcoderz/commons/LoggableImpl.java

@@ -594 +594 @@
        final Iterator/*<String>*/ parameterNames
            = Arrays.asList(params).iterator();
-       while(parameterNames.hasNext())
+       while (parameterNames.hasNext())
        {
            final String parameterName = (String) parameterNames.next();

trunk/src/java/org/jcoderz/phoenix/report/HTMLRenderAntTask.java

@@ -41 +41 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.jcoderz.commons.util.FileUtils;
 
 /**
@@ -104 +105 @@
       try
       {
-         final List argList = new ArrayList();
+         final List<String> argList = new ArrayList<String>();
 
          // FIXME: . is not correct if the build process was started from a
@@ -110 +111 @@
          final File outDir = mOut == null 
                ? new File(mBaseDir , "build/report-" + mName) : mOut;
-         outDir.mkdirs();
+         FileUtils.mkdirs(outDir);
          argList.add("-outDir");
          argList.add(outDir.getCanonicalPath());
 
          argList.add("-report");
-         final File reportFile = new File(outDir, "jcoderz-merged-report.xml");
+         final File reportFile 
+             = new File(outDir, "jcoderz-merged-report.xml");
          argList.add(reportFile.getCanonicalPath());
 
@@ -139 +141 @@
          logger.fine("Calling Java2Html with args '" + argList + "'");
          final String[] java2HtmlArgs
-            = (String[]) argList.toArray(new String[0]);
+            = (String[]) argList.toArray(new String[argList.size()]);
          Java2Html.main(java2HtmlArgs);
       }

trunk/src/java/org/jcoderz/phoenix/report/ReportMerger.java

@@ -202 +202 @@
     {
         final List<Item> newFindings 
-            = new ArrayList((List<Item>) newFile.getItem());
+            = new ArrayList<Item>((List<Item>) newFile.getItem());
         final List<Item> oldFindings 
-            = new ArrayList((List<Item>) oldFile.getItem());
+            = new ArrayList<Item>((List<Item>) oldFile.getItem());
 
         filterLowSeverity(newFindings);
@@ -213 +213 @@
         // the rest...
         flaggAllAsNew(newFindings);
-        for (Item item : (List<Item>) oldFindings)
+        for (Item item : oldFindings)
         {
             addAsOld(newFile.getItem(), item);
@@ -222 +222 @@
     private void flaggAllAsNew (final List<Item> newFindings)
     {
-        for (Item item : (List<Item>) newFindings)
+        for (Item item : newFindings)
         {
             if (item.getSeverity().getPenalty() > 0

trunk/src/java/org/jcoderz/phoenix/report/Syntax.java

@@ -320 +320 @@
     private static Token emptyToken ()
     {
-        return new Token((byte) Token.END, 0, 0, null);
+        return new Token(Token.END, 0, 0, null);
     }
 

trunk/test/java/org/jcoderz/phoenix/report/Java2HtmlTest.java

@@ -1 @@
-/**
- *
- */
 /*
  * $Id: ReportReaderFactoryTest.java 1450 2009-05-09 22:54:06Z amandel $