Fixes being unable to stop the EDT debugging

Change-Id: Iff5c8a8902eab43eeda4b4c839303ad2ff081be6
Reviewed-on: http://gerrit.dmdirc.com/383
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/DMDircEventQueue.java

@@ -39,6 +39,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 
 import java.awt.event.WindowEvent;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 import javax.swing.MenuSelectionManager;
@@ -78,9 +79,13 @@ public final class DMDircEventQueue extends EventQueue implements
         if (tracingThread == null) {
             super.dispatchEvent(event);
         } else {
-            this.tracingThread.eventDispatched(event);
+            if (tracingThread != null) {
+                tracingThread.eventDispatched(event);
+            }
             super.dispatchEvent(event);
-            this.tracingThread.eventProcessed(event);
+            if (tracingThread != null) {
+                tracingThread.eventProcessed(event);
+            }
         }
 
         if (event instanceof MouseEvent) {
@@ -96,10 +101,13 @@ public final class DMDircEventQueue extends EventQueue implements
         final boolean tracing = IdentityManager.getGlobalConfig().
                 getOptionBool(controller.getDomain(), "debugEDT");
         if (tracing) {
-            this.tracingThread = new TracingEventQueueThread(100);
-            this.tracingThread.start();
+            tracingThread = new TracingEventQueueThread(100);
+            tracingThread.start();
         } else {
-            tracingThread = null;
+            if (tracingThread != null) {
+                tracingThread.cancel();
+                tracingThread = null;
+            }
         }
     }
 

src/com/dmdirc/addons/ui_swing/TracingEventQueueThread.java

@@ -49,6 +49,7 @@ class TracingEventQueueThread extends Thread {
     private long thresholdDelay;
     private Map<AWTEvent, Long> eventTimeMap;
     private ThreadMXBean threadBean;
+    private boolean running = false;
 
     /**
      * Instantiates a new tracing thread.
@@ -142,7 +143,8 @@ class TracingEventQueueThread extends Thread {
     /** {@inheritDoc} */
     @Override
     public void run() {
-        while (true) {
+        running = true;
+        while (running) {
             long currTime = System.currentTimeMillis();
             synchronized (this) {
                 for (Map.Entry<AWTEvent, Long> entry : this.eventTimeMap.
@@ -161,4 +163,11 @@ class TracingEventQueueThread extends Thread {
             }
         }
     }
+
+    /**
+     * Cancels this thread.
+     */
+    public void cancel() {
+        running = false;
+    }
 }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -78,6 +78,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     private ChannelSettingsDialog(final Channel newChannel,
             final Window parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
+        final long time = System.currentTimeMillis();
 
         channel = newChannel;
         identity = IdentityManager.getChannelConfig(channel.getServer().
@@ -85,6 +86,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
 
         initComponents();
         initListeners();
+        System.out.println(System.currentTimeMillis() - time);
     }
 
     /**