Changeset 1404

Timestamp:

04/14/09 12:34:34 (3 years ago)

Author:

amandel

Message:

Whitespace cleanup

Location:

trunk

Files:

• src/java/org/jcoderz/commons/types/EmailAddress.java (modified) (11 diffs)
• src/java/org/jcoderz/phoenix/report/CheckstyleReportReader.java (modified) (3 diffs)
• src/java/org/jcoderz/phoenix/report/EmmaReportReader.java (modified) (8 diffs)
• src/java/org/jcoderz/phoenix/report/Java2Html.java (modified) (6 diffs)
• src/java/org/jcoderz/phoenix/report/ReportMerger.java (modified) (4 diffs)
• src/java/org/jcoderz/phoenix/report/ResourceInfo.java (modified) (1 diff)
• test/java/org/jcoderz/commons/types/samples/BaseClassTest.java (modified) (4 diffs)

trunk/src/java/org/jcoderz/commons/types/EmailAddress.java

@@ -91 +91 @@
  * </pre>
  *
- * <p>The maximum length of an email address is: 64+1+255 characters (local-part + @ + domain).
- * The minimum length of an email address is: 1+1+4 characters (local-part + @ + domain).</p>
+ * <p>The maximum length of an email address is: 
+ * 64+1+255 characters (local-part + @ + domain).
+ * The minimum length of an email address is: 
+ * 1+1+4 characters (local-part + @ + domain).</p>
  *
  * <p>A valid list of top-level domains is defined by the IANA. A top-level
@@ -123 +125 @@
   private static final String LET_DIG = "[a-zA-Z0-9]";
   private static final String LET_DIG_HYP = "[a-zA-Z0-9-]";
-  private static final String RFC_LABEL = LET_DIG + LET_DIG_HYP + "{0,61}" + LET_DIG;
-  private static final String DOMAIN = RFC_LABEL + "(\\." + RFC_LABEL + ")*\\." + LETTER + "{2,6}";
+  private static final String RFC_LABEL 
+      = LET_DIG + LET_DIG_HYP + "{0,61}" + LET_DIG;
+  private static final String DOMAIN 
+      = RFC_LABEL + "(\\." + RFC_LABEL + ")*\\." + LETTER + "{2,6}";
 
   //Combined together, these form the allowed email regexp allowed by RFC 2822:
@@ -141 +145 @@
    * @param email The email address.
    */
-  public EmailAddress(String email)
+  public EmailAddress (String email)
   {
     Assert.notNull(email, "email");
@@ -156 +160 @@
     {
       throw new ArgumentMalformedException("email", email,
-          "The local part is longer than " + MAX_LENGTH_LOCAL_PART + " characters!");
+          "The local part is longer than " + MAX_LENGTH_LOCAL_PART 
+          + " characters!");
     }
     if (mail.length() - at - 1 > MAX_LENGTH_DOMAIN)
     {
       throw new ArgumentMalformedException("email", email,
-          "The domain is longer than " + MAX_LENGTH_DOMAIN + " characters!");
+          "The domain is longer than " + MAX_LENGTH_DOMAIN 
+          + " characters!");
     }
     mLocalPart = mail.substring(0, at);
@@ -171 +177 @@
 
   /**
-   * Factory method for converting a String into an instance of type EmailAddress.
+   * Factory method for converting a String into an instance of type 
+   * EmailAddress.
    *
    * @param email the email address to parse
@@ -183 +190 @@
   /**
    * Returns the local part of the address.
-   *
    * @return the local part of the address.
    */
