Changeset 28624 in osm for applications/editors/josm/plugins/routing

Timestamp:

2012-08-24T13:41:33+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] See #josm7980 - Fix memory leaks in alignways, fixAdresses, measurement, routing, turnlanes and waypoint_search plugins

File:

• applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java (modified) (6 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java

@@ -79 +79 @@
          * The side dialog where nodes are listed
          */
-        private final RoutingDialog routingDialog;
+        private RoutingDialog routingDialog;
 
         /**
@@ -147 +147 @@
                 logger.debug("Loading routing plugin...");
                 preferenceSettings=new RoutingPreferenceDialog();
-                // Create side dialog
-                routingDialog = new RoutingDialog();
                 // Initialize layers list
                 layers = new ArrayList<RoutingLayer>();
@@ -188 +186 @@
         @Override
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-                if(newFrame != null) {
+                if (newFrame != null) {
                         // Create plugin map modes
                         addRouteNodeAction = new AddRouteNodeAction(newFrame);
@@ -205 +203 @@
                         // Enable menu
                         menu.enableStartItem();
-                        newFrame.addToggleDialog(routingDialog);
+                        newFrame.addToggleDialog(routingDialog = new RoutingDialog());
+                } else {
+                        addRouteNodeAction = null;
+                        removeRouteNodeAction = null;
+                        moveRouteNodeAction = null;
+                        addRouteNodeButton = null;
+                        removeRouteNodeButton = null;
+                        moveRouteNodeButton = null;
+                        routingDialog = null;
                 }
         }
@@ -216 +222 @@
                 if (newLayer instanceof RoutingLayer) {                 /*   show Routing toolbar and dialog window  */
                         menu.enableRestOfItems();
-                        routingDialog.showDialog();
-                        routingDialog.refresh();
+                        if (routingDialog != null) {
+                                routingDialog.showDialog();
+                                routingDialog.refresh();
+                        }
                 }else{                                                                                  /*   hide Routing toolbar and dialog window  */
                         menu.disableRestOfItems();
-                        routingDialog.hideDialog();
+                        if (routingDialog != null) {
+                                routingDialog.hideDialog();
+                        }
                 }
         }
@@ -267 +277 @@
                 }
                 // Reload RoutingDialog table model
-                routingDialog.refresh();
+                if (routingDialog != null) {
+                        routingDialog.refresh();
+                }
         }