Changeset 28610 in osm for applications/editors/josm/plugins/junctionchecking/src/org

Timestamp:

2012-08-24T01:11:59+02:00 (12 years ago)

Author:

donvip

Message:

[josm_junctionchecking] See #josm7980 - Fix memory leaks

Location:

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker

Files:

• JunctionCheckerMapMode.java (modified) (2 diffs)
• JunctionCheckerPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerMapMode.java

@@ -138 +138 @@
          */
         private void paintRect(Point p1, Point p2) {
-                Graphics g = frame.getGraphics();//Main.map.mapView.getGraphics();
-
-                Rectangle r = oldRect;
-                if (r != null) {
-                        //overwrite old rct
+                if (frame != null) {
+                        Graphics g = frame.getGraphics();
+        
+                        Rectangle r = oldRect;
+                        if (r != null) {
+                                //overwrite old rct
+                                g.setXORMode(Color.BLACK);
+                                g.setColor(Color.WHITE);
+                                g.drawRect(r.x,r.y,r.width,r.height);
+                        }
+        
                         g.setXORMode(Color.BLACK);
                         g.setColor(Color.WHITE);
+                        r = createRect(p1,p2);
                         g.drawRect(r.x,r.y,r.width,r.height);
+                        oldRect = r;
                 }
-
-                g.setXORMode(Color.BLACK);
-                g.setColor(Color.WHITE);
-                r = createRect(p1,p2);
-                g.drawRect(r.x,r.y,r.width,r.height);
-                oldRect = r;
         }
 
@@ -162 +164 @@
                 this.digraph = digraph;
         }
+
+        @Override
+        public void destroy() {
+                super.destroy();
+                MapView.removeLayerChangeListener(this);
+        }
 }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java

@@ -49 +49 @@
         @Override
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                jcMapMode.setFrame(newFrame);
                 if (newFrame != null) {
                         junctionCheckDialog = new JunctionCheckDialog(this);
                         newFrame.addToggleDialog(junctionCheckDialog);
                         MapView.addLayerChangeListener(this);
-                        jcMapMode.setFrame(newFrame);
                 } else
                         MapView.removeLayerChangeListener(this);