Changeset 1606 for trunk/src/java/org/jcoderz/phoenix/report/GenericReportReader.java

Timestamp:

02/12/10 13:48:43 (2 years ago)

Author:

amandel

Message:

- use current PMD from public repository
- remove implied dependencies from explicit list
- ignore compiler classpath warning.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/java/org/jcoderz/phoenix/report/GenericReportReader.java (modified) (23 diffs)

trunk

@@ -3 +3 @@
 eclipse
 ${env.CRUISECONTROL_HOME}
+derbyDB
+.byecycle

@@ -3 +3 @@
 eclipse
 ${env.CRUISECONTROL_HOME}
+derbyDB
+.byecycle

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

@@ -35 +35 @@
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
@@ -67 +69 @@
  * Reads reports with format definitions described in the
  * finding-type-format-definition.xds.
- * 
+ *
  * To find the finding type format definition for requested format
  * the following locations are used:
- * 
+ *
  * The name is converted to lower case.
- * 
- * A file <i>name</i>.xml is searched in the 
+ *
+ * A file <i>name</i>.xml is searched in the
  * <code>org.jcoderz.phoenix.report.ftf</code> package. If
  * this is not found the file is searched in the <code>ftf</code>
  * directory. The directory must be available through the classpath.
- * 
- * 
+ *
+ *
  * @author Andreas Mandel
  *
@@ -88 +90 @@
         = GenericReportReader.class.getName();
     private static final Logger logger = Logger.getLogger(CLASSNAME);
-    
-    private static final Pattern CODE_LINE_PATTERN 
+
+    private static final Pattern CODE_LINE_PATTERN
         = Pattern.compile("^.*$", Pattern.MULTILINE);
-    
-    private static final Pattern CARET_LINE_PATTERN 
+
+    private static final Pattern CARET_LINE_PATTERN
         = Pattern.compile("^\\s*\\^$", Pattern.MULTILINE);
-    
+
     private static final Map<Origin, GenericReportReader> GENERIC_REPORT_TYPES
         = new HashMap<Origin, GenericReportReader>();
 
-    
+
     private final List<GenericFindingType> mFindingTypes
         = new ArrayList<GenericFindingType>();
 
     private Map<ResourceInfo, List<Item>> mItems;
-    
+
     private SourceFile mSourceFile;
 
@@ -109 +111 @@
     private final FindingTypeFormat mFindingTypeFormatDescription;
 
-    private final int mTextPos; 
+    private final int mTextPos;
     private final Origin mOrigin;
     private final int mFilePos;
     private final int mLineStart;
     private final Severity mDefaultSeverity;
-    
+
     private Matcher mRootMatcher = null;
 
-    private GenericReportReader (Origin type) 
+    private GenericReportReader (Origin type)
         throws JAXBException
     {
@@ -123 +125 @@
         mFindingTypeFormatDescription = loadFormatDescription(type);
         initializeFindingTypes();
-        final FindingDescription root 
+        final FindingDescription root
             = mFindingTypeFormatDescription.getRootType();
-        mMessagePattern 
-            = Pattern.compile(root.getPattern(), 
+        mMessagePattern
+            = Pattern.compile(root.getPattern(),
                 Pattern.MULTILINE);
         mTextPos =  Integer.parseInt(root.getTextPos());
         mFilePos =  Integer.parseInt(root.getFilenamePos());
-        mLineStart = root.isSetLineStartPos() 
+        mLineStart = root.isSetLineStartPos()
             ? Integer.parseInt(root.getLineStartPos()) : -1;
-        mDefaultSeverity = root.isSetSeverity() 
+        mDefaultSeverity = root.isSetSeverity()
             ? root.getSeverity() : Severity.CODE_STYLE;
     }
 
     /**
-     * Initializes the selected finding type. 
+     * Initializes the selected finding type.
      * Might return <code>null</code> if the initialization fails.
      * CHECKME: Should return a null object?
@@ -157 +159 @@
                 {
                     // TODO: collect this an add it to the findings map later!
-                    logger.log(Level.WARNING, 
-                        "Could not load finding type for '" + findingType 
+                    logger.log(Level.WARNING,
+                        "Could not load finding type for '" + findingType
                         + "' failed with " + ex.getMessage() + ".", ex);
                 }
@@ -175 +177 @@
         try
         {
-            final String filename 
-                = type.toString().toLowerCase(Constants.SYSTEM_LOCALE) 
+            final String filename
+                = type.toString().toLowerCase(Constants.SYSTEM_LOCALE)
                     + ".xml";
             in = GenericReportReader.class.getResourceAsStream(
@@ -185 +187 @@
                     "/ftf/" + filename);
             }
+            if (in == null)
+            {
+                try
+                {
+                    in = new FileInputStream(filename);
+                }
+                catch (FileNotFoundException ex)
+                {
+                    // in = null;
+                }
+            }
             Assert.notNull(in, "report type description " + type);
-            final UnmarshalResult unmarshal 
-                = JaxbUtil.unmarshal(new InputSource(in), 
+            final UnmarshalResult unmarshal
+                = JaxbUtil.unmarshal(new InputSource(in),
                     "org.jcoderz.phoenix.report.ftf.jaxb");
-            
+
             findingTypeFormatDescription
                 = (FindingTypeFormat) unmarshal.getParsedData();
@@ -199 +212 @@
         return findingTypeFormatDescription;
     }
-    
+
     /** {@inheritDoc} */
     public void parse (File f)
@@ -225 +238 @@
         }
     }
