Changeset 1331

Timestamp:

03/28/09 20:29:42 (3 years ago)

Author:

amandel

Message:

#2 Quick implementation to detect new findings.
Fixed findings in file.

Location:

trunk/src/java/org/jcoderz

Files:

• commons/util/FileUtils.java (modified) (2 diffs)
• phoenix/report/ReportMerger.java (modified) (10 diffs)

trunk/src/java/org/jcoderz/commons/util/FileUtils.java

@@ -448 +448 @@
     *
     * @param dir the directory to be created.
-    * @throws IOException the directory could not be created.
+    * @throws IOException if the file could not be created.
     * @see File#mkdir()
     */
@@ -462 +462 @@
       }
    }
+
+   /**
+    * Creates the given file.
+    * @param newFile the file to create
+    * @throws IOException the file could not be created.
+    * @see File#createNewFile()
+    */
+    public static void createNewFile (File newFile) 
+        throws IOException
+    {
+        if (!newFile.createNewFile())
+        {
+            throw new IOException("Failed to create new File " + newFile);
+        }
+    }
 }

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

@@ -45 +45 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.PropertyException;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -56 +57 @@
 import org.jcoderz.commons.util.IoUtil;
 import org.jcoderz.commons.util.LoggingUtils;
-import org.jcoderz.commons.util.ObjectUtil;
-import org.jcoderz.commons.util.StringUtil;
 import org.jcoderz.phoenix.report.jaxb.Item;
 import org.jcoderz.phoenix.report.jaxb.ObjectFactory;
@@ -81 +80 @@
 
    /** The out file. */
-   private File mOutFile;
+   private File mOutFile = null;
 
    /** The reports. */
@@ -102 +101 @@
    {
      logger.log(Level.FINE, "Merging jcoderz-report.xml files...");
-     // prepare JAXB
-     final JAXBContext mJaxbContext
-         = JAXBContext.newInstance("org.jcoderz.phoenix.report.jaxb",
-           this.getClass().getClassLoader());
-     final Marshaller mMarshaller = mJaxbContext.createMarshaller();
-     mMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
-             Boolean.TRUE);
-
      // merge the reports
      final Report mergedReport = new ObjectFactory().createReport();
@@ -127 +118 @@
         }
      }
-     // create the file
-     mMarshaller.marshal(mergedReport, new FileOutputStream(mOutFile));
+     writeResult(mergedReport, mOutFile);
    }
 
@@ -149 +139 @@
            final File tempOutputFile 
                = new File(mOutFile.getCanonicalPath() + ".tmp");
-           tempOutputFile.createNewFile();
+           FileUtils.createNewFile(tempOutputFile);
 
            final FileOutputStream out = new FileOutputStream(tempOutputFile);
@@ -169 +159 @@
        logger.log(Level.FINE, "Searching for NEW findings...");
        final Report currentReport 
-           = (Report) new ObjectFactory().createUnmarshaller().unmarshal(mOutFile);
+           = (Report) new ObjectFactory().createUnmarshaller().unmarshal(
+               mOutFile);
        final Report oldReport 
-           = (Report) new ObjectFactory().createUnmarshaller().unmarshal(mOldReport);
+           = (Report) new ObjectFactory().createUnmarshaller().unmarshal(
+               mOldReport);
        for(org.jcoderz.phoenix.report.jaxb.File newFile : 
            (List<org.jcoderz.phoenix.report.jaxb.File>) currentReport.getFile())
@@ -188 +180 @@
        }
        
-       final FileOutputStream out = new FileOutputStream(mOutFile);
-       try
-       {
-           new ObjectFactory().createMarshaller().marshal(currentReport, out);
-       }
-       finally
-       {
-           IoUtil.close(out);
-       }
+       writeResult(currentReport, mOutFile);
    }
 
@@ -418 +402 @@
         if (mOutFile.isDirectory())
         {
-            mOutFile.mkdirs();
+            FileUtils.mkdirs(mOutFile);
             mOutFile = new File(mOutFile,
                 ReportNormalizer.JCODERZ_REPORT_XML).getCanonicalFile();
@@ -428 +412 @@
 
     }
+
+    private void writeResult (final Report mergedReport, File outFile)
+        throws JAXBException, PropertyException, FileNotFoundException
+    {
+        // create the file
+         final JAXBContext mJaxbContext
+             = JAXBContext.newInstance("org.jcoderz.phoenix.report.jaxb",
+           this.getClass().getClassLoader());
+         final Marshaller marshaller = mJaxbContext.createMarshaller();
+         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
+                 Boolean.TRUE);
+         final FileOutputStream out = new FileOutputStream(outFile);
+         try
+         {
+             marshaller.marshal(mergedReport, out);
+         }
+         finally
+         {
+             IoUtil.close(out);
+         }
+    }
+    
+
 }