This revision contains a substantially revised language level

rcartwright · rcartwright · commit 0aeaf959a1b3 · 2009-03-15T21:49:33.000Z
converter (embedded in javalanglevels-base.jar.  It also reworks
testCloseFiles() in SingleDisplayModelTest which has been intermittently
failing on a dual core Linux box.  Even the revised test (like many
of our unit tests) is not properly synchronized.

This revision also moves the .class file deletion process for classes in
language levels files to just before rather than just after language level
conversion.

The following files were modified:


M    testFiles/drjava.basic.config
M    lib/javalanglevels-base.jar
M    src/edu/rice/cs/drjava/model/SingleDisplayModelTest.java
M    src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M    src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M    src/edu/rice/cs/drjava/ui/RegionsTreePanel.java


git-svn-id: file:///tmp/test-svn/trunk@4816 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/lib/javalanglevels-base.jar b/drjava/lib/javalanglevels-base.jar
diff --git a/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
@@ -494,7 +494,7 @@ public File getMainClassContainingFile(){
         break;
       
       path = path.substring(0, path.lastIndexOf(File.separatorChar));
-      tempFile = new File(getProjectRoot(), path+".java");
+      tempFile = new File(getProjectRoot(), path + ".java");
     }
     
     return null;
diff --git a/drjava/src/edu/rice/cs/drjava/model/SingleDisplayModelTest.java b/drjava/src/edu/rice/cs/drjava/model/SingleDisplayModelTest.java
@@ -281,7 +281,8 @@ public synchronized boolean canAbandonFile(OpenDefinitionsDocument doc) {
     
     _log.log("Just before calling _model.closeAllFiles()");
     // Close all files, ensure new one was created
-    _model.closeAllFiles();
+    Utilities.invokeAndWait(new Runnable() { public void run() { _model.closeAllFiles(); } });
+    Utilities.clearEventQueue();
     Utilities.clearEventQueue();
     // we want a ready notification here; closeAllFiles is supposed to reset
     // the interactions pane, but the interpreter is supposed to be in a fresh running state
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java b/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
@@ -343,12 +343,11 @@ private static List<File> _testFileSort(List<File> files) {
     */
   private List<File> _compileLanguageLevelsFiles(List<File> files, List<DJError> errors,
                                                            Iterable<File> classPath, Iterable<File> bootClassPath) {
-    /* Rename any .dj0 files in files to be .java files, so the correct thing is compiled.  The hashset is used to 
-     * make sure we never send in duplicate files. This can happen if the java file was sent in along with the 
-     * corresponding .dj* file. The dj* file is renamed to a .java file and thus we have two of the same file in 
-     * the list.  By adding the renamed file to the hashset, the hashset efficiently removes duplicates.
+    /* Construct the collection of files to be compild by javac, renaming any language levels (.dj*) files to the 
+     * corresponding java (.java) files.  By using a HashSet, we avoid creating duplicates in this collection.
      */
     HashSet<File> javaFileSet = new HashSet<File>();
+    LinkedList<File> newFiles = new LinkedList<File>();  // Used to record the LL files that must be converted
     boolean containsLanguageLevels = false;
     for (File f : files) {
       File canonicalFile = IOUtil.attemptCanonicalFile(f);
@@ -358,25 +357,16 @@ private List<File> _compileLanguageLevelsFiles(List<File> files, List<DJError> e
         containsLanguageLevels = true;
         File javaFile = new File(fileName.substring(0, lastIndex) + ".java");
         javaFileSet.add(javaFile);
+        newFiles.add(javaFile);
 
-        // Delete the .java file, it will be regenerated later
+        // Delete the stale .java file (if it exists), a file with this name will subsequently be generated
         javaFile.delete();
       }
       else { javaFileSet.add(canonicalFile); }
     }
     
-    LanguageLevelConverter llc = new LanguageLevelConverter();
-    Options llOpts;
-    if (bootClassPath == null) { llOpts = new Options(getActiveCompiler().version(), classPath); }
-    else { llOpts = new Options(getActiveCompiler().version(), classPath, bootClassPath); }
-    Map<File,Set<String>> sourceToTopLevelClassMap = new HashMap<File,Set<String>>();
-    /* LanguageLevels Bug Workaround:  JUnit test files can generate spurious conversion errors.  This
-     * problem can be mitigated by compiling JUnit test files, which contain the substring "Test", last.  
-     */
-    Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> llErrors = 
-      llc.convert(_testFileSort(files).toArray(new File[0]), llOpts, sourceToTopLevelClassMap);
-    
     if (containsLanguageLevels) {
+      Map<File,Set<String>> sourceToTopLevelClassMap = new HashMap<File,Set<String>>();
       final File buildDir = _model.getBuildDirectory();
       final File sourceDir = _model.getProjectRoot();
 //      System.out.println("Build dir  : "+buildDir);
@@ -399,7 +389,7 @@ private List<File> _compileLanguageLevelsFiles(List<File> files, List<DJError> e
             dir = new File(buildDir,rel);
           }
           Set<String> classNames = dirToClassNameMap.get(dir);
-          if (classNames==null) classNames = new HashSet<String>();
+          if (classNames == null) classNames = new HashSet<String>();
           classNames.addAll(e.getValue());
           dirToClassNameMap.put(dir,classNames);
 //          System.out.println(e.getKey()+" --> "+dir);
@@ -418,28 +408,45 @@ private List<File> _compileLanguageLevelsFiles(List<File> files, List<DJError> e
           public boolean accept(File dir, String name) {
 //            System.out.println("\t"+name);
             int endPos = name.lastIndexOf(".class");
-            if (endPos<0) return false; // can't be a class file
+            if (endPos < 0) return false; // can't be a class file
             int dollarPos = name.indexOf('$');
-            if ((dollarPos>=0) && (dollarPos<endPos)) endPos = dollarPos;
+            if ((dollarPos >= 0) && (dollarPos < endPos)) endPos = dollarPos;
             // class name goes to the .class or the first $, whichever comes first
             Set<String> classNames = e.getValue();
             if (classNames.contains(name.substring(0,endPos))) { 
               // this is a class file that is generated from a .dj? file
-              new File(dir,name).delete();
+              new File(dir, name).delete();
               // don't need to return true, we're deleting the file here already
 //              System.out.println("\t\tDeleted");
             }
             return false;
           }
         });
       }
-    }
+      /* Perform language levels conversion, creating corresponding .java files. */
+      LanguageLevelConverter llc = new LanguageLevelConverter();
+      Options llOpts;
+      if (bootClassPath == null) { llOpts = new Options(getActiveCompiler().version(), classPath); }
+      else { llOpts = new Options(getActiveCompiler().version(), classPath, bootClassPath); }
+      
+      // NOTE: the following workaround ("_testFileSort(files)" instead of simply "files") may no longer be necessary.
+      /* Perform the conversion incorporating the following Bug Workaround:  Forward references can generate spurious 
+       * conversion errors in some cases.  This problem can be mitigated by compiling JUnit test files (with names
+       * containing the substring "Test") last.  
+       */
+      Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> llErrors = 
+        llc.convert(_testFileSort(files).toArray(new File[0]), llOpts, sourceToTopLevelClassMap);
+      /* Add any errors encountered in conversion to the compilation error log. */
+      errors.addAll(_parseExceptions2CompilerErrors(llErrors.getFirst()));
+      errors.addAll(_visitorErrors2CompilerErrors(llErrors.getSecond()));
+      
+//      // Confirm that the .java files corresponding to .dj* files exist.
+//      for (File f: newFiles)
+//        if (! f.exists()) Utilities.show(f + " does not exist");
 
-    files = new LinkedList<File>(javaFileSet);
+    }
     
-    errors.addAll(_parseExceptions2CompilerErrors(llErrors.getFirst()));
-    errors.addAll(_visitorErrors2CompilerErrors(llErrors.getSecond()));
-    if (containsLanguageLevels) { return files; }
+    if (containsLanguageLevels) { return new LinkedList<File>(javaFileSet); }
     else { return null; }
   }
   