-    
+
     /**
      * Reads the given message and tries to find a matching finding type.
@@ -231 +244 @@
      * @return the finding type matching to the message, or null if no such
      *   type was found.
-     * @throws JAXBException if item creation fails. 
+     * @throws JAXBException if item creation fails.
      */
-    public Item detectFindingTypeForMessage (String message) 
+    public Item detectFindingTypeForMessage (String message)
         throws JAXBException
     {
@@ -251 +264 @@
        if (logger.isLoggable(Level.FINE))
        {
-           logger.fine("For text: '" 
+           logger.fine("For text: '"
                + StringUtil.trimLength(message, MAX_DEBUG_TEXT_CHARS)
-               + "' matched finding: " 
-               + (result == null ? "null" : result.getFindingType() 
+               + "' matched finding: "
+               + (result == null ? "null" : result.getFindingType()
                + "'. End at " + mSourceFile.getPos()));
        }
@@ -262 +275 @@
     private void addPositionByCaret (final Item i)
     {
-        final String text 
-            = mSourceFile.getContent().substring(mSourceFile.getPos()); 
-        final Matcher codeMat 
+        final String text
+            = mSourceFile.getContent().substring(mSourceFile.getPos());
+        final Matcher codeMat
             = CODE_LINE_PATTERN.matcher(text);
         if (codeMat.lookingAt())
         {
-            final String textAfterCode 
+            final String textAfterCode
                 = mSourceFile.getContent().substring(
-                    mSourceFile.getPos() + codeMat.end() + 1); 
-            final Matcher caretMat 
+                    mSourceFile.getPos() + codeMat.end() + 1);
+            final Matcher caretMat
                 = CARET_LINE_PATTERN.matcher(textAfterCode);
             if (caretMat.lookingAt())
@@ -277 +290 @@
                 i.setColumn(caretMat.end());
                 mSourceFile.setPos(
-                    mSourceFile.getPos() 
-                    + codeMat.end() + 1 
+                    mSourceFile.getPos()
+                    + codeMat.end() + 1
                     + caretMat.end() + 1);
             }
             else
             {
-                logger.fine("Caret defined but not found for '" 
+                logger.fine("Caret defined but not found for '"
                     + i.getFindingType()
-                    + "' Code Line: '" + codeMat + "' caretLine: '" 
-                    + caretMat + "'. text: '" 
+                    + "' Code Line: '" + codeMat + "' caretLine: '"
+                    + caretMat + "'. text: '"
                     + StringUtil.trimLength(
                         textAfterCode, MAX_DEBUG_TEXT_CHARS) + "'.");
@@ -293 +306 @@
         else
         {
-            logger.fine("Caret defined but not found for '" 
+            logger.fine("Caret defined but not found for '"
                 + i.getFindingType()
-                + "' Code Line: '" + codeMat + "'. text: '" 
+                + "' Code Line: '" + codeMat + "'. text: '"
                 + StringUtil.trimLength(
                     text, MAX_DEBUG_TEXT_CHARS) + "'.");
@@ -301 +314 @@
     }
 
-    private void parseNext () 
+    private void parseNext ()
         throws JAXBException
     {
@@ -317 +330 @@
             if (item == null)
             {
-                final int pos 
+                final int pos
                     = mSourceFile.getContent().indexOf(
                         '\n', mSourceFile.getPos());
                 if (pos != -1)
                 {
-                    mSourceFile.setPos(pos + 1);  
+                    mSourceFile.setPos(pos + 1);
                 }
                 else
                 {
-                    mSourceFile.setPos(mSourceFile.getContent().length());  
+                    mSourceFile.setPos(mSourceFile.getContent().length());
                 }
             }
@@ -336 +349 @@
                     item.setSeverity(mDefaultSeverity);
                 }
-                if (!item.isSetLine() && mLineStart != -1 
+                if (!item.isSetLine() && mLineStart != -1
                     && mRootMatcher.group(mLineStart) != null)
                 {
@@ -366 +379 @@
                     + " '" + StringUtil.trimLength(
                         mSourceFile.getContent().substring(
-                            mSourceFile.getPos()), 
+                            mSourceFile.getPos()),
                             MAX_DEBUG_TEXT_CHARS));
             }
@@ -407 +420 @@
         else
         {
-            logger.finer("Ignore findings for resource '" 
-                + resourceFilename + "' type was " 
+            logger.finer("Ignore findings for resource '"
+                + resourceFilename + "' type was "
                 + item.getFindingType() + ".");
         }
     }
-    
+
     private void initializeFindingTypes ()
     {
-        final FindingDescription root 
+        final FindingDescription root
             = mFindingTypeFormatDescription.getRootType();
-        final List<FindingDescription> findingTypes 
+        final List<FindingDescription> findingTypes
             = mFindingTypeFormatDescription.getFindingType();
         for (FindingDescription findingDesc : findingTypes)
         {
-            final GenericFindingType gft 
+            final GenericFindingType gft
                 = new GenericFindingType(root, findingDesc);
             mFindingTypes.add(gft);
@@ -428 +441 @@
             mFindingTypes, new GenericFindingType.OrderByPriority());
     }
-    
-    
+
+
     static final class SourceFile
     {
@@ -435 +448 @@
         private final String mContent;
         private int mPos;
-        
-        public SourceFile (File file) 
+
+        public SourceFile (File file)
             throws IOException
         {
@@ -487 +500 @@
             return mContent;
         }
-        
+
         public boolean readFully ()
         {

@@ -3 +3 @@
 eclipse
 ${env.CRUISECONTROL_HOME}
+derbyDB
+.byecycle