Ticket #2230: Catch loose threads.patch

src/org/openstreetmap/josm/gui/MapFrame.java

@@ -143 +143 @@
 
         // remove menu entries
         Main.main.menu.viewMenu.setVisible(false);
+        
+        // MapFrame gets destroyed when the last layer is removed, but the status line background
+        // thread that collects the information doesn't get destroyed automatically.
+        if(statusLine.thread == null) return;
+        try {
+            statusLine.thread.interrupt();
+        } catch (Exception e) {}
     }
 
     public Action getDefaultButtonAction() {

src/org/openstreetmap/josm/gui/MapStatus.java

@@ -99 +99 @@
     ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6);
     ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 8);
 
+    public Thread thread;
+    
     /**
      * The collector class that waits for notification and then update
      * the display objects.
@@ -293 +295 @@
 
         // The background thread
         final Collector collector = new Collector(mapFrame);
-        new Thread(collector).start();
+        thread = new Thread(collector, "Map Status Collector");
+        thread.start();
 
         // Listen to keyboard/mouse events for pressing/releasing alt key and
         // inform the collector.
@@ -344 +347 @@
     public String helpTopic() {
         return "Statusline";
     }
-    
+        
     @Override
     public void addMouseListener(MouseListener ml) {
         //super.addMouseListener(ml);

src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -196 +196 @@
     }
 
     public Iterable<Object> start(final Reader in) {
-        new Thread(){
+        new Thread("XML Reader"){
             @Override public void run() {
                 try {
                     SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(in), parser);