Changeset 28622 in osm for applications/editors/josm

Timestamp:

2012-08-24T02:19:02+02:00 (12 years ago)

Author:

donvip

Message:

[josm_elevation_profile] See #josm7980 - Fix memory leak

File:

• applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java

@@ -29 +29 @@
  */
 public class ElevationProfilePlugin extends Plugin {
-        protected static ElevationProfileDialog eleProfileDlg;
+        
         private ElevationMapMode eleMode;
         private IconToggleButton eleModeButton;
@@ -42 +42 @@
 
                 try {
-                        eleProfileDlg = new ElevationProfileDialog();
-                        
                         eleMode = new ElevationMapMode("Elevation profile", Main.map);
                         eleModeButton = new IconToggleButton(eleMode);
@@ -62 +60 @@
                 
                 if (newFrame != null) {
+                        newFrame.toolGroup.add(eleModeButton);
+                        ElevationProfileDialog eleProfileDlg = new ElevationProfileDialog();
+                        eleProfileDlg.addModelListener(eleMode);
+                        eleProfileDlg.setProfileLayer(getCurrentLayer());
                         newFrame.addToggleDialog(eleProfileDlg);
-                        eleProfileDlg.addModelListener(eleMode);                        
-                }
-                
-                if(Main.map != null){
-                        Main.map.toolGroup.add(eleModeButton);
-                        eleProfileDlg.setProfileLayer(getCurrentLayer());
                 }
         }