diff --git a/drjava/src/edu/rice/cs/drjava/ui/RegionsTreePanel.java b/drjava/src/edu/rice/cs/drjava/ui/RegionsTreePanel.java
@@ -635,21 +635,24 @@ public void removeRegion(final R r) {
     assert EventQueue.isDispatchThread();
     _changeState.setLastAdded(null);
     DefaultMutableTreeNode regionNode = _regionToTreeNode.get(r);
-    if (regionNode == null) throw new UnexpectedException("Region node for region " + r + " is null");
+//    if (regionNode == null) throw new UnexpectedException("Region node for region " + r + " is null");  // should not happen but it does
+    if (regionNode != null) {
+
 //    _regionManager.removeRegion(r);
-    _regionToTreeNode.remove(r);
-    
+      _regionToTreeNode.remove(r);
+      
 //    DefaultMutableTreeNode docNode = _regionManager.getTreeNode(doc);
-    DefaultMutableTreeNode parent = (DefaultMutableTreeNode) regionNode.getParent();  // TreeNode for document
-    _regTreeModel.removeNodeFromParent(regionNode);
+      DefaultMutableTreeNode parent = (DefaultMutableTreeNode) regionNode.getParent();  // TreeNode for document
+      _regTreeModel.removeNodeFromParent(regionNode);
 //    System.err.println("panel region count in " + r.getDocument() + " = " + parent.getChildCount());
-    // check for empty subtree for this document (rooted at parent)
-    if (parent.getChildCount() == 0) {
-      // this document has no more regions, remove it
-      OpenDefinitionsDocument doc = r.getDocument();  // r must not have been disposed above
-      _docToTreeNode.remove(doc);
-      _regTreeModel.removeNodeFromParent(parent);
+      // check for empty subtree for this document (rooted at parent)
+      if (parent.getChildCount() == 0) {
+        // this document has no more regions, remove it
+        OpenDefinitionsDocument doc = r.getDocument();  // r must not have been disposed above
+        _docToTreeNode.remove(doc);
+        _regTreeModel.removeNodeFromParent(parent);
 //      if (parent == _cachedDocNode) _cachedDoc = null;
+      }
     }
 //    expandTree();
     _changeState.updateButtons();
diff --git a/drjava/testFiles/drjava.basic.config b/drjava/testFiles/drjava.basic.config
@@ -7,3 +7,4 @@ window.x = 240
 window.y = 50
 last.dir = /private/tmp/DrJava-test39882.java
 last.interactions.dir = /Users/cork
+#compile.before.junit = true

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ public File getMainClassContainingFile(){`
`494`	`494`	`break;`
`495`	`495`
`496`	`496`	`path = path.substring(0, path.lastIndexOf(File.separatorChar));`
`497`		`- tempFile = new File(getProjectRoot(), path+".java");`
	`497`	`+ tempFile = new File(getProjectRoot(), path + ".java");`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`return null;`