Fixes a Retroweaver error in DrJavaErrorWindow.

mgricken · mgricken · commit 579a4d89882b · 2006-04-17T20:32:12.000Z
Changes menu text for making auxiliary files external files to
"Do not include with project" to mirror the menu item going the
other way.
Fixes bug [ 1471788 ] Can't run without tools.jar
Fixes bug [ 1471896 ] Project/Save As Saves Even When Cancelled

M    src/edu/rice/cs/drjava/model/debug/NoDebuggerAvailable.java
M    src/edu/rice/cs/drjava/ui/MainFrame.java
M    src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java


git-svn-id: file:///tmp/test-svn/trunk@3796 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/model/debug/NoDebuggerAvailable.java b/drjava/src/edu/rice/cs/drjava/model/debug/NoDebuggerAvailable.java
@@ -56,85 +56,86 @@ private NoDebuggerAvailable() { }
 
   /** Attaches the debugger to the Interactions JVM to prepare for debugging. */
   public void startup() throws DebugException {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Disconnects the debugger from the Interactions JVM and cleans up any state. */
   public void shutdown() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Returns the status of the debugger. */
   public boolean isReady() {
-    throw new IllegalStateException("No debugger is available");
+    return false;
+    //throw new IllegalStateException("No debugger is available");
   }
   
   public boolean inDebugMode() { return false; }
 
   /** Suspends execution of the currently. */
   public void suspend(DebugThreadData d) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Suspends all the threads. */
   public void suspendAll() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Sets the current thread which is being debugged to the thread referenced by d. */
   public void setCurrentThread(DebugThreadData d) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Resumes execution of the currently loaded document. */
   public void resume() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Resumes execution of the given thread.
    *  @param data the DebugThreadData representing the thread to resume
    */
   public void resume(DebugThreadData data) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Steps into the execution of the currently loaded document.
    *  @param flag The flag denotes what kind of step to take. The following mark valid options:
    *  StepRequest.STEP_INTO, StepRequest.STEP_OVER, StepRequest.STEP_OUT
    */
   public void step(int flag) throws DebugException {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Called from interactionsEnded in MainFrame in order to clear any current StepRequests that remain. */
   public void clearCurrentStepRequest() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Adds a watch on the given field or variable.
    *  @param field the name of the field we will watch
    */
   public void addWatch(String field) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Removes any watches on the given field or variable.
    *  @param field the name of the field we will watch
    */
   public void removeWatch(String field) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Removes the watch at the given index.
    *  @param index Index of the watch to remove
    */
   public void removeWatch(int index) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Removes all watches on existing fields and variables. */
   public void removeAllWatches() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /** Toggles whether a breakpoint is set at the given line in the given document.
@@ -143,11 +144,8 @@ public void removeAllWatches() {
    *  @param lineNum Line on which to set or remove the breakpoint
    *  @param enabled true if this breakpoint should be enabled
    */
-  public void toggleBreakpoint(OpenDefinitionsDocument doc,
-                               int offset, int lineNum, boolean isEnabled)
-    throws DebugException
-  {
-    throw new IllegalStateException("No debugger is available");
+  public void toggleBreakpoint(OpenDefinitionsDocument doc, int offset, int lineNum, boolean isEnabled) throws DebugException {
+    // throw new IllegalStateException("No debugger is available");
   }
 
   /**
@@ -156,7 +154,7 @@ public void toggleBreakpoint(OpenDefinitionsDocument doc,
    * @param breakpoint The new breakpoint to set
    */
   public void setBreakpoint(Breakpoint breakpoint) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
  /**
@@ -165,106 +163,113 @@ public void setBreakpoint(Breakpoint breakpoint) {
   * @param breakpoint The breakpoint to remove.
   */
   public void removeBreakpoint(Breakpoint breakpoint) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Removes all the breakpoints from the manager's vector of breakpoints.
    */
   public void removeAllBreakpoints() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Returns a Vector<Breakpoint> that contains all of the Breakpoint objects that
    * all open documents contain.
    */
   public Vector<Breakpoint> getBreakpoints() {
-    throw new IllegalStateException("No debugger is available");
+    return new Vector<Breakpoint>();
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Prints the list of breakpoints in the current session of DrJava, both pending
    * resolved Breakpoints are listed
    */
   public void printBreakpoints() {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Returns all currently watched fields and variables.
    */
   public Vector<DebugWatchData> getWatches() {
-    throw new IllegalStateException("No debugger is available");
+    return new Vector<DebugWatchData>();
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Returns a Vector of ThreadData or null if the vm is null
    */
   public Vector<DebugThreadData> getCurrentThreadData() {
-    throw new IllegalStateException("No debugger is available");
+    return new Vector<DebugThreadData>();
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Returns a Vector of StackData for the current thread or null if the
    * current thread is null.
    */
   public Vector<DebugStackData> getCurrentStackFrameData() {
-    throw new IllegalStateException("No debugger is available");
+    return new Vector<DebugStackData>();
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Adds a listener to this JPDADebugger.
    * @param listener a listener that reacts on events generated by the JPDADebugger
    */
   public void addListener(DebugListener listener) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Removes a listener to this JPDADebugger.
    * @param listener listener to remove
    */
   public void removeListener(DebugListener listener) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
    /**
    * @return true if there are any threads in the program currently being
    * debugged which have been suspended (by the user or by hitting a breakpoint).
    */
   public boolean hasSuspendedThreads() {
-    throw new IllegalStateException("No debugger is available");
+    return false;
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * Returns whether the thread the debugger is tracking is now running.
    */
   public boolean hasRunningThread() {
-    throw new IllegalStateException("No Debugger is available");
+    return false;
+    //throw new IllegalStateException("No Debugger is available");
   }
 
   /**
    * Returns whether the debugger's current thread is suspended.
    */
   public boolean isCurrentThreadSuspended() {
-    throw new IllegalStateException("No debugger is available");
+    return false;
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * scrolls to the source indicated by the given DebugStackData
    * @param data the DebugStackData representing the source location
    */
   public void scrollToSource(DebugStackData data) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
    * scrolls to the source indicated by the given Breakpoint
    * @param bp the Breakpoint representing the source location
    */
   public void scrollToSource(Breakpoint bp) {
-    throw new IllegalStateException("No debugger is available");
+    //throw new IllegalStateException("No debugger is available");
   }
 
   /**
@@ -276,6 +281,7 @@ public void scrollToSource(Breakpoint bp) {
    *         there is no such breakpoint.
    */
   public Breakpoint getBreakpoint(int line, String className) {
-    throw new IllegalStateException("No debugger is available");
+    return null;
+    //throw new IllegalStateException("No debugger is available");
   }
 }
diff --git a/drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java b/drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java
@@ -207,6 +207,9 @@ private void updateErrorInfo() {
       }
       
       b.append("\n\nSystem Properties:\n");
+      b.append("DrJava Version ");
+      b.append(edu.rice.cs.drjava.Version.getBuildTimeString());
+      b.append("\n");
       java.util.Properties props = System.getProperties();
       int size = props.size();
       java.util.Iterator entries = props.entrySet().iterator();
@@ -220,7 +223,8 @@ private void updateErrorInfo() {
           for(int i=0; i<ls.length(); ++i) {
             int ch = ls.charAt(i);
             b.append("\\u");
-            b.append(String.format("%04x", ch));
+            String hexString = "0000"+Integer.toHexString(ch);
+            b.append(hexString.substring(hexString.length()-4));
           }
           b.append("\"");
         }
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -332,7 +332,7 @@ public boolean shouldSaveAfterFileMoved(OpenDefinitionsDocument doc, File oldFil
     }
     public void actionPerformed(ActionEvent ae) { _moveToAuxiliary(); }
   };
-  private Action _removeAuxiliaryAction = new AbstractAction("Convert to External") {
+  private Action _removeAuxiliaryAction = new AbstractAction("Do Not Include With Project") {
     {
       putValue(Action.SHORT_DESCRIPTION, "Do not open this document next time this project is opened.");
     }
@@ -548,8 +548,9 @@ public void actionPerformed(ActionEvent ae) {
   
   private Action _saveProjectAsAction = new AbstractAction("Save As...") {
     public void actionPerformed(ActionEvent ae) {
-      _saveProjectAs();  // asks the user for a new project file name; sets _projectFile in global model to this value
-      _saveAll();  // performs a save all operation using this new project file name
+      if (_saveProjectAs()) {  // asks the user for a new project file name; sets _projectFile in global model to this value
+        _saveAll();  // performs a save all operation using this new project file name, but ONLY if the "Save as" was not cancelled
+      }
     }
   };
   
@@ -1545,9 +1546,9 @@ public void actionPerformed(ActionEvent ae) {
   private Action _gotoOpeningBraceAction =  new AbstractAction("Go to Opening Brace") {
     public void actionPerformed(ActionEvent ae) {
         OpenDefinitionsDocument odd = getCurrentDefPane().getOpenDefDocument();
+        if (true) throw new RuntimeException("booh");
         odd.readLock();
         try {
-          DrJavaErrorHandler.log("woof!");
           int pos = odd.findPrevEnclosingBrace(getCurrentDefPane().getCaretPosition(), '{', '}');
           if (pos!=AbstractDJDocument.ERROR_INDEX) { getCurrentDefPane().setCaretPosition(pos); }
         }
@@ -2514,7 +2515,7 @@ public void run() {
   public void debuggerToggle() {
     // Make sure the debugger is available
     Debugger debugger = _model.getDebugger();
-//    if (!debugger.isAvailable()) return;  // Redundant! This test is the first check made by inDebugMode()
+    if (!debugger.isAvailable()) return;
     
     try { 
       if (inDebugMode()) debugger.shutdown();
@@ -3256,8 +3257,9 @@ private void _newProject() {
   }
 
   /** Pops up the _saveChooser dialog, asks the user for a new project file name, and sets the project file to the 
-   *  specified file.  Nothing is written in the file system; this action is performed by a subsequent _saveAll(). */
-  private void _saveProjectAs() {
+   *  specified file.  Nothing is written in the file system; this action is performed by a subsequent _saveAll().
+   *  @return false if the user canceled the action */
+  private boolean _saveProjectAs() {
     
 //    // This redundant-looking hack is necessary for JDK 1.3.1 on Mac OS X!
     _saveChooser.removeChoosableFileFilter(_projectFilter);
@@ -3280,6 +3282,8 @@ private void _saveProjectAs() {
         _currentProjFile = file;
       }
     }
+    
+    return (rc == JFileChooser.APPROVE_OPTION);
   }
   
   void _saveProjectHelper(File file) {
@@ -4293,13 +4297,15 @@ private void _setUpActions() {
     _setUpAction(_showDebugConsoleAction, "Show DrJava Debug Console", "<html>Show a console for debugging DrJava<br>" +
                  "(with \"mainFrame\", \"model\", and \"config\" variables defined)</html>");
     
-    _setUpAction(_toggleDebuggerAction, "Debug Mode", "Enable or disable DrJava's debugger");
-    _setUpAction(_toggleBreakpointAction, "Toggle Breakpoint", "Set or clear a breakpoint on the current line");
-    _setUpAction(_clearAllBreakpointsAction, "Clear Breakpoints", "Clear all breakpoints in all classes");
-    _setUpAction(_resumeDebugAction, "Resume", "Resume the current suspended thread");
-    _setUpAction(_stepIntoDebugAction, "Step Into", "Step into the current line or method call");
-    _setUpAction(_stepOverDebugAction, "Step Over", "Step over the current line or method call");
-    _setUpAction(_stepOutDebugAction, "Step Out", "Step out of the current method");
+    if (_model.getDebugger().isAvailable()) {
+      _setUpAction(_toggleDebuggerAction, "Debug Mode", "Enable or disable DrJava's debugger");
+      _setUpAction(_toggleBreakpointAction, "Toggle Breakpoint", "Set or clear a breakpoint on the current line");
+      _setUpAction(_clearAllBreakpointsAction, "Clear Breakpoints", "Clear all breakpoints in all classes");
+      _setUpAction(_resumeDebugAction, "Resume", "Resume the current suspended thread");
+      _setUpAction(_stepIntoDebugAction, "Step Into", "Step into the current line or method call");
+      _setUpAction(_stepOverDebugAction, "Step Over", "Step over the current line or method call");
+      _setUpAction(_stepOutDebugAction, "Step Out", "Step out of the current method");
+    }
     
     _setUpAction(_helpAction, "Help", "Show documentation on how to use DrJava");
     _setUpAction(_quickStartAction, "Help", "View Quick Start Guide for DrJava");
@@ -5020,7 +5026,7 @@ private void _setUpTabs() {
     
     _junitErrorPanel = new JUnitPanel(_model, this);
     _javadocErrorPanel = new JavadocErrorPanel(_model, this);
-    _breakpointsPanel = new BreakpointsPanel(this);
+    if (_model.getDebugger().isAvailable()) { _breakpointsPanel = new BreakpointsPanel(this); }
     
     _tabbedPane = new JTabbedPane();
     _tabbedPane.addChangeListener(new ChangeListener () {
@@ -5055,7 +5061,7 @@ public void stateChanged(ChangeEvent e) {
     _tabs.addLast(_junitErrorPanel);
     _tabs.addLast(_javadocErrorPanel);
     _tabs.addLast(_findReplace);
-    _tabs.addLast(_breakpointsPanel);
+    if (_model.getDebugger().isAvailable()) { _tabs.addLast(_breakpointsPanel); }
     
     _interactionsPane.addFocusListener(new FocusAdapter() {
       public void focusGained(FocusEvent e) { _lastFocusOwner = _interactionsContainer; }

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,9 @@ private void updateErrorInfo() {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`b.append("\n\nSystem Properties:\n");`
	`210`	`+ b.append("DrJava Version ");`
	`211`	`+ b.append(edu.rice.cs.drjava.Version.getBuildTimeString());`
	`212`	`+ b.append("\n");`
`210`	`213`	`java.util.Properties props = System.getProperties();`
`211`	`214`	`int size = props.size();`
`212`	`215`	`java.util.Iterator entries = props.entrySet().iterator();`
`@@ -220,7 +223,8 @@ private void updateErrorInfo() {`
`220`	`223`	`for(int i=0; i<ls.length(); ++i) {`
`221`	`224`	`int ch = ls.charAt(i);`
`222`	`225`	`b.append("\\u");`
`223`		`- b.append(String.format("%04x", ch));`
	`226`	`+ String hexString = "0000"+Integer.toHexString(ch);`
	`227`	`+ b.append(hexString.substring(hexString.length()-4));`
`224`	`228`	`}`
`225`	`229`	`b.append("\"");`
`226`	`230`	`}`