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

Timestamp:

2018-08-18T18:35:34+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

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

Files:

• ChannelDiGraphLayer.java (modified) (2 diffs)
• DigraphCreationTask.java (modified) (2 diffs)
• JunctionCheckTask.java (modified) (4 diffs)
• JunctionCheckerMapMode.java (modified) (1 diff)
• JunctionCheckerPlugin.java (modified) (1 diff)
• JunctionSearchTask.java (modified) (2 diffs)
• PrepareJunctionCheckorSearch.java (modified) (3 diffs)
• commandlineinterface/CLI.java (modified) (3 diffs)
• datastructure/ChannelDiGraph.java (modified) (4 diffs)
• junctionchecking/Combination.java (modified) (3 diffs)
• reader/OSMXMLReader.java (modified) (2 diffs)
• reader/XMLFilterReader.java (modified) (2 diffs)
• reader/XMLReader.java (modified) (3 diffs)

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

@@ -16 +16 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -142 +142 @@
 
     private Point getCoord(OSMNode node, MapView mv) {
-        return mv.getPoint(Main.getProjection().latlon2eastNorth(new LatLon(node.getLatitude(), node.getLongitude())));
+        return mv.getPoint(ProjectionRegistry.getProjection().latlon2eastNorth(new LatLon(node.getLatitude(), node.getLongitude())));
     }
 

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

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
@@ -75 +74 @@
         if (MainApplication.getMap() == null
                 || !MainApplication.getMap().isVisible() || !(MainApplication.getLayerManager().getActiveLayer() instanceof OsmDataLayer)) {
-            JOptionPane.showMessageDialog(Main.parent, tr("this layer is no osm data layer"));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("this layer is no osm data layer"));
             return;
         }

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

@@ -10 +10 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -29 +28 @@
     private final int n; //Grad der Kreuzung
     private final HashSet<Channel> subset; //Teilmge der zu prüfenden Channel
-    private final boolean producerelation;
+    private final boolean produceRelation;
     private boolean canceled;
 
@@ -37 +36 @@
         this.n = n;
         this.subset = subset;
-        this.producerelation = produceRelation;
+        this.produceRelation = produceRelation;
         jc = new JunctionChecker(plugin.getChannelDigraph(), n);
     }
@@ -55 +54 @@
         if (jc.isSmallerJunction()) {
             showjunction();
-            JOptionPane.showMessageDialog(Main.parent,
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                 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();
-            JOptionPane.showMessageDialog(Main.parent, tr("The marked channels are a {0}-ways junction", n));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("The marked channels are a {0}-ways junction", n));
             plugin.getChannelDigraph().ereaseJunctioncandidate();
             for (int i = 0; i < jc.getSubJunction().size(); i++) {
                 plugin.getChannelDigraph().addJunctioncandidateChannel(jc.getSubJunction().get(i));
             }
-            if (producerelation) {
+            if (produceRelation) {
                 this.plugin.getRelationProducer().produceRelation(subset, n);
             }
         } else if (!jc.getCheck()) {
-            JOptionPane.showMessageDialog(Main.parent, tr("The marked channels are not a junction:") + jc.getJCheckResult());
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("The marked channels are not a junction:") + jc.getJCheckResult());
         }
     }

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

@@ -11 +11 @@
 import java.awt.event.MouseEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.LatLon;

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

@@ -6 +6 @@
 import java.io.File;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.gui.MainApplication;

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

@@ -10 +10 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -54 +54 @@
         }
         ArrayList<HashSet<Channel>> junctions = jc.getJunctions();
