Changeset 33778 in osm for applications/editors/josm/plugins/junctionchecking/src

Timestamp:

2017-11-05T19:24:23+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12636

Location:

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

Files:

• DigraphCreationTask.java (modified) (5 diffs)
• JunctionCheckDialog.java (modified) (5 diffs)
• JunctionCheckTask.java (modified) (2 diffs)
• JunctionCheckerMapMode.java (modified) (4 diffs)
• JunctionCheckerPlugin.java (modified) (3 diffs)
• PrepareJunctionCheckorSearch.java (modified) (3 diffs)
• util/RelationProducer.java (modified) (2 diffs)

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -62 +64 @@
     private void removeDigraphLayer() {
         ChannelDiGraphLayer layer = plugin.getChannelDigraphLayer();
-        if (Main.getLayerManager().containsLayer(layer)) {
-            Main.getLayerManager().removeLayer(layer);
+        if (MainApplication.getLayerManager().containsLayer(layer)) {
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }
@@ -71 +73 @@
     OsmTransferException {
         //Prüfen, ob der ausgewählte Layer ein OSMDataLayer ist
-        if (Main.map == null
-                || !Main.map.isVisible() || !(Main.getLayerManager().getActiveLayer() instanceof OsmDataLayer)) {
+        if (MainApplication.getMap() == null
+                || !MainApplication.getMap().isVisible() || !(MainApplication.getLayerManager().getActiveLayer() instanceof OsmDataLayer)) {
             JOptionPane.showMessageDialog(Main.parent, tr("this layer is no osm data layer"));
             return;
@@ -91 +93 @@
         OSMGraph graph = new OSMGraph();
         //Der vom Benutzer in JOSM ausgewählte, zur Zeit aktive Layer wird der PLugin-OSM-Layer
-        plugin.setOsmlayer((OsmDataLayer) Main.getLayerManager().getActiveLayer());
-        Iterator<Node> it = Main.getLayerManager().getEditDataSet().getNodes().iterator();
+        plugin.setOsmlayer((OsmDataLayer) MainApplication.getLayerManager().getActiveLayer());
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        Iterator<Node> it = ds.getNodes().iterator();
         while (it.hasNext()) {
             graph.addNode(it.next());
         }
-
-        Iterator<Way> itway = Main.getLayerManager().getEditDataSet().getWays()
-        .iterator();
+        Iterator<Way> itway = ds.getWays().iterator();
         while (itway.hasNext()) {
             graph.addWay(itway.next());
         }
-        Iterator<Relation> itrel = Main.getLayerManager().getEditDataSet().getRelations()
-        .iterator();
+        Iterator<Relation> itrel = ds.getRelations().iterator();
         while (itrel.hasNext()) {
             graph.addRelation(itrel.next());
         }
-        Iterator<DataSource> itdata = Main.getLayerManager().getEditDataSet().getDataSources().iterator();
+        Iterator<DataSource> itdata = ds.getDataSources().iterator();
         while (itdata.hasNext()) {
             Bounds b = itdata.next().bounds;
@@ -151 +151 @@
         plugin.setChannelDigraph(cdgb.getDigraph());
         plugin.getJcMapMode().setDigraph(cdgb.getDigraph());
-        plugin.setNormalMapMode(Main.map.mapMode);
-        Main.map.selectMapMode(plugin.getJcMapMode());
-        Main.getLayerManager().addLayer(plugin.getChannelDigraphLayer());
-        Main.getLayerManager().setActiveLayer(plugin.getChannelDigraphLayer());
+        plugin.setNormalMapMode(MainApplication.getMap().mapMode);
+        MainApplication.getMap().selectMapMode(plugin.getJcMapMode());
+        MainApplication.getLayerManager().addLayer(plugin.getChannelDigraphLayer());
+        MainApplication.getLayerManager().setActiveLayer(plugin.getChannelDigraphLayer());
     }
 }

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

@@ -19 +19 @@
 import javax.swing.border.TitledBorder;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -95 +95 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                    DigraphCreationTask dct = new DigraphCreationTask(plugin, digraphsealcb.isSelected(), sccCB.isSelected());
-                    Main.worker.submit(dct);
-                    setActivateJunctionCheckOrSearch(true);
+                MainApplication.worker.submit(new DigraphCreationTask(plugin, digraphsealcb.isSelected(), sccCB.isSelected()));
+                setActivateJunctionCheckOrSearch(true);
             }
         });
@@ -108 +107 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                PrepareJunctionCheckorSearch pjc = new PrepareJunctionCheckorSearch(plugin, smodel.getNumber().intValue(), produceRelation.isSelected());
-                pjc.prepareJunctionCheck();
+                new PrepareJunctionCheckorSearch(plugin, smodel.getNumber().intValue(), produceRelation.isSelected()).prepareJunctionCheck();
             }
         });
