Eclipse: Always uses user.home as the working directory; added a top-level reset toolbar button; cleaned up deprecated copy/paste code.

dlsmith · dlsmith · commit 21fabb909787 · 2008-12-08T22:22:56.000Z
git-svn-id: file:///tmp/test-svn/trunk@4695 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/eclipse/src/edu/rice/cs/drjava/plugins/eclipse/repl/EclipseInteractionsModel.java b/eclipse/src/edu/rice/cs/drjava/plugins/eclipse/repl/EclipseInteractionsModel.java
@@ -122,7 +122,7 @@ public EclipseInteractionsModel(SWTDocumentAdapter adapter) /* throws RemoteExce
    * @param adapter SWTDocumentAdapter to use for the document
    */
  public EclipseInteractionsModel(MainJVM control, SWTDocumentAdapter adapter) {
-   super(control, adapter, null, HISTORY_SIZE, WRITE_DELAY);  // null has type java.io.File; working directory
+   super(control, adapter, WORKING_DIR, HISTORY_SIZE, WRITE_DELAY);
    _listeners = new LinkedList<InteractionsListener>();
    _warnedToReset = false;
    if (DEBUG) _debugSystemOutAndErr();
@@ -161,8 +161,10 @@ protected void _interpreterResetFailed(Throwable t) {
  
  /** Called when the Java interpreter is ready to use. Adds any open documents to the classpath. */
  public void interpreterReady(File wd) {
+   debug.logStart();
    _resetInteractionsClasspath();
    super.interpreterReady(wd);
+   debug.logEnd();
  }
  
  /** Resets the warning flag after the Interactions Pane is reset. */
diff --git a/eclipse/src/edu/rice/cs/drjava/plugins/eclipse/views/InteractionsController.java b/eclipse/src/edu/rice/cs/drjava/plugins/eclipse/views/InteractionsController.java
@@ -44,16 +44,18 @@
 import java.util.Iterator;
 
 import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.custom.VerifyKeyListener;
-import org.eclipse.swt.dnd.Clipboard;
+///import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.ModifyEvent;
@@ -64,6 +66,8 @@
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.actions.ActionFactory;
 
 import edu.rice.cs.drjava.plugins.eclipse.DrJavaConstants;
 import edu.rice.cs.drjava.plugins.eclipse.EclipsePlugin;
@@ -203,7 +207,7 @@ public void dispose() {
     _colorDarkGreen.dispose();
     _colorDarkBlue.dispose();
     _colorYellow.dispose();
-    _clipboard.dispose();
+    ///_clipboard.dispose();
     
     // Remove preference listener
     Preferences store = EclipsePlugin.getDefault().getPluginPreferences();
@@ -243,8 +247,8 @@ private void _updatePreferences() {
       String confirmMessage =
         "Specifying the command-line arguments to the Interactions JVM is an\n" +
         "advanced option, and incorrect arguments may cause the Interactions\n" +
-        "Pane to stop responding. Are you sure you want to set this option?\n" +
-        "(You must reset the Interactions Pane before changes will take effect.)";
+        "View to stop responding. Are you sure you want to set this option?\n" +
+        "(You must reset the Interactions View before changes will take effect.)";
       if (_view.showConfirmDialog("Setting JVM Arguments", confirmMessage)) {
         _model.setOptionArgs(jvmArgs);
       }
@@ -445,45 +449,38 @@ public void run() {
     _view.getTextPane().addVerifyKeyListener(new KeyUpdateListener());
 //    _view.getTextPane().setKeyBinding(((int) '\t') | SWT.SHIFT, SWT.NULL);
     
-    _clipboard = new Clipboard(_view.getSite().getShell().getDisplay());
-    
     // Set up menu
     _setupMenu();
   }
   
-  Clipboard _clipboard;
   /** Adds actions to the toolbar menu. */
   protected void _setupMenu() {
-    final Action copyAction = new CopyAction(_view.getTextPane(), _clipboard);
+    IWorkbenchWindow window = _view.getSite().getWorkbenchWindow();
+    final IAction copyAction = ActionFactory.COPY.create(window);
     copyAction.setEnabled(false);
-    
-    _view.addAction(IWorkbenchActionConstants.COPY, copyAction);
-    
-    _view.addAction(IWorkbenchActionConstants.PASTE, 
-                    new PasteAction(_view.getTextPane(), _clipboard));
     _view.addSelectionListener(new SelectionAdapter() { 
       public void widgetSelected(SelectionEvent e) {
-        //System.out.println("About to Show:" + 
-        //     _view.getTextPane().getSelectionCount());
-        copyAction.setEnabled(
-                              (_view.getTextPane().getSelectionCount() > 0));
+        copyAction.setEnabled(_view.getTextPane().getSelectionCount() > 0);
       }
     });
+    _view.addMenuItem(copyAction);
     
-    Action resetInteractionsAction = new Action() {
+    IAction resetInteractionsAction = new Action() {
       public void run() {
         String title = "Confirm Reset Interactions";
-        String message = "Are you sure you want to reset the Interactions Pane?";
+        String message = "Are you sure you want to reset the Interactions View?";
         if (!_promptToReset || _view.showConfirmDialog(title, message)) {
           _model.resetInterpreter(EclipseInteractionsModel.WORKING_DIR);
         }
       }
     };
     resetInteractionsAction.setText("Reset Interactions");
-    resetInteractionsAction.setToolTipText("Resets the Interactions Pane");
+    resetInteractionsAction.setToolTipText("Reset the Interactions View");
+    resetInteractionsAction.setImageDescriptor(_getStandardIcon(ActionFactory.DELETE, window));
     _view.addMenuItem(resetInteractionsAction);
+    _view.addToolbarItem(resetInteractionsAction);
     
-    Action showClasspathAction = new Action() {
+    IAction showClasspathAction = new Action() {
       public void run() {
         String title = "Interpreter Classpath";
         StringBuffer cpBuf = new StringBuffer();
@@ -497,10 +494,20 @@ public void run() {
       }
     };
     showClasspathAction.setText("Show Interpreter Classpath");
-    showClasspathAction.setToolTipText("Shows the classpath used in the interactions pane.");
+    showClasspathAction.setToolTipText("Show the classpath used in the Interactions View");
     _view.addMenuItem(showClasspathAction);
   }
   
+  /**
+   * Get the icon used by a standard action.  (There may be a better way to get to standard icons,
+   * but I haven't found it.)  Note that many standard ActionFactories don't produce actions with icons.
+   */
+  private ImageDescriptor _getStandardIcon(ActionFactory f, IWorkbenchWindow w) {
+    ActionFactory.IWorkbenchAction a = f.create(w);
+    try { return a.getImageDescriptor(); }
+    finally { a.dispose(); }
+  }
+  
   /**
    * Listener to perform the correct action when a key is pressed.
    */
@@ -711,55 +718,4 @@ public void propertyChange(Preferences.PropertyChangeEvent event) {
     }
   }
   
-  
-  public class CopyAction extends Action {
-    protected StyledText _text;
-    protected Clipboard _clipboard;
-    public CopyAction(StyledText text, Clipboard cp) { 
-      _text = text;
-      _clipboard = cp;
-      setText("Copy");
-      setAccelerator(SWT.CTRL | 'C');
-    }
-    
-    
-    public void run() { 
-      //get selection
-      //TODO: need to disable Copy if selection is empty
-      if (_text.getSelectionCount() > 0) {
-        String selection = _text.getSelectionText();
-        
-        _clipboard.setContents(
-                               new Object[] { selection },
-                               new Transfer[] {TextTransfer.getInstance() }
-                               );
-      }
-    }
-  }
-  
-  public class PasteAction extends Action {
-    protected StyledText _text;
-    protected Clipboard _clipboard;
-    public PasteAction(StyledText text, Clipboard cp) { 
-      _text = text;
-      _clipboard = cp;
-      setText("Paste");
-      setAccelerator(SWT.CTRL | 'V');
-    }
-    
-    
-    public void run() { 
-      //get selection
-      Object selection = _clipboard.getContents(TextTransfer.getInstance());
-      if (selection != null) {
-        _text.insert(selection.toString());
-      }
-      //if (selection instanceof String) {
-      //_text.insert( (String)selection);
-      //}
-      
-    }
-  }
-  
-  
 }
diff --git a/eclipse/src/edu/rice/cs/drjava/plugins/eclipse/views/InteractionsView.java b/eclipse/src/edu/rice/cs/drjava/plugins/eclipse/views/InteractionsView.java
@@ -40,9 +40,10 @@
 package edu.rice.cs.drjava.plugins.eclipse.views;
 
 
-import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
@@ -94,9 +95,14 @@ public class InteractionsView extends ViewPart {
    * A runnable command to sound a beep as an alert.
    */
   protected Runnable _beep;
+  
+  /**
+   * Toolbar for this view.
+   */
+  protected IToolBarManager _toolbar;
 
   /**
-   * Toolbar menu for this view.
+   * Drop-down toolbar menu for this view.
    */
   protected IMenuManager _toolbarMenu;
 
@@ -182,6 +188,7 @@ public void createPartControl(Composite parent) {
 	 new CutAction(_styledText, _clipboard));
     */
 
+    _toolbar = _bars.getToolBarManager();
     _toolbarMenu = _bars.getMenuManager();
     _contextMenu = new MenuManager("#PopupMenu");
     Menu menu = _contextMenu.createContextMenu(_styledText);
@@ -286,12 +293,12 @@ public void setFocus() {
    * Add a menu item to both the toolbar menu and context menu.
    * @param action Menu item to add
    */
-  public void addMenuItem(Action action) {
+  public void addMenuItem(IAction action) {
     addToolbarMenuItem(action);
     addContextMenuItem(action);
   }
   
-  public void addAction(String op, Action action) {
+  public void addAction(String op, IAction action) {
 	  _bars.setGlobalActionHandler(op, action); 
 	  addToolbarMenuItem(action);
 	  addContextMenuItem(action);
@@ -301,7 +308,7 @@ public void addAction(String op, Action action) {
    * Add a menu item to the toolbar.
    * @param action Menu item to add
    */
-  public void addToolbarMenuItem(Action action) {
+  public void addToolbarMenuItem(IAction action) {
     _toolbarMenu.add(action);
   }
 
@@ -313,8 +320,13 @@ public void addSelectionListener(SelectionListener listener) {
    * Add a menu item to the context menu.
    * @param action Menu item to add
    */
-  public void addContextMenuItem(Action action) {
+  public void addContextMenuItem(IAction action) {
     _contextMenu.add(action);
   }
+  
+  /** Add a top-level action to the toolbar. */
+  public void addToolbarItem(IAction action) {
+    _toolbar.add(action);
+  }
     	    
 }
