Fixing bug 3436749: NullPointerException in disableAutomaticTrace in Interaction

mgricken · mgricken · commit 1c6afe551331 · 2011-11-14T05:29:54.000Z
http://sourceforge.net/tracker/?func=detail&aid=3436749&group_id=44253&atid=438935 This happened when there was no debugger available, e.g. when only the Eclipse compiler is found. git-svn-id: file:///tmp/test-svn/trunk@5455 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -5781,6 +5781,7 @@ void debuggerAutomaticTrace() {
 
   /** Enable automatic trace. Assumes that the debugger is ready. */
   private void enableAutomaticTrace() {
+    if (!isDebuggerEnabled()) return; // debugger isn't used
     try {
       int rate = DrJava.getConfig().getSetting(OptionConstants.AUTO_STEP_RATE);
       
@@ -5809,6 +5810,7 @@ public void actionPerformed(ActionEvent e) {
 
   /** Disable the automatic trace. Assumes that the debugger is ready. */
   private void disableAutomaticTrace() {
+    if (!isDebuggerEnabled()) return; // debugger isn't used
     _log.log("disableAutomaticTrace(): isDebuggerReady() = "+isDebuggerReady()); 
     _model.getDebugger().setAutomaticTraceEnabled(false);
     _debugPanel.setAutomaticTraceButtonText();
@@ -6945,7 +6947,7 @@ private void _setDebugMenuItemsEnabled(boolean isEnabled) {
   private void _setThreadDependentDebugMenuItems(boolean isSuspended) {
     _guiAvailabilityNotifier.ensureAvailabilityIs(GUIAvailabilityListener.ComponentType.DEBUGGER_SUSPENDED,
                                                   isSuspended);
-    _debugPanel.setAutomaticTraceButtonText();
+    if (_showDebugger) { _debugPanel.setAutomaticTraceButtonText(); }
   }
   
   /** Creates and returns the language levels menu.
