This revison fixes a bug in the "open project" command. If a project was

ponderosaTX · ponderosaTX · commit 666dbbbaf6c6 · 2016-08-23T11:50:16.000-05:00
already open, this operation would sometimes deadlock presumably because
the command runs in the event thread and requires another event thread
operation to complete.  The revised version first closes the existing project
before asking the use to select the new project file (using a file selector).

The following files were modified:

	modified:   build.xml
	modified:   src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
	modified:   src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java
	modified:   src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
	modified:   src/edu/rice/cs/drjava/model/junit/JUnitTestManager.java
	modified:   src/edu/rice/cs/drjava/model/junit/JUnitTestRunner.java
	modified:   src/edu/rice/cs/drjava/ui/MainFrame.java
diff --git a/drjava/build.xml b/drjava/build.xml
@@ -880,8 +880,7 @@
     </replace>
   </target>
   
-  <!-- Standardize all newline character sequences.  Subversion takes care of this 
-       automatically, but sometimes files crop up with the wrong sequence.-->
+  <!-- Standardize all newline character sequences.-->
   <target name="fix-newlines" description="Standardize newline character sequences in all text files">
     <!-- If we're in Windows, use \r\n -->
     <condition property="newline-code" value="crlf">
@@ -1151,7 +1150,6 @@
               value="${ant.project.name}${tag-append}-${DSTAMP}-${TSTAMP}"/>
   </target>  
   
-
   <!-- Sets "already-generated" if "generate-file" is more recent than "generate-sourcefile";
        otherwise, the out-of-date target file is deleted (if it exists).  Note that, since
        properties can only be set once, this should happen underneath an "antcall". -->
diff --git a/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
@@ -1812,24 +1812,22 @@ public void reloadProject(File file, HashMap<OpenDefinitionsDocument, DocumentIn
     setProjectChanged(projChanged);
   }
   