-        JOptionPane.showMessageDialog(Main.parent, tr("Number of {0}-ways junctions found: {1}", n, junctions.size()));
+        JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Number of {0}-ways junctions found: {1}", n, junctions.size()));
         if (produceRelation) {
             for (int i = 0; i < junctions.size(); i++) {

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

@@ -6 +6 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel;
@@ -22 +21 @@
     private final boolean produceRelation;
 
-    public PrepareJunctionCheckorSearch(JunctionCheckerPlugin plugin, int n, boolean producerelation) {
+    public PrepareJunctionCheckorSearch(JunctionCheckerPlugin plugin, int n, boolean produceRelation) {
         this.plugin = plugin;
         this.n = n;
         this.subset = new HashSet<>();
-        this.produceRelation = producerelation;
+        this.produceRelation = produceRelation;
     }
 
@@ -44 +43 @@
     private boolean prepareSubset() {
         if (plugin.getChannelDigraph().getSelectedChannels().size() < 6) {
-            JOptionPane.showMessageDialog(Main.parent, "Less then 6 channels are selected");
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), "Less then 6 channels are selected");
             return false;
         }

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

@@ -16 +16 @@
 import org.openstreetmap.josm.plugins.JunctionChecker.reader.XMLFilterReader;
 import org.openstreetmap.josm.plugins.JunctionChecker.writing.OSMXMLWriter;
+import org.openstreetmap.josm.tools.Logging;
 
 public final class CLI {
@@ -71 +72 @@
         StrongConnectednessCalculator scc = new StrongConnectednessCalculator(cdgb.getDigraph());
         scc.calculateSCC();
-        //System.out.println(scc.showNotstronglyConnectednessParts());
 
         if (maxchannelsearch == 0) {
@@ -77 +77 @@
             try {
                 oxw.writeXML();
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (XMLStreamException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+            } catch (FileNotFoundException | XMLStreamException e) {
+                Logging.error(e);
             }
-            ;
-
-            System.out.println("OSMXML erzeugt, breche an dieser Stelle ab");
             return;
         }

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

@@ -15 +15 @@
     private final ArrayList<LeadsTo> leadsTos = new ArrayList<>();
     private final HashSet<Channel> selectedChannels = new HashSet<>();
-    private HashSet<Channel> junctioncandidate = new HashSet<>();
+    private HashSet<Channel> junctionCandidate = new HashSet<>();
 
     public void setChannels(ArrayList<Channel> channels) {
@@ -271 +271 @@
 
     public HashSet<Channel> getJunctionCandidate() {
-        return junctioncandidate;
+        return junctionCandidate;
     }
 
     public void ereaseJunctioncandidate() {
-        Iterator<Channel> it = junctioncandidate.iterator();
+        Iterator<Channel> it = junctionCandidate.iterator();
         while (it.hasNext()) {
             it.next().setPartOfJunction(false);
         }
-        junctioncandidate.clear();
+        junctionCandidate.clear();
     }
 
@@ -287 +287 @@
      */
     public void setJunctioncandidate(HashSet<Channel> junctionCandidate) {
-        this.junctioncandidate.clear();
-        this.junctioncandidate = junctionCandidate;
+        this.junctionCandidate.clear();
+        this.junctionCandidate = junctionCandidate;
         Iterator<Channel> it = junctionCandidate.iterator();
         while (it.hasNext()) {
@@ -296 +296 @@
 
     public void addJunctioncandidateChannel(Channel channel) {
-        junctioncandidate.add(channel);
+        junctionCandidate.add(channel);
         channel.setPartOfJunction(true);
     }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking;
+
+import org.openstreetmap.josm.tools.Logging;
 
 public class Combination {
@@ -10 +12 @@
     public Combination(long n, long k) {
         if (n < 0 || k < 0)
-            try {
-                throw new Exception("Negative parameter in constructor");
-            } catch (Exception e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
+            Logging.error("Negative parameter in constructor");
         this.n = n;
         this.k = k;
@@ -26 +23 @@
     public static long Choose(long n, long k) {
       if (n < 0 || k < 0)
-        try {
-            throw new Exception("Invalid negative parameter in Choose()");
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+          Logging.error("Invalid negative parameter in Choose()");
       if (n < k) return 0;
       if (n == k) return 1;

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

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.OSMRelation;
 import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.OSMWay;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -175 +176 @@
             }
         } catch (XMLStreamException e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
     }

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.plugins.JunctionChecker.filter.Filter;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -52 +53 @@
             }
         } catch (XMLStreamException e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
     }

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

@@ -9 +9 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+
+import org.openstreetmap.josm.tools.Logging;
 
 public abstract class XMLReader {
@@ -21 +23 @@
                 .createXMLStreamReader(this.getClass().getResourceAsStream(filename));
         } catch (XMLStreamException e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
     }
@@ -29 +31 @@
             parser = factory
                     .createXMLStreamReader(new FileInputStream(file));
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (XMLStreamException e) {
-            e.printStackTrace();
+        } catch (FileNotFoundException | XMLStreamException e) {
+            Logging.error(e);
         }
     }