@@ -121 +119 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                PrepareJunctionCheckorSearch pjc = new PrepareJunctionCheckorSearch(plugin, smodel.getNumber().intValue(), produceRelation.isSelected());
-                pjc.prepareJunctionSearch();
+                new PrepareJunctionCheckorSearch(plugin, smodel.getNumber().intValue(), produceRelation.isSelected()).prepareJunctionSearch();
             }
         });
@@ -131 +128 @@
         }));
     }
-
 
     /**

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

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -89 +90 @@
             plugin.getChannelDigraph().addJunctioncandidateChannel(jc.getSubJunction().get(i));
         }
-        Main.getLayerManager().setActiveLayer(plugin.getChannelDigraphLayer());
+        MainApplication.getLayerManager().setActiveLayer(plugin.getChannelDigraphLayer());
     }
 }

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

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -40 +41 @@
     @Override public void enterMode() {
         super.enterMode();
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getMap().mapView.addMouseListener(this);
+        MainApplication.getMap().mapView.addMouseMotionListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
     }
 
     @Override public void exitMode() {
         super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeMouseMotionListener(this);
+        MainApplication.getMap().mapView.removeMouseListener(this);
+        MainApplication.getMap().mapView.removeMouseMotionListener(this);
     }
 
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        Layer newLayer = Main.getLayerManager().getActiveLayer();
+        Layer newLayer = MainApplication.getLayerManager().getActiveLayer();
         if (newLayer instanceof ChannelDiGraphLayer) {
             layer = (ChannelDiGraphLayer) newLayer;
@@ -91 +92 @@
         //go through nodes and mark the ones in the selection rect as deleted
         if (layer != null && digraph != null) {
-            LatLon lefttop = Main.map.mapView.getLatLon(r.x + r.width, r.y + r.height);
-            LatLon rightbottom = Main.map.mapView.getLatLon(r.x, r.y);
+            LatLon lefttop = MainApplication.getMap().mapView.getLatLon(r.x + r.width, r.y + r.height);
+            LatLon rightbottom = MainApplication.getMap().mapView.getLatLon(r.x, r.y);
             digraph.detectSelectedChannels(rightbottom.lon(), rightbottom.lat(), lefttop.lon(), lefttop.lat());
         }
         oldRect = null;
-        Main.map.mapView.repaint();
+        MainApplication.getMap().mapView.repaint();
 
     }
@@ -164 +165 @@
     public void destroy() {
         super.destroy();
-        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
     }
 }

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

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -54 +55 @@
             junctionCheckDialog = new JunctionCheckDialog(this);
             newFrame.addToggleDialog(junctionCheckDialog);
-            Main.getLayerManager().addLayerChangeListener(this);
+            MainApplication.getLayerManager().addLayerChangeListener(this);
         } else
-            Main.getLayerManager().removeLayerChangeListener(this);
+            MainApplication.getLayerManager().removeLayerChangeListener(this);
     }
 
@@ -64 +65 @@
             this.getJunctionCheckDialog().setActivateJunctionCheckOrSearch(false);
             if (normalMapMode != null) {
-                Main.map.selectMapMode(normalMapMode);
+                MainApplication.getMap().selectMapMode(normalMapMode);
             }
         } else if (newLayer instanceof ChannelDiGraphLayer) {
             this.getJunctionCheckDialog().setActivateCreateDigraph(false);
             this.getJunctionCheckDialog().setActivateJunctionCheckOrSearch(true);
-            Main.map.selectMapMode(jcMapMode);
+            MainApplication.getMap().selectMapMode(jcMapMode);
         }
     }

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel;
 
@@ -31 +32 @@
         if (prepareSubset()) {
             jct = new JunctionCheckTask(plugin, n, subset, produceRelation);
-            Main.worker.submit(jct);
+            MainApplication.worker.submit(jct);
         }
     }
@@ -37 +38 @@
     protected void prepareJunctionSearch() {
         if (prepareSubset()) {
-            JunctionSearchTask jst = new JunctionSearchTask(plugin, n, subset, produceRelation);
-            Main.worker.submit(jst);
+            MainApplication.worker.submit(new JunctionSearchTask(plugin, n, subset, produceRelation));
         }
     }

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

@@ -6 +6 @@
 import java.util.LinkedList;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.JunctionChecker.JunctionCheckerPlugin;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel;
@@ -43 +43 @@
             }
         }
-        Main.getLayerManager().setActiveLayer(plugin.getOsmlayer());
+        MainApplication.getLayerManager().setActiveLayer(plugin.getOsmlayer());
         plugin.getOsmlayer().data.setSelected(ways);