-  /** Parses the given project file and loads it into the document navigator  
-   * and resets interactions pane. Assumes preceding project, if any, has 
-   * already been closed.
-   *
-   * @param projectFile The project file to parse
-   * @throws IOException if an IO operation fails
-   * @throws MalformedProjectFileException if one of the project files was malformed
-   */
+  /** Parses the given project file and loads it into the document navigator and resets interactions pane. Assumes
+    * that any existing project has been closed.
+    * @param projectFile The project file to parse
+    * @throws IOException if an IO operation fails
+    * @throws MalformedProjectFileException if one of the project files was malformed
+    */
   public void openProject(File projectFile) throws IOException, MalformedProjectFileException {
-    _loadProject(ProjectFileParserFacade.ONLY.parse(projectFile));
+    _loadProject(ProjectFileParserFacade.ONLY.parse(projectFile));  // resets interactions if successful
   }
   
   /** Loads the specified project into the document navigator and opens all of 
-   * the files (if not already open).
-   * Assumes that any prior project has been closed.  Only runs in event thread.
-   * @param ir The project file to load
-   * @throws IOException if an IO operation fails
-   */
+    * the files (if not already open).
+    * Assumes that any prior project has been closed.  Only runs in event thread.
+    * @param ir The project file to load
+    * @throws IOException if an IO operation fails
+    */
   private void _loadProject(final ProjectFileIR ir) throws IOException {
     
     assert EventQueue.isDispatchThread();
@@ -2011,16 +2009,16 @@ public boolean accept(OpenDefinitionsDocument d) {
   public void autoRefreshProject() { openNewFilesInProject(); }
   
   /** Performs any needed operations on the model after project files have been 
-   * closed. This method is not responsible for closing any files; both the 
-   * files in the project and the project file have already been closed (by 
-   * MainFrame._closeProject()). Resets interations unless suppressReset is 
-   * true, which only happens when DrJava is quitting.
-   * 
-   * @param suppressReset false if we want to reset the interactions pane; true otherwise
-   */
+    * closed. This method is not responsible for closing any files; both the 
+    * files in the project and the project file have already been closed (by 
+    * MainFrame._closeProject()). Resets interations unless suppressReset is 
+    * true, which only happens when DrJava is quitting.
+    * 
+    * @param suppressReset false if we want to reset the interactions pane; true otherwise
+    */
   public void closeProject(boolean suppressReset) {
-    setDocumentNavigator(new AWTContainerNavigatorFactory<OpenDefinitionsDocument>().
-                           makeListNavigator(getDocumentNavigator()));
+    IDocumentNavigator<OpenDefinitionsDocument> nav = getDocumentNavigator();
+    setDocumentNavigator(new AWTContainerNavigatorFactory<OpenDefinitionsDocument>().makeListNavigator(nav));
     setFileGroupingState(makeFlatFileGroupingState());
     
     // remove previous listeners
diff --git a/drjava/src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java b/drjava/src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java
@@ -52,7 +52,7 @@
   */
 public final class GlobalModelJUnitTest extends GlobalModelTestCase {
   
-  private static Log _log = new Log("GlobalModelTest.txt", true);
+  private static Log _log = new Log("GlobalModelTest.txt", false);
   
   /** Whether or not to print debugging output. */
   static final boolean printMessages = true;
diff --git a/drjava/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java b/drjava/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
@@ -75,7 +75,7 @@
  */
 public abstract class GlobalModelTestCase extends MultiThreadedTestCase {
   
-  public static final Log _log = new Log("GlobalModelTest.txt", true);
+  public static final Log _log = new Log("GlobalModelTest.txt", false);
 
   protected volatile DefaultGlobalModel _model;
   protected volatile InteractionsController _interactionsController;
diff --git a/drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestManager.java b/drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestManager.java
@@ -90,7 +90,7 @@
   */
 public class JUnitTestManager {
   
-  protected static final Log _log = new Log("JUnitTestManager.txt", true);
+  protected static final Log _log = new Log("JUnitTestManager.txt", false);
   
   /** The interface to the master JVM via RMI. */
   private final JUnitModelCallback _jmc;
diff --git a/drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestRunner.java b/drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestRunner.java
@@ -48,7 +48,7 @@
   */
 public class JUnitTestRunner extends BaseTestRunner {
   
-  protected static final Log _log = new Log("JUnitTestManager.txt", true);
+  protected static final Log _log = new Log("JUnitTestManager.txt", false);
   
   /** Receives updates on the test suite's progress. */
   private JUnitModelCallback _jmc;
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -4854,29 +4854,28 @@ private void _resetNavigatorPane() {
     _updateBackgroundColor();
   }
   
-  /** Asks the user to select the project file to open and starts the process of opening the project. */
-  private void _openProject() { openProject(_openProjectSelector); }
+  /** Closes existing project if one exists, asks the user to select the project file to open, and opens it. */
+  private void _openProject() {
+    if (_model.isProjectActive()) closeProject();  // does not reset interactions
+    openProject(_openProjectSelector);             // resets interactions if successful
+  }
   
-  public void openProject(FileOpenSelector projectSelector) {
-    
-    try { 
+  /** Assumes any existing project has already been closed. */
+  public void openProject(final FileOpenSelector projectSelector) {
+    try {
       final File[] files = projectSelector.getFiles();
       if (files.length < 1)
         throw new IllegalStateException("Open project file selection not canceled but no project file was selected.");
       final File file = files[0];
-      
-      updateStatusField("Opening project " + file);
-      
-      try {
-        hourglassOn();
-        // make sure there are no open projects
-        if (! _model.isProjectActive() || (_model.isProjectActive() && _closeProject())) _openProjectHelper(file);
-      }
-      catch(Exception e) { e.printStackTrace(System.out); }
-      finally { hourglassOff(); } 
+      if (file != null && file != FileOps.NULL_FILE)
+        Utilities.invokeLater(new Runnable() {
+          public void run() {
+            updateStatusField("Opening project " + file);
+            _openProjectHelper(file);
+          }
+        }); 
     }
-    catch(OperationCanceledException oce) { /* do nothing, we just won't open anything */ }
-    
+    catch(OperationCanceledException oce) { return; /* do nothing if getFiles() fails; we just don't open anything */ } 
   }  
   
   /** Oversees the opening of the project by delegating to the model to parse and initialize the project 
