Index: applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs =================================================================== --- applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs (revision 30751) +++ applications/editors/josm/plugins/michigan_left/.settings/org.eclipse.jdt.core.prefs (revision 30753) @@ -7,6 +7,12 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -32,4 +38,9 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning @@ -38,7 +49,15 @@ org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning Index: applications/editors/josm/plugins/michigan_left/README =================================================================== --- applications/editors/josm/plugins/michigan_left/README (revision 30751) +++ applications/editors/josm/plugins/michigan_left/README (revision 30753) @@ -2,3 +2,3 @@ ====== -PLugin for easily creating turn restrictions at "Michigan left" intersections. +Plugin for easily creating turn restrictions at "Michigan left" intersections. Index: applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java =================================================================== --- applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java (revision 30751) +++ applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java (revision 30753) @@ -1,16 +1,17 @@ +//License: GPL package MichiganLeft; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.Hashtable; import java.util.LinkedList; -import java.util.ArrayList; import javax.swing.JMenuItem; import javax.swing.JOptionPane; - -import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.Main; @@ -29,220 +30,209 @@ import org.openstreetmap.josm.tools.Shortcut; +/** + * Plugin for easily creating turn restrictions at "Michigan left" intersections. + */ public class MichiganLeft extends Plugin { - JMenuItem MichiganLeft; - - public MichiganLeft(PluginInformation info) { - super(info); - MichiganLeft = MainMenu.add(Main.main.menu.dataMenu, new MichiganLeftAction()); - } - - private class MichiganLeftAction extends JosmAction { + JMenuItem MichiganLeft; + /** - * - */ - private static final long serialVersionUID = 1L; - private LinkedList cmds = new LinkedList<>(); - - public MichiganLeftAction() { - super(tr("Michigan Left"), "michigan_left", - tr("Adds no left turn for sets of 4 or 5 ways."), - Shortcut.registerShortcut("tools:michigan_left", tr("Tool: {0}", - tr("Michigan Left")), KeyEvent.VK_N, Shortcut.ALT_SHIFT), true); + * Constructs a new {@code MichiganLeft} plugin. + * + * @param info plugin info + */ + public MichiganLeft(PluginInformation info) { + super(info); + MichiganLeft = MainMenu.add(Main.main.menu.dataMenu, new MichiganLeftAction()); } - @Override - public void actionPerformed(ActionEvent e) { - Collection mainSelection = Main.main.getCurrentDataSet() - .getSelected(); - - ArrayList selection = new ArrayList<>(); - - for (OsmPrimitive prim: mainSelection) selection.add(prim); - - int ways = 0; - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) - ways++; - } - - if ((ways != 4) && (ways != 5)) { - JOptionPane.showMessageDialog(Main.parent, - tr("Please select 4 or 5 ways to assign no left turns.")); - return; - } - - if (ways == 4) { - // Find extremities of ways - Hashtable ExtremNodes = new Hashtable<>(); - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) { - Way way = (Way) prim; - incrementHashtable(ExtremNodes, way.firstNode()); - incrementHashtable(ExtremNodes, way.lastNode()); - } - } - // System.out.println(tr("{0} extrem nodes.", ExtremNodes.size())); - if (ExtremNodes.size() != 4) { - JOptionPane.showMessageDialog(Main.parent, - tr("Please select 4 ways that form a closed relation.")); - return; - } - - // order the ways - ArrayList orderedWays = new ArrayList<>(); - Way currentWay = (Way) selection.iterator().next(); - orderedWays.add((Way) currentWay); - selection.remove(currentWay); - while (selection.size() > 0) { - boolean found = false; - Node nextNode = currentWay.lastNode(); - for (OsmPrimitive prim : selection) { - Way tmpWay = (Way) prim; - if (tmpWay.firstNode() == nextNode) { - orderedWays.add(tmpWay); - selection.remove(prim); - currentWay = tmpWay; - found = true; - break; - } - } - if (!found) { - JOptionPane.showMessageDialog(Main.parent, - tr("Unable to order the ways. Please verify their directions")); - return; - } - } - - // Build relations - for (int index = 0; index < 4; index++) { - Way firstWay = orderedWays.get(index); - Way lastWay = orderedWays.get((index + 1) % 4); - Node lastNode = firstWay.lastNode(); - - buildRelation(firstWay, lastWay, lastNode); - } - Command c = new SequenceCommand( - tr("Create Michigan left turn restriction"), cmds); - Main.main.undoRedo.add(c); - cmds.clear(); - } - - if (ways == 5) { - // Find extremities of ways - Hashtable ExtremNodes = new Hashtable<>(); - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) { - Way way = (Way) prim; - incrementHashtable(ExtremNodes, way.firstNode()); - incrementHashtable(ExtremNodes, way.lastNode()); - } - } - // System.out.println(tr("{0} extrem nodes.", ExtremNodes.size())); - - ArrayList viaNodes = new ArrayList<>(); - // find via nodes (they have 3 occurences in the list) - for (Enumeration enumKey = ExtremNodes.keys(); enumKey - .hasMoreElements();) { - Node extrem = enumKey.nextElement(); - Integer nb = (Integer) ExtremNodes.get(extrem); - // System.out.println(tr("Via node {0}, {1}", extrem.getId(), - // nb.intValue())); - if (nb.intValue() == 3) { - viaNodes.add(extrem); - } - } - // System.out.println(tr("{0} via nodes.", viaNodes.size())); - - if (viaNodes.size() != 2) { - JOptionPane.showMessageDialog(Main.parent, - tr("Unable to find via nodes. Please check your selection")); - return; - } - - Node viaFirst = viaNodes.get(0); - Node viaLast = viaNodes.get(1); // Find middle segment - - Way middle = null; - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) { - Way way = (Way) prim; - Node first = way.firstNode(); - Node last = way.lastNode(); - - if ((first.equals(viaFirst) && last.equals(viaLast)) - || (first.equals(viaLast) && last.equals(viaFirst))) - middle = way; - } - } - // System.out.println(tr("Middle way: {0}", middle.getId())); - - // Build relations - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) { - Way way = (Way) prim; - if (way != middle) { - Node first = way.firstNode(); - Node last = way.lastNode(); - - if (first == viaFirst) - buildRelation(middle, way, viaNodes.get(0)); - else if (first == viaLast) - buildRelation(middle, way, viaNodes.get(1)); - else if (last == viaFirst) - buildRelation(way, middle, viaNodes.get(0)); - else if (last == viaLast) - buildRelation(way, middle, viaNodes.get(1)); - } - } - } - Command c = new SequenceCommand( - tr("Create Michigan left turn restriction"), cmds); - Main.main.undoRedo.add(c); - cmds.clear(); - } + private class MichiganLeftAction extends JosmAction { + private LinkedList cmds = new LinkedList<>(); + + public MichiganLeftAction() { + super(tr("Michigan Left"), "michigan_left", + tr("Adds no left turn for sets of 4 or 5 ways."), + Shortcut.registerShortcut("tools:michigan_left", + tr("Tool: {0}", tr("Michigan Left")), KeyEvent.VK_N, Shortcut.ALT_SHIFT), true); + } + + @Override + public void actionPerformed(ActionEvent e) { + Collection mainSelection = Main.main.getCurrentDataSet().getSelected(); + + ArrayList selection = new ArrayList<>(); + + for (OsmPrimitive prim : mainSelection) + selection.add(prim); + + int ways = 0; + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) + ways++; + } + + if ((ways != 4) && (ways != 5)) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select 4 or 5 ways to assign no left turns.")); + return; + } + + if (ways == 4) { + // Find extremities of ways + Hashtable extremNodes = new Hashtable<>(); + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + incrementHashtable(extremNodes, way.firstNode()); + incrementHashtable(extremNodes, way.lastNode()); + } + } + if (extremNodes.size() != 4) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select 4 ways that form a closed relation.")); + return; + } + + // order the ways + ArrayList orderedWays = new ArrayList<>(); + Way currentWay = (Way) selection.iterator().next(); + orderedWays.add(currentWay); + selection.remove(currentWay); + while (selection.size() > 0) { + boolean found = false; + Node nextNode = currentWay.lastNode(); + for (OsmPrimitive prim : selection) { + Way tmpWay = (Way) prim; + if (tmpWay.firstNode() == nextNode) { + orderedWays.add(tmpWay); + selection.remove(prim); + currentWay = tmpWay; + found = true; + break; + } + } + if (!found) { + JOptionPane.showMessageDialog(Main.parent, + tr("Unable to order the ways. Please verify their directions")); + return; + } + } + + // Build relations + for (int index = 0; index < 4; index++) { + Way firstWay = orderedWays.get(index); + Way lastWay = orderedWays.get((index + 1) % 4); + Node lastNode = firstWay.lastNode(); + + buildRelation(firstWay, lastWay, lastNode); + } + Command c = new SequenceCommand(tr("Create Michigan left turn restriction"), cmds); + Main.main.undoRedo.add(c); + cmds.clear(); + } + + if (ways == 5) { + // Find extremities of ways + Hashtable extremNodes = new Hashtable<>(); + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + incrementHashtable(extremNodes, way.firstNode()); + incrementHashtable(extremNodes, way.lastNode()); + } + } + + ArrayList viaNodes = new ArrayList<>(); + // find via nodes (they have 3 occurences in the list) + for (Enumeration enumKey = extremNodes.keys(); enumKey.hasMoreElements();) { + Node extrem = enumKey.nextElement(); + Integer nb = extremNodes.get(extrem); + if (nb.intValue() == 3) { + viaNodes.add(extrem); + } + } + + if (viaNodes.size() != 2) { + JOptionPane.showMessageDialog(Main.parent, + tr("Unable to find via nodes. Please check your selection")); + return; + } + + Node viaFirst = viaNodes.get(0); + Node viaLast = viaNodes.get(1); // Find middle segment + + Way middle = null; + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + Node first = way.firstNode(); + Node last = way.lastNode(); + + if ((first.equals(viaFirst) && last.equals(viaLast)) + || (first.equals(viaLast) && last.equals(viaFirst))) + middle = way; + } + } + + // Build relations + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + if (way != middle) { + Node first = way.firstNode(); + Node last = way.lastNode(); + + if (first == viaFirst) + buildRelation(middle, way, viaNodes.get(0)); + else if (first == viaLast) + buildRelation(middle, way, viaNodes.get(1)); + else if (last == viaFirst) + buildRelation(way, middle, viaNodes.get(0)); + else if (last == viaLast) + buildRelation(way, middle, viaNodes.get(1)); + } + } + } + Command c = new SequenceCommand(tr("Create Michigan left turn restriction"), cmds); + Main.main.undoRedo.add(c); + cmds.clear(); + } + } + + public void incrementHashtable(Hashtable hash, Node node) { + if (hash.containsKey(node)) { + Integer nb = hash.get(node); + hash.put(node, new Integer(nb.intValue() + 1)); + } else { + hash.put(node, new Integer(1)); + } + } + + public void buildRelation(Way fromWay, Way toWay, Node viaNode) { + Relation relation = new Relation(); + + RelationMember from = new RelationMember("from", fromWay); + relation.addMember(from); + + RelationMember to = new RelationMember("to", toWay); + relation.addMember(to); + + RelationMember via = new RelationMember("via", viaNode); + relation.addMember(via); + + relation.put("type", "restriction"); + relation.put("restriction", "no_left_turn"); + + cmds.add(new AddCommand(relation)); + } + + @Override + protected void updateEnabledState() { + setEnabled(getEditLayer() != null); + } + + @Override + protected void updateEnabledState(Collection selection) { + // do nothing + } } - - public void incrementHashtable(Hashtable hash, Node node) { - // System.out.println(tr("Processing {0}", node.getId())); - if (hash.containsKey(node)) { - Integer nb = (Integer) hash.get(node); - hash.put(node, new Integer(nb.intValue() + 1)); - // System.out.println(tr("Old value", nb.intValue())); - } else - hash.put(node, new Integer(1)); - } - - public void buildRelation(Way fromWay, Way toWay, Node viaNode) { - // System.out.println(tr("Relation: from {0} to {1} via {2}", - // fromWay.getId(), toWay.getId(), viaNode.getId())); - - Relation relation = new Relation(); - - RelationMember from = new RelationMember("from", fromWay); - relation.addMember(from); - - RelationMember to = new RelationMember("to", toWay); - relation.addMember(to); - - RelationMember via = new RelationMember("via", viaNode); - relation.addMember(via); - - relation.put("type", "restriction"); - relation.put("restriction", "no_left_turn"); - - cmds.add(new AddCommand(relation)); - } - - @Override - protected void updateEnabledState() { - setEnabled(getEditLayer() != null); - } - - @Override - protected void updateEnabledState( - Collection selection) { - // do nothing - } - - } }