Changeset 33248 in osm

Timestamp:

2017-04-17T01:11:12+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm14297 - IAE: ChannelDiGraphLayer is not managed by us

Location:

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

Files:

• ChannelDiGraphLayer.java (modified) (6 diffs)
• DigraphCreationTask.java (modified) (2 diffs)
• JunctionCheckTask.java (modified) (1 diff)

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

@@ -12 +12 @@
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Line2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 import javax.swing.Action;
@@ -24 +22 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph;
@@ -38 +32 @@
  *
  */
-public class ChannelDiGraphLayer extends Layer implements LayerChangeListener, PropertyChangeListener {
+public class ChannelDiGraphLayer extends Layer {
 
     private ChannelDiGraph digraph;
@@ -65 +59 @@
     public ChannelDiGraphLayer(ColorSchemeXMLReader cXMLReader) {
         super("ChannelDiGraphLayer");
-        Main.getLayerManager().addLayerChangeListener(this);
         this.cXMLReader = cXMLReader;
         initColors();
@@ -187 +180 @@
     }
 
-    @Override
-    public void layerOrderChanged(LayerOrderChangeEvent e) {
-    }
-
-    @Override
-    public void layerAdded(LayerAddEvent e) {
-    }
-
-    @Override
-    public void layerRemoving(LayerRemoveEvent e) {
-        if (e.getRemovedLayer() == this) {
-            Main.getLayerManager().removeLayerChangeListener(this);
-        }
-    }
-
     public ChannelDiGraph getDigraph() {
         return digraph;
@@ -209 +187 @@
         this.digraph = digraph;
     }
-
-    @Override
-    public void propertyChange(PropertyChangeEvent evt) {
-    }
 }

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

@@ -56 +56 @@
     protected void finish() {
         if (canceled) {
-            Main.getLayerManager().removeLayer(plugin.getChannelDigraphLayer());
-            return;
+            removeDigraphLayer();
+        }
+    }
+
+    private void removeDigraphLayer() {
+        ChannelDiGraphLayer layer = plugin.getChannelDigraphLayer();
+        if (Main.getLayerManager().containsLayer(layer)) {
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -70 +76 @@
             return;
         }
-        Main.getLayerManager().removeLayer(plugin.getChannelDigraphLayer());
+        removeDigraphLayer();
         int tickscounter = 4;
         if (sealGraph) {

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

@@ -55 +55 @@
             showjunction();
             JOptionPane.showMessageDialog(Main.parent,
-                    tr("The marked channels contains a junctioncandidate (white). To test this candidat mark these channel and press the \"Check\" button again."));
+                tr("The marked channels contains a junctioncandidate (white). To test this candidat mark these channel and press the \"Check\" button again."));
         } else if (jc.getCheck()) {
             showjunction();