Changeset 1440 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-02-24T18:25:35+01:00 (16 years ago)

Author:

stoecker

Message:

close #2230. patch by xeen

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MapFrame.java (modified) (1 diff)
• gui/MapStatus.java (modified) (3 diffs)
• tools/XmlObjectParser.java (modified) (1 diff)

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

@@ -144 +144 @@
         // 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) {}
     }
 

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

@@ -100 +100 @@
     ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 8);
 
+    /**
+     * This is the thread that runs in the background and collects the information displayed.
+     * It gets destroyed by MapFrame.java/destroy() when the MapFrame itself is destroyed.
+     */
+    public Thread thread;
+    
     /**
      * The collector class that waits for notification and then update
@@ -294 +300 @@
         // The background thread
         final Collector collector = new Collector(mapFrame);
-        new Thread(collector).start();
+        thread = new Thread(collector, "Map Status Collector");
+        thread.setDaemon(true);
+        thread.start();
 
         // Listen to keyboard/mouse events for pressing/releasing alt key and
@@ -345 +353 @@
         return "Statusline";
     }
-    
+        
     @Override
     public void addMouseListener(MouseListener ml) {

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

@@ -197 +197 @@
 
     public Iterable<Object> start(final Reader in) {
-        new Thread(){
+        new Thread("XML Reader"){
             @Override public void run() {
                 try {