Tools->Advanced->New DrJava Instance feature

mgricken · mgricken · commit 360888f043db · 2010-06-22T21:54:09.000Z
git-svn-id: file:///tmp/test-svn/trunk@5301 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/config/OptionConstants.java b/drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
@@ -1111,6 +1111,11 @@ public static Vector<KeyStroke> vector(KeyStroke... ks) {
   public static final VectorOption<KeyStroke> KEY_GENERATE_CUSTOM_DRJAVA = 
     new VectorOption<KeyStroke>("key.generate.custom.drjava", new KeyStrokeOption("",null), to.vector());
   
+  /** The key binding for starting a new, blank DrJava instance. */
+  public static final VectorOption<KeyStroke> KEY_NEW_DRJAVA_INSTANCE= 
+    new VectorOption<KeyStroke>("key.new.drjava.instance", new KeyStrokeOption("",null),
+                                to.vector(KeyStroke.getKeyStroke(KeyEvent.VK_F1, CTRL_MASK|SHIFT_MASK)));
+  
   /* ---------- Find Replace Options ---------- */
   
   public static final BooleanOption FIND_MATCH_CASE = 
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -2228,6 +2228,17 @@ public void actionPerformed(ActionEvent ae) {
       popup.setVisible(true);
     }
   };
+
+  /** Action that starts a new, blank, unconnected DrJava instance. */
+  private final Action _newDrJavaInstanceAction = new AbstractAction("New DrJava Instance...") {
+    public void actionPerformed(ActionEvent ae) {
+      try {
+        Process p = edu.rice.cs.plt.concurrent.JVMBuilder.DEFAULT.classPath(FileOps.getDrJavaFile()).
+          start(edu.rice.cs.drjava.DrJava.class.getName(), "-new");
+      }
+      catch(IOException ioe) { MainFrameStatics.showIOError(MainFrame.this, ioe); }
+    }
+  };
   
   /** Action that switches to next document.  Only runs in the event thread. */
   private final Action _switchToNextAction = new AbstractAction("Next Document") {
@@ -5276,6 +5287,14 @@ void quit() {
     // on HP tc1100 and Toshiba Portege tablet PCs, but did not help in all cases
     if (! _closeProject(true)) { return; /* if user pressed cancel, do not quit */ }
     
+    _updateSavedConfiguration();
+    
+    //DrJava.consoleOut().println("Quitting DrJava...");
+    dispose();    // Free GUI elements of this frame
+    _model.quit();
+  }
+  
+  void _updateSavedConfiguration() {
     _recentFileManager.saveRecentFiles();
     _recentProjectManager.saveRecentFiles();
     if (! _model.closeAllFilesOnQuit()) { return; /* if user pressed cancel, do not quit */ }
@@ -5287,9 +5306,6 @@ void quit() {
       try { DrJava.getConfig().saveConfiguration(); }
       catch (IOException ioe) { MainFrameStatics.showIOError(MainFrame.this, ioe); }
     }
-    //DrJava.consoleOut().println("Quitting DrJava...");
-    dispose();    // Free GUI elements of this frame
-    _model.quit();
   }
   
   private void _forceQuit() { _model.forceQuit(); }
@@ -6637,6 +6653,7 @@ public void actionPerformed(ActionEvent ae) {
                                              DrJava.getConfig().getSetting(OptionConstants.EXTERNAL_SAVED_COUNT)));
     final JMenu advancedMenu = new JMenu("Advanced");
     _addMenuItem(advancedMenu, _generateCustomDrJavaJarAction, KEY_GENERATE_CUSTOM_DRJAVA);
+    _addMenuItem(advancedMenu, _newDrJavaInstanceAction, KEY_NEW_DRJAVA_INSTANCE);
     toolsMenu.add(advancedMenu);
 
     toolsMenu.addSeparator();    
