Changeset 21474 in osm for applications/editors/josm/plugins

Timestamp:

2010-05-27T21:07:52+02:00 (15 years ago)

Author:

jttt

Message:

Do not reuse old gpx data after layer is removed and EditGpx mode reactivated

Location:

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx

Files:

• EditGpxLayer.java (modified) (1 diff)
• EditGpxMode.java (modified) (7 diffs)
• EditGpxPlugin.java (modified) (4 diffs)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -38 +38 @@
 
         private static Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(EditGpxPlugin.class.getResource("/images/editgpx_layer.png")));
-        private final EditGpxData data;
+        public final EditGpxData data;
         private GPXLayerImportAction layerImport;
 

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

@@ -3 +3 @@
  */
 package org.openstreetmap.josm.plugins.editgpx;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -11 +13 @@
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
+import java.util.List;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.editgpx.data.EditGpxData;
 import org.openstreetmap.josm.plugins.editgpx.data.EditGpxTrack;
@@ -21 +27 @@
 
 
-public class EditGpxMode extends MapMode {
+public class EditGpxMode extends MapMode implements LayerChangeListener {
 
         private static final long serialVersionUID = 7940589057093872411L;
         Point pointPressed;
-        EditGpxData data;
         MapFrame mapFrame;
         Rectangle oldRect;
         MapFrame frame;
+        EditGpxLayer currentEditLayer;
 
-        public EditGpxMode(MapFrame mapFrame, String name, String desc, EditGpxData gpxData) {
+        public EditGpxMode(MapFrame mapFrame, String name, String desc) {
                 super(name, "editgpx_mode.png", desc, mapFrame, Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
-                this.data = gpxData;
         }
 
@@ -39 +44 @@
                 Main.map.mapView.addMouseListener(this);
                 Main.map.mapView.addMouseMotionListener(this);
+                MapView.addLayerChangeListener(this);
+                updateLayer();
         }
 
@@ -63 +70 @@
                 if (e.getButton() != MouseEvent.BUTTON1) {
                         return;
-                } else {
-                        Point pointReleased = e.getPoint();
+                }
 
-                        Rectangle r = createRect(pointReleased, pointPressed);
+                Point pointReleased = e.getPoint();
 
-                        //go through nodes and mark the ones in the selection rect as deleted
-                        for (EditGpxTrack track: data.getTracks()) {
+                Rectangle r = createRect(pointReleased, pointPressed);
+
+                //go through nodes and mark the ones in the selection rect as deleted
+                if (currentEditLayer != null) {
+                        for (EditGpxTrack track: currentEditLayer.data.getTracks()) {
                                 for (EditGpxTrackSegment segment: track.getSegments()) {
                                         for (EditGpxWayPoint wayPoint: segment.getWayPoints()) {
@@ -79 +88 @@
                                 }
                         }
-                        oldRect = null;
-                        Main.map.mapView.repaint();
                 }
+                oldRect = null;
+                Main.map.mapView.repaint();
+
         }
 
@@ -139 +149 @@
                 frame = mapFrame;
         }
+
+        /**
+         * create new layer, add listeners and try importing gpx data.
+         */
+        private void updateLayer() {
+
+                List<EditGpxLayer> layers = Main.map.mapView.getLayersOfType(EditGpxLayer.class);
+                currentEditLayer = layers.isEmpty()?null:layers.get(0);
+
+                if(currentEditLayer == null) {
+                        currentEditLayer = new EditGpxLayer(tr("EditGpx"), new EditGpxData());
+                        Main.main.addLayer(currentEditLayer);
+                        currentEditLayer.initializeImport();
+                }
+                Main.map.mapView.repaint();
+        }
+
+        public void activeLayerChange(Layer oldLayer, Layer newLayer) { }
+
+        public void layerAdded(Layer newLayer) { }
+
+        public void layerRemoved(Layer oldLayer) {
+                if (oldLayer instanceof EditGpxLayer) {
+                        currentEditLayer = null;
+                }
+        }
+
 }

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.net.URL;
 
@@ -15 +13 @@
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.editgpx.data.EditGpxData;
 
 /**
@@ -40 +34 @@
         private IconToggleButton btn;
         private EditGpxMode mode;
-        protected static EditGpxLayer eGpxLayer;
-        protected static EditGpxData gpxData;
-        public static boolean active = false;
 
         public EditGpxPlugin(PluginInformation info) {
                 super(info);
-                gpxData = new EditGpxData();
-                mode = new EditGpxMode(Main.map, "editgpx", tr("edit gpx tracks"), gpxData);
+                mode = new EditGpxMode(Main.map, "editgpx", tr("edit gpx tracks"));
 
                 btn = new IconToggleButton(mode);
@@ -63 +53 @@
                         if(Main.map != null)
                                 Main.map.addMapMode(btn);
-
-                        active = btn.isSelected();
-
-                        btn.addActionListener(new ActionListener() {
-                                public void actionPerformed(ActionEvent e) {
-                                        active = btn.isSelected();
-                                        if (active) {
-                                                Main.worker.execute(new Runnable() {
-                                                        public void run() {
-                                                                updateLayer();
-                                                        }
-                                                });
-                                        }
-                                }
-                        });
                 }
-        }
-
-        /**
-         * create new layer, add listeners and try importing gpx data.
-         */
-        private void updateLayer() {
-                if(eGpxLayer == null) {
-                        eGpxLayer = new EditGpxLayer(tr("EditGpx"), gpxData);
-                        Main.main.addLayer(eGpxLayer);
-                        MapView.addLayerChangeListener(new LayerChangeListener(){
-
-                                public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {
-                                        if(newLayer instanceof EditGpxLayer)
-                                                EditGpxPlugin.eGpxLayer = (EditGpxLayer)newLayer;
-                                }
-
-                                public void layerAdded(final Layer newLayer) {
-                                }
-
-                                public void layerRemoved(final Layer oldLayer) {
-                                        if(oldLayer == eGpxLayer) {
-                                                eGpxLayer = null;
-                                                //dataSet = new DataSet();
-                                                MapView.removeLayerChangeListener(this);
-                                        }
-                                }
-                        });
-
-                        eGpxLayer.initializeImport();
-                }
-                Main.map.mapView.repaint();
         }