-  public String getName()
+  public String getName ()
   {
     return mLocalPart;
@@ -194 +200 @@
   /**
    * Returns the domain name of the address.
-   *
    * @return the domain name of the address.
    */
-  public String getDomain()
+  public String getDomain ()
   {
     return mDomain;
@@ -205 +210 @@
   /**
    * Returns the top-level domain name of the address.
-   *
    * @return the top-level domain name of the address.
    */
-  public String getTopLevelDomain()
+  public String getTopLevelDomain ()
   {
     return mTopLevelDomain;
   }
 
-
-  /**
-   * Returns the full email address.
-   *
-   * @return the full email address.
-   */
-  public String getAddress()
-  {
-    return mLocalPart + "@" + mDomain;
-  }
 
   /**
@@ -228 +222 @@
    * @return the full email address.
    */
-  public String toString()
+  public String getAddress ()
   {
     return mLocalPart + "@" + mDomain;
@@ -234 +228 @@
 
   /**
+   * Returns the full email address.
+   * @return the full email address.
+   */
+  public String toString ()
+  {
+    return mLocalPart + "@" + mDomain;
+  }
+
+  /**
    * Returns the true if this email address equals the other.
+   * @param obj the object to compare to.
    * @return the true if this email address equals the other.
    * @see java.lang.Object#equals(java.lang.Object)
    */
-  public boolean equals(Object obj)
+  public boolean equals (Object obj)
   {
     boolean result = false;
@@ -261 +265 @@
    * @return the hash code for this email.
    */
-  public int hashCode()
+  public int hashCode ()
   {
     int hashCode = HashCodeUtil.hash(HashCodeUtil.SEED, mLocalPart);

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

@@ -46 +46 @@
 import javax.xml.bind.JAXBException;
 
+import org.jcoderz.commons.util.IoUtil;
 import org.jcoderz.phoenix.checkstyle.jaxb.Checkstyle;
 import org.jcoderz.phoenix.report.jaxb.Item;
@@ -81 +82 @@
          throws FileNotFoundException, JAXBException
    {
-      mReportDocument = (Checkstyle) getUnmarshaller().unmarshal(
-            new FileInputStream(f));
+      final FileInputStream is = new FileInputStream(f);
+      try
+      {
+          mReportDocument 
+              = (Checkstyle) getUnmarshaller().unmarshal(is);
+      }
+      finally
+      {
+          IoUtil.close(is);
+      }
    }
 
@@ -190 +199 @@
    }
 
-   private static String sourceToClass(String source)
+   private static String sourceToClass (String source)
    {
        final int i = source.lastIndexOf('.');

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

@@ -33 +33 @@
 package org.jcoderz.phoenix.report;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.bind.JAXBException;
+
+import org.jcoderz.phoenix.report.jaxb.Item;
+import org.jcoderz.phoenix.report.jaxb.ObjectFactory;
+
 import com.vladium.emma.data.ClassDescriptor;
 import com.vladium.emma.data.DataFactory;
@@ -40 +56 @@
 import com.vladium.emma.data.MethodDescriptor;
 import com.vladium.emma.data.ICoverageData.DataHolder;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.bind.JAXBException;
-
-import org.jcoderz.phoenix.report.jaxb.Item;
-import org.jcoderz.phoenix.report.jaxb.ObjectFactory;
 
 /**
@@ -105 +103 @@
             {
                 logger.warning(
-                    "Read no meta data from emma in file '" + f + "'." );
+                    "Read no meta data from emma in file '" + f + "'.");
             }
             if (mEmmaCoverageData == null)
             {
                 logger.warning(
-                    "Read no coverage info from emma in file '" + f + "'." );
+                    "Read no coverage info from emma in file '" + f + "'.");
             }
         }
@@ -126 +124 @@
         final Map itemMap = new HashMap();
 
-        final Iterator i = mEmmaMetaData.iterator();
+        final Iterator<ClassDescriptor> i = mEmmaMetaData.iterator();
         while (i.hasNext())
         {
-            ClassDescriptor clazz = (ClassDescriptor) i.next();
+            final ClassDescriptor clazz = i.next();
             final String srcFileName = clazz.getSrcFileName();
             final String fileName;
@@ -210 +208 @@
         final ClassDescriptor clazz, DataHolder coverage)
     {
-        MethodDescriptor[] methods = clazz.getMethods();
-        final Map<Integer,CoverageDetail> lineCoverage
-            = new HashMap<Integer,CoverageDetail>();
+        final MethodDescriptor[] methods = clazz.getMethods();
+        final Map<Integer, CoverageDetail> lineCoverage
+            = new HashMap<Integer, CoverageDetail>();
         for (int methodNr = 0; methodNr < methods.length; methodNr++)
         {
@@ -220 +218 @@
             {
                 boolean[] methodCoverage = null;
-                if (coverage!= null && coverage.m_coverage.length > methodNr)
+                if (coverage != null && coverage.m_coverage.length > methodNr)
                 {
                     methodCoverage = coverage.m_coverage[methodNr];
@@ -228 +226 @@
                     blockNr < map.length; blockNr++)
                 {
-                    int[] blockLines = map[blockNr];
+                    final int[] blockLines = map[blockNr];
                     if (methodCoverage != null
                         && methodCoverage.length > blockNr
@@ -313 +311 @@
 
 
-    private class CoverageDetail
-    {
-        int mNotVisitedBranches;
-        int mVisitedBranches;
+    private static class CoverageDetail
+    {
+        private int mNotVisitedBranches;
+        private int mVisitedBranches;
     }
 }

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

@@ -75 +75 @@
 
 /**
- * TODO: Fix CVS links
- * TODO: Refactor!
  * TODO: Link to current build
  * TODO: Link to CC home
  * TODO: Add @media printer???
- * TODO: Add doku
- * TODO: Codestyle
- * TODO: Generate error group view
  *
  * @author Andreas Mandel
@@ -113 +108 @@
    private static final String SORT_BY_COVERAGE_INDEX = "index_c.html";
 
-   /** Marker for ccs stypes used as the last row in a table. */
+   /** Marker for ccs styles used as the last row in a table. */
    private static final String LAST_MARKER = "_last";
 
@@ -436 +431 @@
       mGlobalSummary = new FileSummary();
 
-//      final Iterator files = report.getFile().iterator();
-
       for (final org.jcoderz.phoenix.report.jaxb.File file
           : (List<org.jcoderz.phoenix.report.jaxb.File>) report.getFile())
@@ -443 +436 @@
          try
          {
-            if (file.getName().endsWith(".java"))
-            {
-               // TODO parentDir = project-home (from jcoderz report xml)
-               java2html(new java.io.File(file.getName()), file);
-            }
-            else
-            {
-               mGlobalFindings.add(file);
-            }
+            java2html(new java.io.File(file.getName()), file);
          }
          catch (Exception ex)
          {
             logger.log(Level.SEVERE,
-                  "Failed to generate report for '" + file.getName() + "'.",
-                  ex);
+                "Failed to generate report for '" + file.getName() + "'.", ex);
             mGlobalFindings.add(file);
          }
@@ -485 +469 @@
       sc.createCharts();
 
-      // copy the stylesheet and the icons
       copyStylesheet();
       copyIcons();
@@ -828 +811 @@
                   bw.write("         (" + pos + ")\n");
                   bw.write("   </td>\n");
-                  bw.write("   <td></td><td></td><td></td>\n"); // linenumber
+                  bw.write("   <td></td><td></td><td></td>\n"); // line number
                   bw.write("   <td width='100%' class='findings-data'>\n");
                   bw.write(XmlUtil.escape(item.getMessage()));

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

@@ -194 +194 @@
    }
 
-    private void findNewFindings(org.jcoderz.phoenix.report.jaxb.File newFile,
+    private void findNewFindings (org.jcoderz.phoenix.report.jaxb.File newFile,
         org.jcoderz.phoenix.report.jaxb.File oldFile)
     {
@@ -209 +209 @@
         // the rest...
         flaggAllAsNew(newFindings);
-        for(Item item:(List<Item>) oldFindings)
+        for (Item item : (List<Item>) oldFindings)
         {
             addAsOld(newFile.getItem(), item);
@@ -218 +218 @@
     private void flaggAllAsNew (final List<Item> newFindings)
     {
-        for(Item item:(List<Item>) newFindings)
+        for (Item item : (List<Item>) newFindings)
         {
             if (item.getSeverity().getPenalty() > 0
@@ -325 +325 @@
        final String fileName = newFile.getName();
        org.jcoderz.phoenix.report.jaxb.File result = null;
-       for(org.jcoderz.phoenix.report.jaxb.File file : 
+       for (org.jcoderz.phoenix.report.jaxb.File file : 
            (List<org.jcoderz.phoenix.report.jaxb.File>) oldReport.getFile())
        {

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

@@ -158 +158 @@
     {
         ResourceInfo result = null;
-        for (ResourceInfo resource: RESOURCES.values())
+        for (ResourceInfo resource : RESOURCES.values())
         {
             if (resource.getClassname().equals(className)

trunk/test/java/org/jcoderz/commons/types/samples/BaseClassTest.java

@@ -45 +45 @@
 {
     /**
-     * Test the inheritance should call super.equals();
+     * Test the inheritance should call super.equals().
      */
-    public void testInheritanceEquals()
+    public void testInheritanceEquals ()
     {
         final SampleValueObject value = new SampleValueObject();
@@ -62 +62 @@
 
     /**
-     * Test the inheritance should call super.hashCode();
+     * Test the inheritance should call super.hashCode().
      */
-    public void testInheritanceHashCode()
+    public void testInheritanceHashCode ()
     {
         final SampleValueObject value = new SampleValueObject();
@@ -74 +74 @@
         value2.setTestValueBase(0);
 
-        assertTrue("Base class fields not honored in hash code.",
-            value.hashCode() != value2.hashCode());
+        assertFalse("Base class fields not honored in hash code.",
+            value.hashCode() == value2.hashCode());
     }
 
     /**
-     * Test the inheritance should call super.toString();
+     * Test the inheritance should call super.toString().
      */
-    public void testInheritanceToString()
+    public void testInheritanceToString ()
     {
         final SampleValueObject value = new SampleValueObject();
@@ -88 +88 @@
 
         assertTrue("Can't see base class fields in string output.",
-            value.toString().indexOf("0") > -1);
+            value.toString().indexOf('0') > -1);
     }
 }