Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -40,5 +41,5 @@ private ChannelDiGraph digraph; - private static final int POINTSIZE = 5;//original 3 + private static final int POINTSIZE = 5; //original 3 private static final float LINEWIDTH = 4; //original 2 private final ColorSchemeXMLReader cXMLReader; @@ -47,5 +48,5 @@ static { Polygon head = new Polygon(); - head.addPoint( 0, 0); + head.addPoint(0, 0); head.addPoint(-15, +4); head.addPoint(-15, -4); @@ -62,5 +63,5 @@ private Color partOfJunctionColor; - public ChannelDiGraphLayer(ColorSchemeXMLReader cXMLReader){ + public ChannelDiGraphLayer(ColorSchemeXMLReader cXMLReader) { super("ChannelDiGraphLayer"); Main.getLayerManager().addLayerChangeListener(this); @@ -97,5 +98,5 @@ @Override public String getToolTipText() { - return tr ("Channel-Digraph created from the active OSM-Layer"); + return tr("Channel-Digraph created from the active OSM-Layer"); } @@ -128,15 +129,11 @@ if (channel.isPartOfJunction()) { c = partOfJunctionColor; - } - else if (channel.isSelected() == true) { + } else if (channel.isSelected() == true) { c = selectedChannelColor; - } - else if (channel.isStrongConnected() == false) { - c= nsccChannelColor; - } - else if (channel.getBackChannelID() != -100) { + } else if (channel.isStrongConnected() == false) { + c = nsccChannelColor; + } else if (channel.getBackChannelID() != -100) { c = twoWayChannelColor; - } - else { + } else { c = oneWayChannelColor; } @@ -149,5 +146,4 @@ head = AffineTransform.getTranslateInstance(toPoint.x, toPoint.y).createTransformedShape(head); g.fill(head); - } @@ -168,9 +164,9 @@ final float vecY = p2.y - p1.y; - final float vecLength = (float)Math.sqrt(vecX*vecX + vecY*vecY); + final float vecLength = (float) Math.sqrt(vecX*vecX + vecY*vecY); final float dotProductVecAxis = vecX; - float angle = (float)Math.acos(dotProductVecAxis / vecLength); + float angle = (float) Math.acos(dotProductVecAxis / vecLength); if (p2.y < p1.y) { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -40,5 +41,5 @@ public DigraphCreationTask(JunctionCheckerPlugin plugin, boolean sealGraph, boolean calculateSCC) { - super(tr ("Create Channel Digraph"), false); + super(tr("Create Channel Digraph"), false); this.plugin = plugin; this.sealGraph = sealGraph; @@ -79,10 +80,10 @@ getProgressMonitor().setTicksCount(tickscounter); tickscounter = 1; - getProgressMonitor().subTask(tr ("Converting OSM graph into Channel Digraph")); + getProgressMonitor().subTask(tr("Converting OSM graph into Channel Digraph")); getProgressMonitor().setTicks(tickscounter++); 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()); + plugin.setOsmlayer((OsmDataLayer) Main.getLayerManager().getActiveLayer()); Iterator it = Main.getLayerManager().getEditDataSet().getNodes().iterator(); while (it.hasNext()) { @@ -117,5 +118,5 @@ ExecuteFilter ef = new ExecuteFilter(reader.getFilters(), graph); ef.filter(); - getProgressMonitor().subTask(tr ("creating Channel-Digraph")); + getProgressMonitor().subTask(tr("creating Channel-Digraph")); getProgressMonitor().setTicks(tickscounter++); // ChannelDiGraphen erzeugen @@ -125,5 +126,5 @@ // DiGraph "versiegeln" if (sealGraph) { - getProgressMonitor().subTask(tr ("sealing Digraph")); + getProgressMonitor().subTask(tr("sealing Digraph")); getProgressMonitor().setTicks(tickscounter++); DiGraphSealer sealer = new DiGraphSealer(cdgb.getDigraph(), cdgb @@ -133,9 +134,9 @@ //Digraph starke Zusammenhangskomponenten berechnen if (calculateSCC) { - getProgressMonitor().subTask(tr ("calculating Strong Connectedness")); + getProgressMonitor().subTask(tr("calculating Strong Connectedness")); getProgressMonitor().setTicks(tickscounter++); scc.calculateSCC(); } - getProgressMonitor().subTask(tr ("creating DigraphLayer")); + getProgressMonitor().subTask(tr("creating DigraphLayer")); getProgressMonitor().setTicks(tickscounter++); plugin.setChannelDigraph(cdgb.getDigraph()); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -31,5 +32,5 @@ * @author joerg */ -public class JunctionCheckDialog extends ToggleDialog implements SelectionChangedListener{ +public class JunctionCheckDialog extends ToggleDialog implements SelectionChangedListener { private final JunctionCheckerPlugin plugin; @@ -67,5 +68,5 @@ //Elemente für Grad-Auswahl der Kreuzung - JPanel spinnerpanel = new JPanel(new GridLayout(1,2)); + JPanel spinnerpanel = new JPanel(new GridLayout(1, 2)); smodel = new SpinnerNumberModel(3, 1, 20, 1); nways = new JSpinner(smodel); @@ -137,5 +138,4 @@ /** * (de)aktiviert Buttons zum JunctionCheck oder Suche - * @param activate */ public void setActivateJunctionCheckOrSearch(boolean activate) { @@ -149,5 +149,4 @@ /** * (de)aktiviert Buttons zur Channel Digraph Erstellung - * @param activate */ public void setActivateCreateDigraph(final boolean activate) { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -21,5 +22,5 @@ * @author joerg */ -public class JunctionCheckTask extends PleaseWaitRunnable{ +public class JunctionCheckTask extends PleaseWaitRunnable { private final JunctionChecker jc; @@ -36,5 +37,5 @@ this.subset = subset; this.producerelation = produceRelation; - jc = new JunctionChecker(plugin.getChannelDigraph() , n); + jc = new JunctionChecker(plugin.getChannelDigraph(), n); } @@ -51,11 +52,11 @@ } progressMonitor.finishTask(); - if (jc.isSmallerJunction() ) { + if (jc.isSmallerJunction()) { 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.")); - } - else if (jc.getCheck()) { + 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.")); + } else if (jc.getCheck()) { showjunction(); - JOptionPane.showMessageDialog(Main.parent, tr ("The marked channels are a {0}-ways junction", n)); + JOptionPane.showMessageDialog(Main.parent, tr("The marked channels are a {0}-ways junction", n)); plugin.getChannelDigraph().ereaseJunctioncandidate(); for (int i = 0; i < jc.getSubJunction().size(); i++) { @@ -65,10 +66,7 @@ this.plugin.getRelationProducer().produceRelation(subset, n); } + } else if (!jc.getCheck()) { + JOptionPane.showMessageDialog(Main.parent, tr("The marked channels are not a junction:") + jc.getJCheckResult()); } - else if (!jc.getCheck()) { - JOptionPane.showMessageDialog(Main.parent, tr ("The marked channels are not a junction:") + jc.getJCheckResult()); - - } - } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerMapMode.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerMapMode.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerMapMode.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -66,7 +67,6 @@ } - @Override public void mouseDragged(MouseEvent e) { - if ( (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) { + if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) { //if button1 is hold, draw the rectangle. paintRect(pointPressed, e.getPoint()); @@ -79,5 +79,5 @@ } requestFocusInMapView(); - digraph.ereaseJunctioncandidate();//um zu verhindern, dass gefundene Kreuzungen/Kandidaten weiterhin weiß gezeichnet werden + digraph.ereaseJunctioncandidate(); //um zu verhindern, dass gefundene Kreuzungen/Kandidaten weiterhin weiß gezeichnet werden Point pointReleased = e.getPoint(); @@ -104,5 +104,5 @@ */ public Rectangle createRect(Point p1, Point p2) { - int x,y,w,h; + int x, y, w, h; if (p1.x == p2.x && p1.y == p2.y) { //if p1 and p2 same points draw a small rectangle around them @@ -112,5 +112,5 @@ h = 3; } else { - if (p1.x < p2.x){ + if (p1.x < p2.x) { x = p1.x; w = p2.x-p1.x; @@ -127,5 +127,5 @@ } } - return new Rectangle(x,y,w,h); + return new Rectangle(x, y, w, h); } @@ -136,5 +136,5 @@ if (frame != null) { Graphics g = frame.getGraphics(); - + Rectangle r = oldRect; if (r != null) { @@ -142,11 +142,11 @@ g.setXORMode(Color.BLACK); g.setColor(Color.WHITE); - g.drawRect(r.x,r.y,r.width,r.height); + g.drawRect(r.x, r.y, r.width, r.height); } - + g.setXORMode(Color.BLACK); g.setColor(Color.WHITE); - r = createRect(p1,p2); - g.drawRect(r.x,r.y,r.width,r.height); + r = createRect(p1, p2); + g.drawRect(r.x, r.y, r.width, r.height); oldRect = r; } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java (revision 32596) @@ -1,5 +1,3 @@ -/** - * License: GPL. Copyright 2011. Jörg Possin (joerg.possin@uni-muenster.de) - */ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -24,8 +22,8 @@ /** - * - * This plugins helps to create a channel digraph und check channels in this network if it is a + * + * This plugins helps to create a channel digraph und check channels in this network if it is a * junction or searches in a subgraph after junctions. - * + * @author Jörg Possin (joerg.possin@uni-muenster.de) */ public class JunctionCheckerPlugin extends Plugin implements LayerChangeListener { @@ -89,6 +87,5 @@ this.getJunctionCheckDialog().setActivateJunctionCheckOrSearch(false); return; - } - else { + } else { this.getJunctionCheckDialog().setActivateCreateDigraph(false); } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -20,5 +21,5 @@ * @author joerg */ -public class JunctionSearchTask extends PleaseWaitRunnable{ +public class JunctionSearchTask extends PleaseWaitRunnable { private final JunctionChecker jc; @@ -32,5 +33,5 @@ HashSet subset, boolean produceRelation) { - super("JunctionSearch",false); + super("JunctionSearch", false); this.plugin = plugin; this.n = n; @@ -56,5 +57,5 @@ if (produceRelation) { for (int i = 0; i < junctions.size(); i++) { - plugin.getRelationProducer().produceRelation(junctions.get(i) , n); + plugin.getRelationProducer().produceRelation(junctions.get(i), n); } } @@ -66,4 +67,3 @@ jc.junctionSearch(new ArrayList<>(subset), getProgressMonitor()); } - } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/PrepareJunctionCheckorSearch.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/PrepareJunctionCheckorSearch.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/PrepareJunctionCheckorSearch.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker; @@ -27,5 +28,4 @@ } - protected void prepareJunctionCheck() { if (prepareSubset()) { @@ -42,5 +42,5 @@ } - private boolean prepareSubset(){ + private boolean prepareSubset() { if (plugin.getChannelDigraph().getSelectedChannels().size() < 6) { JOptionPane.showMessageDialog(Main.parent, "Less then 6 channels are selected"); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.commandlineinterface; @@ -16,9 +17,8 @@ import org.openstreetmap.josm.plugins.JunctionChecker.writing.OSMXMLWriter; -public class CLI { +public final class CLI { /** * Die Klasse ist zum Erstellen statistischer Tests, oder zur Erzeugung einer Channel-Digraph-XML-Datei - * @param args */ public static void main(String[] args) { @@ -136,5 +136,5 @@ measuredIterateThroughTime = 0; measuredGenerateSubColumnTime = 0; - measuredTime =0; + measuredTime = 0; jcf = 0; //System.out.println("maxchannel: " + i); @@ -148,5 +148,5 @@ .size()) * Math.random())); } - while(!seed.isStrongConnected()); + while (!seed.isStrongConnected()); subset.add(seed); //System.out.println("Seed: " + seed.getNewid()); @@ -161,10 +161,9 @@ seed = tempChannel; isIn = true; - } - else { + } else { vorChannel = tempChannel; isIn = false; } - }while (isIn == false); + } while (isIn == false); } start = System.currentTimeMillis(); @@ -176,5 +175,8 @@ jcf = jcf + jc.getJunctions().size(); } - System.out.println("Channels: " + (i) + " Time(Iterate): " + (measuredIterateThroughTime/runs) + " Time(Generate): " + (measuredGenerateSubColumnTime/runs) +" Time(overall): "+ (measuredTime/runs) + " junctionsfound: " + jcf); + System.out.println("Channels: " + (i) + + " Time(Iterate): " + (measuredIterateThroughTime/runs) + + " Time(Generate): " + (measuredGenerateSubColumnTime/runs) + + " Time(overall): "+ (measuredTime/runs) + " junctionsfound: " + jcf); } } @@ -182,14 +184,11 @@ private static Channel getNeighbourChannel(Channel seedChannel) { if (Math.random() < 0.5) { - if (seedChannel.getPredChannels().size() >=1 ) { + if (seedChannel.getPredChannels().size() >= 1) { return seedChannel.getPredChannels().get((int) (seedChannel.getPredChannels().size() * Math.random())); - } - else return seedChannel; - } - else { - if (seedChannel.getLeadsTo().size() >=1 ) { + } else return seedChannel; + } else { + if (seedChannel.getLeadsTo().size() >= 1) { return seedChannel.getLeadsTo().get((int) (seedChannel.getLeadsTo().size() * Math.random())).getToChannel(); - } - else return seedChannel; + } else return seedChannel; } } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/BacktrackingColors.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/BacktrackingColors.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/BacktrackingColors.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.connectedness; @@ -4,6 +5,6 @@ * @author joerg */ -public class BacktrackingColors { - +public final class BacktrackingColors { + public static final int WHITE = -1; public static final int GREY = 0; Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.connectedness; @@ -6,5 +7,4 @@ import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.LeadsTo; - /** @@ -105,5 +105,5 @@ this.deleteDuplicateChannels(); } - + /* private void showLeadsTo() { @@ -135,9 +135,6 @@ } - /* + /** * setzt Wert für IDs für neu angelegte Ways - */ - /** - * @param newID */ public void setNewID(int newID) { @@ -146,5 +143,4 @@ /** - * @return * @uml.property name="newID" */ Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/StrongConnectednessCalculator.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/StrongConnectednessCalculator.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/StrongConnectednessCalculator.java (revision 32596) @@ -1,5 +1,7 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.connectedness; import java.util.ArrayList; + import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph; @@ -96,5 +98,4 @@ * gibt eine Arraylist mit all den Channels zurück, welche nicht * im größten zusammenhägendem Teil des Channel-Digraphen sind - * @return */ public ArrayList getNotConnectedChannels() { @@ -116,6 +117,5 @@ tarjan(n); v.setLowlink(Math.min(v.getLowlink(), n.getLowlink())); - } - else if (stack.contains(n)) { + } else if (stack.contains(n)) { //log.trace("setze lowlink von n auf: " + v.getLowlink()); v.setLowlink(Math.min(v.getLowlink(), n.getLowlink())); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/ChannelDigraphBuilder.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/ChannelDigraphBuilder.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/ChannelDigraphBuilder.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.converting; @@ -49,5 +50,4 @@ * @param toNode toNode des zu erstellnenden Channels * @param way ein zu dem Channel gehörender Way - * @return */ private Channel createChannel(OSMNode fromNode, OSMNode toNode, OSMWay way) { @@ -95,8 +95,7 @@ } lastUsedNode = nodes[i]; - } // wenn der betrachtete Knoten keine Nachfolger hat, ist ein // Straßenende erreicht. Auch in diesem Fall muß ein Channel erzeugt werden - else if (nodes[i].getSuccNodeList().size() == 0) { + } else if (nodes[i].getSuccNodeList().size() == 0) { tempChannel = createChannel(lastUsedNode, nodes[i], way); // Rückrichtung wird nur erzeugt, wenn der OSM-Way keine Einbahnstraße ist @@ -104,5 +103,4 @@ createBackChannel(nodes[i], lastUsedNode, way, tempChannel); } - } // eine Straße besteht aus 2 Ways, obwohl eigentlich eine reicht // tritt z.b. bei einer brücke auf, brücke wird neuer channel @@ -110,5 +108,5 @@ // Idee: speichern eines flags, um diese erzeugten Channels zu markieren. aus diesen informationen // später den CHannel löschen!!! - else if (i == nodes.length - 1 + } else if (i == nodes.length - 1 && nodes[i].getSuccNodeList().size() == 1) { // damit ist ein Channel gefunden, und wird mit Werten gefüllt @@ -120,7 +118,5 @@ } lastUsedNode = nodes[i]; - } - } } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/NodesConnectionProducer.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/NodesConnectionProducer.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/NodesConnectionProducer.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.converting; @@ -11,5 +12,5 @@ */ public class NodesConnectionProducer { - + private OSMGraph osmgraph; private OSMWay[] osmways; @@ -19,5 +20,5 @@ osmways = this.osmgraph.getWays(); } - + public void produceNodesConnections() { OSMNode[] waynodes; Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/PseudoChannelRemover.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/PseudoChannelRemover.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/PseudoChannelRemover.java (revision 32596) @@ -1,5 +1,7 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.converting; import java.util.ArrayList; + import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph; @@ -48,5 +50,5 @@ //TODO: quick'n'dirty - ArrayList< LeadsTo> tls = succChannel.getLeadsTo(); + ArrayList tls = succChannel.getLeadsTo(); for (int i = 0; i < tls.size(); i++) { digraph.removeLeadsTo(tls.get(i)); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java (revision 32596) @@ -1,5 +1,7 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.converting; import java.util.ArrayList; + import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph; @@ -13,5 +15,5 @@ * Channels des aus dem OSMGraphen erzeugten ChannelDigraphen dementsprechend * an. wird vom ChannelDigraphBuilder aufgerufen - * + * * @author Jörg Possin */ @@ -62,9 +64,8 @@ channelDigraph.addLeadsTo(tempLeadsTo); toChannel.addPredChannel(fromChannel); - } /* * der no_* Fall: wie oben, nur das hier nichts geschieht */ - else if (turnrestrictionsrelations.get(relationpointer).getValue( + } else if (turnrestrictionsrelations.get(relationpointer).getValue( "restriction").startsWith("no")) { for (int i = 0; i < fromChannel.getToNode() Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/BasicChannel.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/BasicChannel.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/BasicChannel.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -32,5 +33,4 @@ /** * setzt den ToNode - * @param toNode */ public void setToNode(OSMNode toNode) { @@ -61,5 +61,4 @@ /** * fügt eine LeadsTo-Beziehung hinzu - * @param leadsTo */ public void addLeadsTo(LeadsTo leadsTo) { @@ -83,5 +82,4 @@ /** * gibt alle leadsTo zurück - * @return */ public ArrayList getLeadsTo() { @@ -92,5 +90,4 @@ * fügt einen Way hinzu, aus dem der Channel enstanden ist * es gibt immer mind. einen Way, es können aber auch mehr sein - * @param way */ public void addWay(OSMWay way) { @@ -100,5 +97,4 @@ /** * gibt alle Ways zurück - * @return */ public ArrayList getWays() { @@ -111,6 +107,4 @@ * mit Werten zu füllen dabei gehen Informationen verloren, da ein Channel * aus mehr als einem Way bestehen kann - * - * @return */ public OSMWay getWay() { @@ -119,5 +113,6 @@ /** - * setzt die ID des Channels. es kann nicht die ID des Ways übernommen werden, da aus einem Way oftmals mehrere Channels entstehen (z.B. bei jeder Nichteinbahnstraße mind. 2) + * setzt die ID des Channels. + * es kann nicht die ID des Ways übernommen werden, da aus einem Way oftmals mehrere Channels entstehen (z.B. bei jeder Nichteinbahnstraße mind. 2) */ public void setNewid(int newid) { @@ -134,5 +129,4 @@ /** * gibt alle VorgängerChannels zurück - * @return */ public ArrayList getPredChannels() { @@ -145,5 +139,5 @@ @Override public String toString() { - String lt =""; + String lt = ""; for (int i = 0; i < leadsTo.size(); i++) { lt += leadsTo.get(i).getToChannel().getNewid() + ", "; @@ -153,5 +147,6 @@ predch += predChannels.get(i).getNewid() + ", "; } - return "[ChannelID: "+ newid + ":AnzahlPredCH: " + predChannels.size() + ":PredCh: " + predch + ":AnzahlSuccCH: " + leadsTo.size() +":LeadsTo: " + lt+ ":backCHID: " + backChannelID + "]"; + return "[ChannelID: "+ newid + ":AnzahlPredCH: " + predChannels.size() + ":PredCh: " + predch + + ":AnzahlSuccCH: " + leadsTo.size() +":LeadsTo: " + lt+ ":backCHID: " + backChannelID + "]"; } @@ -173,5 +168,5 @@ way.addNode(this.fromNode); way.addNode(this.toNode); - way.setId((long)this.newid); + way.setId((long) this.newid); if (this.getWay() != null) { way.setHashmap(this.getWay().getHashmap()); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Channel.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Channel.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Channel.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -10,5 +11,5 @@ * @author joerg */ -public class Channel extends BasicChannel{ +public class Channel extends BasicChannel { //für den Junctioncheck @@ -22,7 +23,6 @@ private boolean isSelected = false; //wird für den eigenen Layer benötigt, um markierte Channels zu erhalten private boolean isPartOfJunction = false; //wird für den eigenen Layer benötigt, um Teile einer Kreuzung farbig repräsentieren zu können - - private final HashMap> paths2 = new HashMap<>(); - + + private final HashMap> paths2 = new HashMap<>(); public Channel(OSMNode fromNode, OSMNode toNode) { @@ -35,5 +35,5 @@ } - public Channel(){ + public Channel() { super(); //this.insidenodes = new ArrayList(); @@ -45,5 +45,4 @@ /** * gibt die Anzahl der auf diesen Channel verweisenden leadsTo zurück - * @return */ public int getIndegree() { @@ -53,5 +52,4 @@ /** * gibt die Anzahl der aus diesem Channel gehenden leadsTo zurück - * @return */ public int getOutdegree() { @@ -63,5 +61,5 @@ } - public void setOutdegree(int i){ + public void setOutdegree(int i) { this.outdegree = i; } @@ -91,5 +89,4 @@ /** * gibt die von diesem Channel zu erreichenden anderen CHannels zurück - * @return */ public ArrayList getReachableNodes() { @@ -99,5 +96,4 @@ /** * setzt die zu erreichenden Channels alle anderen werden gelöscht - * @param reachableNodes */ public int getEnnr() { @@ -107,5 +103,4 @@ /** * setzt die Anzahl der EingangsChannel - * @param ennr */ public void setEnnr(int ennr) { @@ -129,5 +124,4 @@ /** * fügt einen erreichbaren Channel hinzu - * @param node */ public void addReachableNode(Channel node) { @@ -140,6 +134,4 @@ /** * gibt den an der Position i gespeicherten erreichbaren Channel zurück - * @param i - * @return */ public Channel getReachableNodeAt(int i) { @@ -168,8 +160,6 @@ } - /** * fügt einen Pfad den Pfaden zu - * @param path */ public void appendPath(Channel node, ArrayList path) { @@ -188,5 +178,4 @@ if (!paths2.get(node).contains(channel)) { paths2.get(node).add(channel); - } } @@ -194,5 +183,4 @@ /** * gibt alle Pfade zurück - * @return */ public ArrayList> getPaths() { @@ -205,10 +193,8 @@ if (paths2.containsKey(node)) { return paths2.get(node); - } - else { + } else { //log.error("das darf nicht bei Channel: " + this.getNewid() + ", kein Node " + node.getNewid()); return null; } - } @@ -236,5 +222,3 @@ this.isPartOfJunction = isPartOfJunction; } - - } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/ChannelDiGraph.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/ChannelDiGraph.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/ChannelDiGraph.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -42,6 +43,4 @@ /** * löscht den übergebenden Channel im Digraphen - * - * @param channel */ public void removeChannel(Channel channel) { @@ -51,5 +50,5 @@ /** * fügt einen Channel des ChannelDigraphen hinzu - * + * * @param channel * hinzuzufügender Channel @@ -61,5 +60,5 @@ /** * Anzahl der innerhalb des DiGraphen gespeicherten Channels - * + * * @return Anzahl der Channels */ @@ -70,5 +69,5 @@ /** * gibt Channel i an der Position i in der ArrayList zurück - * + * * @param i * Position innerhalb der ArrayList @@ -96,5 +95,5 @@ * gibt alle From und To OSMNodes eines Graphen zurück (nicht die * ZWischenknoten) - * + * * @return alle From und To Nodes aller Channels des Digraphen */ @@ -136,5 +135,4 @@ /** * fügt eine leadsto-relation dem digraphen und dem entsprechendem Channel hinzu - * @param leadsTo */ public void addLeadsTo(LeadsTo leadsTo) { @@ -161,8 +159,4 @@ * gibt den Channel zurück, der paßt. Sind Channel doppelt vorhanden, wird * nur der erste passende zurückgegeben! - * - * @param fromChannel - * @param toChannel - * @return */ public LeadsTo getLeadsTo(Channel fromChannel, Channel toChannel) { @@ -181,8 +175,6 @@ /** * gibt alle Channels zurück, die von diesen OSM-Knoten abgehen/hingehen - * @param nodes - * @return - */ - public ArrayList getChannelsTouchingOSMNodes (ArrayList nodes) { + */ + public ArrayList getChannelsTouchingOSMNodes(ArrayList nodes) { ArrayList touchingChannel = new ArrayList<>(); for (int i = 0; i < nodes.size(); i++) { @@ -192,6 +184,5 @@ touchingChannel.add(channels.get(j)); } - } - else if (channels.get(j).getToNode().getId() == nodes.get(i).getId()) { + } else if (channels.get(j).getToNode().getId() == nodes.get(i).getId()) { if (!touchingChannel.contains(channels.get(j))) { touchingChannel.add(channels.get(j)); @@ -218,7 +209,4 @@ /** * gibt den oder die Channels twischen diesen OSM-Punkten zurück - * @param idfrom - * @param idto - * @return */ public ArrayList getChannelsBetween(int idfrom, int idto) { @@ -229,6 +217,5 @@ channelsresult.add(channels.get(i)); } - } - else if (channels.get(i).getFromNode().getId() == idto) { + } else if (channels.get(i).getFromNode().getId() == idto) { if (channels.get(i).getToNode().getId() == idfrom) { channelsresult.add(channels.get(i)); @@ -252,11 +239,11 @@ for (int i = 0; i < channels.size(); i++) { //log.trace(channels.get(i).getFromNode().toString()); - if ( (channels.get(i).getFromNode().getLatitude() <= top) && (channels.get(i).getFromNode().getLatitude() >= bottom) - && (channels.get(i).getFromNode().getLongitude() >= left) && (channels.get(i).getFromNode().getLongitude() <=right)) { + if ((channels.get(i).getFromNode().getLatitude() <= top) && (channels.get(i).getFromNode().getLatitude() >= bottom) + && (channels.get(i).getFromNode().getLongitude() >= left) && (channels.get(i).getFromNode().getLongitude() <= right)) { channels.get(i).setSelected(true); selectedChannels.add(channels.get(i)); } - if ( (channels.get(i).getToNode().getLatitude() <= top) && (channels.get(i).getToNode().getLatitude() >= bottom) - && (channels.get(i).getToNode().getLongitude() >= left) && (channels.get(i).getToNode().getLongitude() <=right)) { + if ((channels.get(i).getToNode().getLatitude() <= top) && (channels.get(i).getToNode().getLatitude() >= bottom) + && (channels.get(i).getToNode().getLongitude() >= left) && (channels.get(i).getToNode().getLongitude() <= right)) { channels.get(i).setSelected(true); selectedChannels.add(channels.get(i)); @@ -298,5 +285,4 @@ * setzt die Channels eines Kreuzungskandidaten * falls in im Hashset vorher Channels gespeichert waren, werden diese vorher gelöscht! - * @param junctionCandidate */ public void setJunctioncandidate(HashSet junctionCandidate) { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Graph.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Graph.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Graph.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -5,5 +6,5 @@ */ public class Graph { - + //Boundingbox private double bbleft; @@ -11,40 +12,44 @@ private double bbbottom; private double bbtop; - - + public double getBbleft() { return bbleft; } + public void setBbleft(double bbleft) { this.bbleft = bbleft; } + public double getBbright() { return bbright; } + public void setBbright(double bbright) { this.bbright = bbright; } + public double getBbbottom() { return bbbottom; } + public void setBbbottom(double bbbottom) { this.bbbottom = bbbottom; } + public double getBbtop() { return bbtop; } + public void setBbtop(double bbtop) { this.bbtop = bbtop; } + public boolean isInBBox(OSMNode node) { - if ( (node.getLatitude() <= bbtop) && (node.getLatitude() >= bbbottom) - && (node.getLongitude() >= bbleft) && (node.getLongitude() <=bbright)) { + if ((node.getLatitude() <= bbtop) && (node.getLatitude() >= bbbottom) + && (node.getLongitude() >= bbleft) && (node.getLongitude() <= bbright)) { return true; - } - else { + } else { return false; } } - - } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/LeadsTo.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/LeadsTo.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/LeadsTo.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -46,7 +47,5 @@ @Override public String toString() { - return "fromChannel:::" + fromChannel.getNewid() + ", toChannel:::" + toChannel.getNewid() + " über Node " + toChannel.getFromNode().getId(); + return "fromChannel:::" + fromChannel.getNewid() + ", toChannel:::" + toChannel.getNewid() + " über Node " + toChannel.getFromNode().getId(); } - - } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -8,5 +9,5 @@ */ public class OSMEntity { - + //TODO Idee: alle Wertestandardmäßig auf -1 setzen, so muß //man bei der Umwandlung nicht auf null-Werte prüfen @@ -43,11 +44,10 @@ */ private int version; - + public void setversion(int version) { this.version = version; } - + /** - * @return * @uml.property name="version" */ @@ -55,7 +55,6 @@ return version; } - + /** - * @return * @uml.property name="id" */ @@ -63,9 +62,10 @@ return id; } + public void setId(Long id) { this.id = id; } + /** - * @return * @uml.property name="visible" */ @@ -73,6 +73,6 @@ return visible; } + /** - * @param visible * @uml.property name="visible" */ @@ -80,6 +80,6 @@ this.visible = visible; } + /** - * @return * @uml.property name="timestamp" */ @@ -87,6 +87,6 @@ return timestamp; } + /** - * @param timestamp * @uml.property name="timestamp" */ @@ -94,6 +94,6 @@ this.timestamp = timestamp; } + /** - * @return * @uml.property name="user" */ @@ -101,6 +101,6 @@ return user; } + /** - * @param user * @uml.property name="user" */ @@ -108,6 +108,6 @@ this.user = user; } + /** - * @return * @uml.property name="uid" */ @@ -115,6 +115,6 @@ return uid; } + /** - * @param uid * @uml.property name="uid" */ @@ -122,6 +122,6 @@ this.uid = uid; } + /** - * @return * @uml.property name="changeset" */ @@ -129,6 +129,6 @@ return changeset; } + /** - * @param changeset * @uml.property name="changeset" */ @@ -136,6 +136,6 @@ this.changeset = changeset; } + /** - * @return * @uml.property name="hashmap" */ @@ -143,6 +143,6 @@ return hashmap; } + /** - * @param hashmap * @uml.property name="hashmap" */ @@ -150,26 +150,24 @@ this.hashmap = hashmap; } - - public void setKeyValue(String key, String value){ + + public void setKeyValue(String key, String value) { hashmap.put(key, value); } - - public String getValue(String key){ + + public String getValue(String key) { return hashmap.get(key); } - public boolean hasKey(String key){ + public boolean hasKey(String key) { return hashmap.containsKey(key); } - + /** * prüft, ob der übergebene String als Wert existiert - * @param value - * @return */ - public boolean hasValue(String value){ + public boolean hasValue(String value) { return hashmap.containsValue(value); } - + protected String valuestoString() { return ("ID: " + (id) + "\n" + "User: " + user + "\n"); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -5,4 +6,5 @@ import java.util.HashMap; import java.util.Iterator; + import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; @@ -10,9 +12,8 @@ import org.openstreetmap.josm.data.osm.Way; - /** * @author joerg */ -public class OSMGraph extends Graph{ +public class OSMGraph extends Graph { private final HashMap ways = new HashMap<>(); @@ -27,5 +28,4 @@ * gibt den Knoten mit der gesuchten OSM-ID zurück * @param id OSM-iD des Knotens! - * @return */ public OSMNode getNode(long id) { @@ -37,6 +37,6 @@ } - public OSMNode[] getNodes(){ - OSMNode[] nodearray= new OSMNode[nodes.size()]; + public OSMNode[] getNodes() { + OSMNode[] nodearray = new OSMNode[nodes.size()]; return nodes.values().toArray(nodearray); } @@ -54,14 +54,14 @@ } - public HashMap getRelationsAshashmap() { + public HashMap getRelationsAshashmap() { return relations; } - public void setRelations( HashMap relations) { + public void setRelations(HashMap relations) { this.relations = relations; } public OSMWay[] getWays() { - OSMWay[] wayarray= new OSMWay[ways.size()]; + OSMWay[] wayarray = new OSMWay[ways.size()]; return ways.values().toArray(wayarray); } @@ -71,5 +71,5 @@ } - public OSMRelation[] getRelations(){ + public OSMRelation[] getRelations() { OSMRelation[] relationarray = new OSMRelation[relations.size()]; return relations.values().toArray(relationarray); @@ -86,5 +86,5 @@ public ArrayList getIDsfromWay(int id) { OSMWay w = ways.get(id); - ArrayList ids = new ArrayList<>(); + ArrayList ids = new ArrayList<>(); ids.add(w.getToNode().getId()); ids.add(w.getFromNode().getId()); @@ -121,6 +121,5 @@ if (rmember.getMember() instanceof Node) { osmrelation.addMember(getNode(rmember.getMember().getId()), rmember.getRole()); - } - else if (rmember.getMember() instanceof Way) { + } else if (rmember.getMember() instanceof Way) { osmrelation.addMember(getWay(rmember.getMember().getId()), rmember.getRole()); } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMNode.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMNode.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMNode.java (revision 32596) @@ -1,6 +1,6 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; import java.util.ArrayList; - /** @@ -8,5 +8,5 @@ */ public class OSMNode extends OSMEntity { - + private double latitude; private double longitude; @@ -14,27 +14,31 @@ private ArrayList succNodeList = new ArrayList<>(); private ArrayList predNodeList = new ArrayList<>(); - + public void addOutgoingChannel(Channel channel) { outgoingChannels.add(channel); } - + public ArrayList getOutgoingChannels() { return outgoingChannels; } - + public double getLatitude() { return latitude; } + public void setLatitude(double latitude) { this.latitude = latitude; } + public double getLongitude() { return longitude; } + public void setLongitude(double longitude) { this.longitude = longitude; } - - public String toString(){ + + @Override + public String toString() { return valuestoString() + "Lat: " + latitude + "\n" + "Lon: " + longitude; } @@ -47,14 +51,11 @@ return predNodeList; } - + public void addSuccNode(OSMNode node) { succNodeList.add(node); } - + public void addPredNode(OSMNode node) { predNodeList.add(node); } - - - } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java (revision 32596) @@ -1,6 +1,6 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; import java.util.ArrayList; - /** @@ -18,9 +18,7 @@ return members; } - + /** * gibt den Member mit der Rolle zurück, wenn vorhanden. Sonst null - * @param role - * @return */ public OSMEntity getMember(String role) { @@ -32,21 +30,22 @@ return null; } - + public void addMember(OSMEntity member, String role) { members.add(new Member(member, role)); } - + public String getRelationType(String key) { return this.getValue(key); } - + + @Override public String toString() { String s = ("Relation-ID: " + this.getId() + " Relation-Type: " + this.getRelationType("type") +"\n"); for (int i = 0; i < members.size(); i++) { - s += ("Member: " + members.get(i).getRole() + ", ref:" + members.get(i).getId() + ", type:" + members.get(i).getType().getClass().getName() ); + s += ("Member: " + members.get(i).getRole() + ", ref:" + members.get(i).getId() + ", type:" + members.get(i).getType().getClass().getName()); } return s; } - + /** @@ -59,9 +58,9 @@ private String role; - public Member(OSMEntity member, String role) { + Member(OSMEntity member, String role) { this.member = member; this.setRole(role); } - + public Class getType() { return member.getClass(); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMWay.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMWay.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMWay.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.datastructure; @@ -12,5 +13,5 @@ public OSMNode[] getNodes() { OSMNode[] nodearray = new OSMNode[nodes.size()]; - return (OSMNode[]) nodes.toArray(nodearray); + return nodes.toArray(nodearray); } @@ -36,5 +37,5 @@ /** * ist der OSMWay eine Einbahnstraße? - * + * * @return true wenn ja, sonst nein */ @@ -52,7 +53,5 @@ if (t.equals("motorway") || t.equals("motorway_link")) { return true; - } - - else { + } else { return false; } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/ExecuteFilter.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/ExecuteFilter.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/ExecuteFilter.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.filter; @@ -9,11 +10,11 @@ */ public class ExecuteFilter { - + private Filter[] filter; private XMLFilterReader xmlfilterreader; private OSMGraph incominggraph; private OSMGraph outgoinggraph; - - public ExecuteFilter(Filter[] filter, OSMGraph incoming){ + + public ExecuteFilter(Filter[] filter, OSMGraph incoming) { this.filter = filter; this.incominggraph = incoming; @@ -25,9 +26,9 @@ outgoinggraph.setRelations(incoming.getRelationsAshashmap()); } - + public ExecuteFilter() { } - - public void filter(){ + + public void filter() { OSMWay[] tempWays = incominggraph.getWays(); String key; @@ -49,5 +50,5 @@ outgoinggraph.addNode(tempWays[j].getNodes()[j2]); } - + } } @@ -56,5 +57,5 @@ } } - + public Filter[] getFilter() { return filter; Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.filter; @@ -8,20 +9,20 @@ */ public class Filter { - + private HashSet tagValues = new HashSet<>(); private String keyValue; - + public Filter(String keyname, ArrayList values) { this.keyValue = keyname; tagValues.addAll(values); } - + public boolean hasTagValue(String value) { return tagValues.contains(value); } - - public Filter() { + + public Filter() { } - + public String[] getTagValues() { return tagValues.toArray(new String[tagValues.size()]); @@ -31,5 +32,5 @@ this.tagValues = tagValues; } - + public void setTagValue(String value) { tagValues.add(value); Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/BackPropagation.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/BackPropagation.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/BackPropagation.java (revision 32596) @@ -1,7 +1,7 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph; - /** @@ -18,5 +18,5 @@ /** - * + * * @param y fromNode * @param z toNode Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/Combination.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/Combination.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/Combination.java (revision 32596) @@ -1,11 +1,12 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; public class Combination { - + private long n = 0; private long k = 0; long[] data = null; - - public Combination(long n, long k){ + + public Combination(long n, long k) { if (n < 0 || k < 0) try { @@ -14,14 +15,14 @@ // TODO Auto-generated catch block e.printStackTrace(); - } + } this.n = n; this.k = k; - this.data = new long[(int)k]; - for (long i = 0; i < k; ++i) - this.data[(int)i] = i; + this.data = new long[(int) k]; + for (long i = 0; i < k; ++i) { + this.data[(int) i] = i; + } } - - public static long Choose(long n, long k) - { + + public static long Choose(long n, long k) { if (n < 0 || k < 0) try { @@ -30,5 +31,5 @@ // TODO Auto-generated catch block e.printStackTrace(); - } + } if (n < k) return 0; if (n == k) return 1; @@ -36,11 +37,8 @@ long delta, iMax; - if (k < n-k) // ex: Choose(100,3) - { + if (k < n-k) { // ex: Choose(100,3) delta = n-k; iMax = k; - } - else // ex: Choose(100,97) - { + } else { // ex: Choose(100,97) delta = k; iMax = n-k; @@ -49,14 +47,13 @@ long ans = delta + 1; - for (long i = 2; i <= iMax; ++i) - { - ans = (ans * (delta + i)) / i; + for (long i = 2; i <= iMax; ++i) { + ans = (ans * (delta + i)) / i; } return ans; } - public long Choose() - { - + + public long Choose() { + if (n < k) return 0; if (n == k) return 1; @@ -64,11 +61,8 @@ long delta, iMax; - if (k < n-k) // ex: Choose(100,3) - { + if (k < n-k) { // ex: Choose(100,3) delta = n-k; iMax = k; - } - else // ex: Choose(100,97) - { + } else { // ex: Choose(100,97) delta = k; iMax = n-k; @@ -77,7 +71,6 @@ long ans = delta + 1; - for (long i = 2; i <= iMax; ++i) - { - ans = (ans * (delta + i)) / i; + for (long i = 2; i <= iMax; ++i) { + ans = (ans * (delta + i)) / i; } @@ -85,7 +78,5 @@ } - - public Combination Successor() - { + public Combination Successor() { if (this.data.length == 0 || this.data[0] == this.n - this.k) @@ -95,24 +86,25 @@ long i; - for (i = 0; i < this.k; ++i){ - ans.data[(int)i] = this.data[(int)i]; + for (i = 0; i < this.k; ++i) { + ans.data[(int) i] = this.data[(int) i]; } - for (i = this.k - 1; i > 0 && ans.data[(int)i] == this.n - this.k + i; --i) {}; - - ++ans.data[(int)i]; + for (i = this.k - 1; i > 0 && ans.data[(int) i] == this.n - this.k + i; --i) { + // Count + } - for (long j = i; j < this.k - 1; ++j){ - ans.data[(int)j+1] = ans.data[(int)j] + 1; - } + ++ans.data[(int) i]; + + for (long j = i; j < this.k - 1; ++j) { + ans.data[(int) j+1] = ans.data[(int) j] + 1; + } return ans; } - - public String ToString() - { + + public String ToString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - for (long i = 0; i < this.k; ++i){ - sb.append(this.data[(int)i]); - if (i= 2)) { - result="Rule 4 broken, indegree from exitnode with ID: " + result = "Rule 4 broken, indegree from exitnode with ID: " + exits.get(j).getNewid() + ": " + exits.get(j).getIndegree() + " and outdegree: " @@ -45,5 +47,5 @@ } if (exits.get(j).equals(entries.get(i))) { - result="Rule 2 broken: node with ID: " + result = "Rule 2 broken: node with ID: " + "entries.get(i).getNode().getId()" + "is both entry and exit node"; @@ -54,10 +56,10 @@ } if (!(exnr >= n - 1)) { - result="Rule 1 broken"; + result = "Rule 1 broken"; return false; } for (int i = 0; i < exits.size(); i++) { if (!(exits.get(i).getEnnr() >= (n - 1))) { - result="Rule 1 broken, exit node with ID " + result = "Rule 1 broken, exit node with ID " + exits.get(i).getNewid() + "can only reached from " + exits.get(i).getEnnr() + " entries."; @@ -68,8 +70,7 @@ return true; } - + /** * gibt das Ergebnis des JChecks in Form als Satz mit Informationen zurück - * @return */ public String getResult() { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; @@ -22,10 +23,10 @@ private boolean CheckMinimal = true; private final ArrayList E; - private final int Grid[][]; + private final int[][] Grid; private final ArrayList OrEn; private final ArrayList OrEx; private final int n; private final List> L = new ArrayList<>(); //The list of columns to be sorted - private final HashSet subgraph = new HashSet<>();//The candidate subgraph to be tested + private final HashSet subgraph = new HashSet<>(); //The candidate subgraph to be tested private ProgressMonitor pm; private final boolean pmenabled; @@ -74,7 +75,7 @@ } - public void GenerateSubcolumns () {/*Generates all combinations of subcolumns in the grid*/ + public void GenerateSubcolumns() { //Generates all combinations of subcolumns in the grid if (pmenabled) { - pm.setCustomText(tr ("generate all combinations from entrie/exit candidates")); + pm.setCustomText(tr("generate all combinations from entrie/exit candidates")); } @@ -84,5 +85,5 @@ int[][] v; // this is a column variable containing n y-index entries plus true false values (0/1) List C; //The column is packed together with 2 indices into this variable - for (int i = 0; i < Grid.length;i++) { + for (int i = 0; i < Grid.length; i++) { int h = 0; //this is the index denoting the "n out of Grid.length"- combination, indicating a subcolumn of length n do { @@ -90,34 +91,35 @@ C = new ArrayList<>(3); v = new int[n][2]; - C.add(i);//the first position of column variable C is the column index - C.add(h);//the second is the entry-subset index - for(int t = 0; t < c.data.length; t++){ - if (Grid[(int)c.data[t]][i] == 0){ + C.add(i); //the first position of column variable C is the column index + C.add(h); //the second is the entry-subset index + for (int t = 0; t < c.data.length; t++) { + if (Grid[(int) c.data[t]][i] == 0) { missing++; - v[t][1]= 0; //false - } - else{ - v[t][1]= 1; + v[t][1] = 0; //false + } else { + v[t][1] = 1; } //true - v[t][0]=(int)c.data[t]; //Write a y index of the combination into column - } - if (missing <=1){//If column has at most one missing entry - C.add(v);//insert column as the third position of column variable C + v[t][0] = (int) c.data[t]; //Write a y index of the combination into column + } + if (missing <= 1) { //If column has at most one missing entry + C.add(v); //insert column as the third position of column variable C L.add(C); //Insert C in list to be ordered } h++; //Iterate through all subcolumns - if (h < ans){c = c.Successor();}//generate the next combination - }while(h < ans); + if (h < ans) { + c = c.Successor(); //generate the next combination + } + } while (h < ans); c = new Combination(Grid.length, n); //For each original column in the grid, generate new subcolumns } Collections.sort(L, new Comparator>() { @Override - public int compare(List o1, List o2) { - return (Integer)o1.get(1) - (Integer)o2.get(1); //sort according to h index in each column - }}); - } - - public boolean IterateThroughKn() {//Iterates through all K_{n-1} subgrids of the Grid and tests them - if (L.size()==0) { + public int compare(List o1, List o2) { + return (Integer) o1.get(1) - (Integer) o2.get(1); //sort according to h index in each column + } }); + } + + public boolean IterateThroughKn() { //Iterates through all K_{n-1} subgrids of the Grid and tests them + if (L.size() == 0) { return true; } @@ -130,5 +132,5 @@ List C; ArrayList CandidateK = new ArrayList<>(n*n); //saves the candidate K_{n-1} in entry-exit pairs - long lindex= 0; + long lindex = 0; int h = 0; int m = 0; @@ -140,20 +142,20 @@ boolean hchanged = false; C = l.next(); - do{ //Loop over list of columns L - if (mchanged){ + do { //Loop over list of columns L + if (mchanged) { C = l.next(); //Iterator in L lindex++; //Index in L if (hchanged) { - m=1; + m = 1; hchanged = false; } } - if ((Integer)C.get(1)==h && l.hasNext()){ //m counts the set of columns with index h + if ((Integer) C.get(1) == h && l.hasNext()) { //m counts the set of columns with index h m++; mchanged = true; - } - else{ - if (l.hasNext()==false){ - m++;lindex++; + } else { + if (l.hasNext() == false) { + m++; + lindex++; } //At the end of L, counter are set one up c = new Combination(m, n); @@ -161,27 +163,28 @@ int missing = 0; boolean smallerjunction = false; - for (int k =0; k 1){ + if (missing > 1) { break; - }//If a row has more than one missing value, break + } //If a row has more than one missing value, break } - if (missing <=1 && smallerjunction == true){//The k-subgrid is a different junction candidate satisfying total reachability - CheckMinimal = CheckSmallJunction(CandidateK)==false;// If the candidate is a smaller junction, then minimality is false + if (missing <= 1 && smallerjunction) { //The k-subgrid is a different junction candidate satisfying total reachability + CheckMinimal = !CheckSmallJunction(CandidateK); // If the candidate is a smaller junction, then minimality is false //log.info("durchlauf: " + durchlauf + " Wert von CheckMinimal: " + CheckMinimal); if (!CheckMinimal) { @@ -190,7 +193,9 @@ } CandidateK.clear(); - if (k+1 < ans){c = c.Successor();} //Produces the m over n combinations - } - m=1; //Sets m to the first column with next index h+1 + if (k+1 < ans) { + c = c.Successor(); + } //Produces the m over n combinations + } + m = 1; //Sets m to the first column with next index h+1 h++; mchanged = false; @@ -202,5 +207,5 @@ } } - while(l.hasNext() && CheckMinimal); + while (l.hasNext() && CheckMinimal); return CheckMinimal; } @@ -208,16 +213,14 @@ /** * gibt true zurück, wenn Kandidat eine Kreuzung ist, aber nicht, wenn junctionsearch auf true gesetzt ist - * @param CandidateK - * @return */ - public boolean CheckSmallJunction(ArrayList CandidateK){ + public boolean CheckSmallJunction(ArrayList CandidateK) { Check = false; - subgraph.clear();//Zu konstruierender Subgraph + subgraph.clear(); //Zu konstruierender Subgraph it = CandidateK.iterator(); //Reconstruct small Junction from paths - while (it.hasNext()){ + while (it.hasNext()) { int[]point = it.next(); for (int j = 0; j < E.get(point[0]).getReachableNodes().size(); j++) { - if(E.get(point[0]).getReachableNodeAt(j).equals(E.get(point[1]))){ + if (E.get(point[0]).getReachableNodeAt(j).equals(E.get(point[1]))) { subgraph.addAll(E.get(point[0]).getPathsAt(E.get(point[0]).getReachableNodeAt(j))); subgraph.add(E.get(point[0])); @@ -260,7 +263,6 @@ /** * enthält alle Channels des zuletzt durchlaufenden Kreuzungskandidaten (muß keine gültige Kreuzung sein) - * @return */ - public ArrayList getSubJunctionCandidate(){ + public ArrayList getSubJunctionCandidate() { return new ArrayList<>(subgraph); } @@ -268,5 +270,4 @@ /** * gibt alle gefundenen Kreuzungskandidaten zurück (ist leer, wenn junctionsearch auf true gesetzt wurde) - * @return */ public ArrayList> getJunctionCandidates() { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JPrepare.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JPrepare.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JPrepare.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; @@ -21,5 +22,5 @@ } - public void jPrepare (ArrayList vertices) { + public void jPrepare(ArrayList vertices) { this.vertices = vertices; entries.clear(); @@ -36,10 +37,9 @@ for (int i = 0; i < vertices.size(); i++) { for (int j = 0; j < vertices.get(i).getPredChannels().size(); j++) { - if (vertices.get(i).getPredChannels().get(j).isSubgraph() == false ) { + if (vertices.get(i).getPredChannels().get(j).isSubgraph() == false) { if (!entries.contains(vertices.get(i))) { entries.add(vertices.get(i)); } - } - else { + } else { vertices.get(i).countupIndegree(); //log.trace(vertices.get(i).toString()); @@ -51,6 +51,5 @@ exits.add(vertices.get(i)); } - } - else { + } else { vertices.get(i).countupOutdegree(); } @@ -59,5 +58,5 @@ } - public void resetSubgraph(){ + public void resetSubgraph() { for (int i = 0; i < vertices.size(); i++) { vertices.get(i).setSubgraph(false); @@ -69,5 +68,4 @@ /** * gibt die Anzahl der gefundenen Eingänge zurück - * @return */ public ArrayList getEntries() { @@ -77,5 +75,4 @@ /** * gibt die Anzahl der gefundenen Ausgänge zurück - * @return */ public ArrayList getExits() { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JProcess.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JProcess.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JProcess.java (revision 32596) @@ -1,10 +1,11 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; import java.util.ArrayList; + import org.openstreetmap.josm.plugins.JunctionChecker.connectedness.BacktrackingColors; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.Channel; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.ChannelDiGraph; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.LeadsTo; - /** @@ -30,6 +31,4 @@ * ruft den TR-DFS und danach den Backpropagation-Algorithmus auf jPrepare * muß vorher durchgelaufen sein (die Eingänge müssen bekannt sein) - * - * @param entries */ public void jProcess(ArrayList entries) { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; @@ -28,5 +29,5 @@ private final JCheck jCheck; private ArrayList E; - private int Grid[][]; + private int[][] Grid; private boolean Check; private boolean smallerJunction; @@ -50,6 +51,4 @@ /** * startet das Überprüfen einer Teilmenge auf die Kreuzungskriterien - * @param subgraph - * @param pm */ public void checkjunctions(ArrayList subgraph, ProgressMonitor pm) { @@ -81,5 +80,4 @@ * gesucht werden soll * - * @param subgraph * @param firstjunction soll nur die erste mögliche Kreuzung ausgegeben werden oder alle */ @@ -121,5 +119,5 @@ * darf keine weiteren Kreuzungen enthalten) */ - private ArrayList> checkJunctionCandidates(ArrayList> junctioncandidates){ + private ArrayList> checkJunctionCandidates(ArrayList> junctioncandidates) { @SuppressWarnings("unchecked") ArrayList> junctions = (ArrayList>) junctioncandidates.clone(); @@ -129,11 +127,8 @@ junctions.removeAll(junctioncandidates.get(i)); } - else { - } } } return junctions; } - private void collectECandidates(ArrayList subgraph) { @@ -216,6 +211,4 @@ /** * gibt die kleinere, gefundene Kreuzung zurück (wenn es sie gibt) - * - * @return */ public ArrayList getSubJunction() { @@ -247,6 +240,4 @@ /** * das Ergebnis des JCheck als String - * - * @return */ public String getJCheckResult() { @@ -257,6 +248,4 @@ * gitb die bei der Kruezungssuche gefundenen Kreuzungen zurück, sonst * nichts - * - * @return */ public ArrayList> getJunctions() { Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/TRDFS.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/TRDFS.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/TRDFS.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.junctionchecking; @@ -16,9 +17,4 @@ private final ChannelDiGraph digraph; - /** - * - * - * @param adnodes - */ public TRDFS(ArrayList adnodes, ChannelDiGraph digraph) { this.digraph = digraph; Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/ColorSchemeXMLReader.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/ColorSchemeXMLReader.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/ColorSchemeXMLReader.java (revision 32596) @@ -1,10 +1,12 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.reader; import java.awt.Color; import java.util.HashMap; + import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; -public class ColorSchemeXMLReader extends XMLReader{ +public class ColorSchemeXMLReader extends XMLReader { private HashMap colorScheme; @@ -23,6 +25,5 @@ if (colorScheme.containsKey(s)) { return colorScheme.get(s); - } - else { + } else { return Color.GRAY; } @@ -43,5 +44,5 @@ String[] erg = tempValue.split(","); Color c = new Color(Integer.parseInt(erg[0]), Integer.parseInt(erg[1]), Integer.parseInt(erg[2])); - colorScheme.put(parser.getLocalName(),c); + colorScheme.put(parser.getLocalName(), c); } break; Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java (revision 32596) @@ -1,8 +1,11 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.reader; import java.io.File; import java.util.HashMap; + import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; + import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.OSMEntity; import org.openstreetmap.josm.plugins.JunctionChecker.datastructure.OSMGraph; @@ -63,11 +66,9 @@ .getAttributeValue(null, "ref"))), parser .getAttributeValue(null, "role")); - } - else if (parser.getAttributeValue(null, "type").equals("way")) { + } else if (parser.getAttributeValue(null, "type").equals("way")) { relation.addMember(osmgraph.getWay(Long.parseLong(parser .getAttributeValue(null, "ref"))), parser .getAttributeValue(null, "role")); - } - else if (parser.getAttributeValue(null, "type").equals("relation")) { + } else if (parser.getAttributeValue(null, "type").equals("relation")) { relation.addMember(osmgraph.getRelation(Integer.parseInt(parser .getAttributeValue(null, "ref"))), parser Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLFilterReader.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLFilterReader.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLFilterReader.java (revision 32596) @@ -1,7 +1,10 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.reader; import java.util.Vector; + import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; + import org.openstreetmap.josm.plugins.JunctionChecker.filter.Filter; @@ -9,5 +12,5 @@ * @author joerg */ -public class XMLFilterReader extends XMLReader{ +public class XMLFilterReader extends XMLReader { Vector filters; @@ -21,6 +24,6 @@ @Override public void parseXML() { - String tempValue =""; - String tempKeyValue =""; + String tempValue = ""; + String tempKeyValue = ""; try { while (parser.hasNext()) { @@ -54,5 +57,5 @@ public Filter[] getFilters() { - Filter[] filterarray= new Filter[filters.size()]; + Filter[] filterarray = new Filter[filters.size()]; return filters.toArray(filterarray); } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLReader.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLReader.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLReader.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.reader; @@ -4,14 +5,15 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; + import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -public abstract class XMLReader { - +public abstract class XMLReader { + protected String filename; protected XMLInputFactory factory = XMLInputFactory.newInstance(); protected XMLStreamReader parser; - + public XMLReader(String filename) { try { @@ -22,5 +24,5 @@ } } - + public XMLReader(File file) { try { @@ -33,5 +35,5 @@ } } - + public abstract void parseXML(); } Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.util; Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/writing/OSMXMLWriter.java =================================================================== --- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/writing/OSMXMLWriter.java (revision 32423) +++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/writing/OSMXMLWriter.java (revision 32596) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.JunctionChecker.writing; @@ -34,10 +35,10 @@ XMLOutputFactory factory = XMLOutputFactory.newInstance(); writer = factory.createXMLStreamWriter( - new FileOutputStream( filename ) ); + new FileOutputStream(filename)); // Der XML-Header wird erzeugt writer.writeStartDocument("utf-8", "1.0"); // Zuerst wird das Wurzelelement mit Attribut geschrieben - writer.writeStartElement( "osm" ); - writer.writeAttribute( "version", "0.6" ); + writer.writeStartElement("osm"); + writer.writeAttribute("version", "0.6"); writer.writeAttribute("generator", "channelGenerator"); @@ -85,6 +86,5 @@ if (ways.get(i).isStrongConnected()) { writer.writeAttribute("v", "true"); - } - else { + } else { writer.writeAttribute("v", "false"); } @@ -97,12 +97,12 @@ } - private void writeAttributes(OSMEntity ent) throws FileNotFoundException, XMLStreamException{ + private void writeAttributes(OSMEntity ent) throws FileNotFoundException, XMLStreamException { if (ent instanceof OSMNode) { - writer.writeAttribute("id", Long.toString(ent.getId()) ); + writer.writeAttribute("id", Long.toString(ent.getId())); writer.writeAttribute("lat", Double.toString(((OSMNode) ent).getLatitude())); writer.writeAttribute("lon", Double.toString(((OSMNode) ent).getLongitude())); } - if (ent.getTimestamp()!=null) { + if (ent.getTimestamp() != null) { writer.writeAttribute("timestamp", ent.getTimestamp()); }