This revision fixes a bug in checking for redundant files in LanguageLevelConverter.java and streamlines the implementation of that checking.

rcartwright · rcartwright · commit 77b08b2c2aec · 2009-07-29T04:50:46.000Z
The following file was modified:

M    src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java


git-svn-id: file:///tmp/test-svn/trunk@4954 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java b/javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java
@@ -139,26 +139,16 @@ of illegal constructs (e.g. public and constructors). */
     for (File f : files) {
       
       try {
+        if (filesNotToCheck.contains(f)) continue;  // Detects equal files; earlier code versions claimed it failed
+        // Check for a null file
         BufferedReader tempBr = new BufferedReader(new FileReader(f));
         String firstLine = tempBr.readLine();
-        if (firstLine == null) continue;
         tempBr.close();
+        if (firstLine == null) continue;
         
-        /* If the file has the correct suffix, then parse it. Ignore files in filesNotToCheck.  contains on 
-         * filesNotToCheck failed to return desired result. So it is done manually, matching AbsolutePath. */
-//        boolean foundFile = false;
-        
-        for (File fntc: files) {
-          if (fntc.getAbsolutePath().equals(f.getAbsolutePath())) {
-//            foundFile = true;
-            break;
-          }
-        }
-        
-        if (_isLanguageLevelFile(f) /* && ! foundFile*/) {
+        if (_isLanguageLevelFile(f)) {
           System.out.flush();
           SourceFile sf;
-//          File f = files[ind];
           JExprParser jep = new JExprParser(f);
           try { 
             sf = jep.SourceFile();
@@ -177,7 +167,7 @@ of illegal constructs (e.g. public and constructors). */
             continue;
           }
           
-          //Now create a LanguageLevelVisitor to do the first pass over the file.
+          // Now create a LanguageLevelVisitor to do the first pass over the file.
           LanguageLevelVisitor llv = null;
           if (isElementaryFile(f)) {
             llv = 
