Index: /applications/editors/josm/plugins/turnrestrictions/.checkstyle =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/.checkstyle (revision 32519) +++ /applications/editors/josm/plugins/turnrestrictions/.checkstyle (revision 32519) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/turnrestrictions/.project =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/.project (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/.project (revision 32519) @@ -12,4 +12,9 @@ + net.sf.eclipsecs.core.CheckstyleBuilder + + + + org.sonarlint.eclipse.core.sonarlintBuilder @@ -20,4 +25,5 @@ org.eclipse.jdt.groovy.core.groovyNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions; @@ -29,9 +30,7 @@ /** * Replies the unique instance of this action - * - * @return */ public static CreateOrEditTurnRestrictionAction getInstance() { - if (instance == null){ + if (instance == null) { instance = new CreateOrEditTurnRestrictionAction(); } @@ -44,5 +43,5 @@ null, tr("Create or edit a turn restriction."), - Shortcut.registerShortcut("tools:turnrestriction", tr("Tool: {0}","Create or edit a turn restriction."), + Shortcut.registerShortcut("tools:turnrestriction", tr("Tool: {0}", "Create or edit a turn restriction."), KeyEvent.VK_2, Shortcut.ALT_SHIFT), false @@ -55,10 +54,10 @@ if (layer == null) return; Collection trs = TurnRestrictionSelectionPopupPanel.getTurnRestrictionsParticipatingIn(layer.data.getSelected()); - if (trs.isEmpty()){ + if (trs.isEmpty()) { // current selection isn't participating in turn restrictions. Launch // an editor for a new turn restriction // Relation tr = new TurnRestrictionBuilder().buildFromSelection(layer); - TurnRestrictionEditor editor = new TurnRestrictionEditor(Main.map.mapView,layer,tr); + TurnRestrictionEditor editor = new TurnRestrictionEditor(Main.map.mapView, layer, tr); TurnRestrictionEditorManager.getInstance().positionOnScreen(editor); TurnRestrictionEditorManager.getInstance().register(layer, tr, editor); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions; @@ -24,33 +25,33 @@ */ public class TurnRestrictionBuilder { - + /** * Replies the angle phi in the polar coordinates (r,phi) representing the first * segment of the way {@code w}, where w is moved such that the start node of {@code w} is - * in the origin (0,0). - * - * @param w the way. Must not be null. At least two nodes required. - * @return phi in the polar coordinates + * in the origin (0, 0). + * + * @param w the way. Must not be null. At least two nodes required. + * @return phi in the polar coordinates * @throws IllegalArgumentException thrown if w is null * @throws IllegalArgumentException thrown if w is too short (at least two nodes required) */ - static public double phi(Way w) throws IllegalArgumentException{ + public static double phi(Way w) throws IllegalArgumentException { return phi(w, false /* not inverse */); } - + /** *

Replies the angle phi in the polar coordinates (r,phi) representing the first * segment of the way {@code w}, where w is moved such that the start node of {@code w} is - * in the origin (0,0).

- * + * in the origin (0, 0).

+ * *

If {@code doInvert} is true, computes phi for the way in reversed direction.

- * + * * @param w the way. Must not be null. At least two nodes required. - * @param doInvert if true, computes phi for the reversed way - * @return phi in the polar coordinates + * @param doInvert if true, computes phi for the reversed way + * @return phi in the polar coordinates * @throws IllegalArgumentException thrown if w is null * @throws IllegalArgumentException thrown if w is too short (at least two nodes required) */ - static public double phi(Way w, boolean doInvert) throws IllegalArgumentException { + public static double phi(Way w, boolean doInvert) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(w, "w"); if (w.getNodesCount() < 2) { @@ -61,14 +62,14 @@ Node n0 = nodes.get(0); Node n1 = nodes.get(1); - + double x = n1.getCoor().getX() - n0.getCoor().getX(); double y = n1.getCoor().getY() - n0.getCoor().getY(); - return Math.atan2(y, x); - } + return Math.atan2(y, x); + } /** * Replies the unique common node of two ways, or null, if either no * such node or multiple common nodes exist. - * + * * @param w1 the first way * @param w2 the second way @@ -76,88 +77,89 @@ * w1 and w2 don't share exactly one node */ - static public Node getUniqueCommonNode(Way w1, Way w2) throws IllegalArgumentException{ + public static Node getUniqueCommonNode(Way w1, Way w2) throws IllegalArgumentException { Set w1Nodes = new HashSet<>(w1.getNodes()); w1Nodes.retainAll(w2.getNodes()); if (w1Nodes.size() != 1) return null; return w1Nodes.iterator().next(); - } - + } + /** * Replies true, if {@code n} is the start node of the way {@code w}. - * + * * @param w the way. Must not be null. * @param n the node. Must not be null. * @return true, if {@code n} is the start node of the way {@code w}. */ - static public boolean isStartNode(Way w, Node n) { + public static boolean isStartNode(Way w, Node n) { if (w.getNodesCount() == 0) return false; return w.getNode(0).equals(n); } - + /** * Replies true, if {@code n} is the end node of the way {@code w}. - * + * * @param w the way. Must not be null. * @param n the node. Must not be null. * @return true, if {@code n} is the end node of the way {@code w}. */ - static public boolean isEndNode(Way w, Node n){ + public static boolean isEndNode(Way w, Node n) { if (w.getNodesCount() == 0) return false; return w.getNode(w.getNodesCount()-1).equals(n); } - + /** * Replies true, if {@code n} is a node in the way {@code w} but {@code n} * is neither the start nor the end node. - * - * @param w the way - * @param n the node + * + * @param w the way + * @param n the node * @return true if {@code n} is an "inner" node */ - static public boolean isInnerNode(Way w, Node n){ + public static boolean isInnerNode(Way w, Node n) { if (!w.getNodes().contains(n)) return false; if (isStartNode(w, n)) return false; if (isEndNode(w, n)) return false; - return true; - } - + return true; + } + /** *

Replies the angle at which way {@code from} and {@code to} are connected - * at exactly one common node.

- * + * at exactly one common node.

+ * *

If the result is positive, the way {@code from} bends to the right, if it * is negative, the {@code to} bends to the left.

- * - *

The two ways must not be null and they must be connected at exactly one + * + *

The two ways must not be null and they must be connected at exactly one * common node. They must not intersect at this node.

. - * + * * @param from the from way * @param to the to way - * @return the intersection angle + * @return the intersection angle * @throws IllegalArgumentException thrown if the two nodes don't have exactly one common * node at which they are connected - * - */ - static public double intersectionAngle(Way from, Way to) throws IllegalArgumentException { + * + */ + public static double intersectionAngle(Way from, Way to) throws IllegalArgumentException { Node via = getUniqueCommonNode(from, to); if (via == null) throw new IllegalArgumentException("the two ways must share exactly one common node"); // no I18n required - if (!isStartNode(from, via) && ! isEndNode(from, via)) + if (!isStartNode(from, via) && !isEndNode(from, via)) throw new IllegalArgumentException("via node must be start or end node of from-way"); // no I18n required - if (!isStartNode(to, via) && ! isEndNode(to, via)) + if (!isStartNode(to, via) && !isEndNode(to, via)) throw new IllegalArgumentException("via node must be start or end node of to-way"); // no I18n required double phi1 = phi(from, isStartNode(from, via)); double phi2 = phi(to, isEndNode(to, via)); return phi1 - phi2; - } - - static public enum RelativeWayJoinOrientation { + } + + public enum RelativeWayJoinOrientation { LEFT, RIGHT } + /** *
Determines the orientation in which two ways {@code from} and {@code to} - * are connected, with respect to the direction of the way {@code from}.
- * + * are connected, with respect to the direction of the way {@code from}.
+ * *
The following preconditions must be met: *
@@ -169,5 +171,5 @@ *
*
- * + * *
Here's a typical configuration:
*
@@ -178,8 +180,8 @@ * | *
- * + * *
Replies null, if the preconditions aren't met and the method fails to * determine the join orientation.
- * + * * @param from the "from"-way * @param to the "to"-way @@ -187,5 +189,5 @@ * join orientation */ - public static RelativeWayJoinOrientation determineWayJoinOrientation(Way from, Way to){ + public static RelativeWayJoinOrientation determineWayJoinOrientation(Way from, Way to) { Node via = getUniqueCommonNode(from, to); if (via == null) return null; @@ -195,17 +197,17 @@ if (isClosedAt(from, via)) return null; if (isClosedAt(to, via)) return null; - + double phi = intersectionAngle(from, to); - if (phi >=0 && phi <= Math.PI) { + if (phi >= 0 && phi <= Math.PI) { return RelativeWayJoinOrientation.RIGHT; } else { return RelativeWayJoinOrientation.LEFT; - } - } - + } + } + /** *
Selects either of the two ways resulting from the split of a way * in the role {@link TurnRestrictionLegRole#TO TO}.
- * + * *
This methods operates on three ways for which the following * preconditions must be met: @@ -216,5 +218,5 @@ * *
- * + * *
Here's a typical configuration:
*
@@ -225,13 +227,13 @@ * | *
- * + * *
Depending on {@code restrictionType}, this method either returns {@code to1} - * or {@code to2}. If {@code restrictionType} indicates that our context is a + * or {@code to2}. If {@code restrictionType} indicates that our context is a * "left turn", {@code to1} is replied. If our context is a "right turn", {@code to2} * is returned.
- * + * *
Replies null, if the expected preconditions aren't met or if we can't infer * from {@code restrictionType} whether our context is a "left turn" or a "right turn".
- * + * * @param from the from-way * @param to1 the first part of the split to-way @@ -240,5 +242,5 @@ * @return either {@code to1}, {@code to2}, or {@code null}. */ - static public Way selectToWayAfterSplit(Way from, Way to1, Way to2, TurnRestrictionType restrictionType){ + public static Way selectToWayAfterSplit(Way from, Way to1, Way to2, TurnRestrictionType restrictionType) { if (restrictionType == null) return null; Node cn1 = TurnRestrictionBuilder.getUniqueCommonNode(from, to1); @@ -247,6 +249,6 @@ if (cn2 == null) return null; if (cn1 != cn2) return null; - - if (! isStartNode(from, cn1) && ! isEndNode(from, cn1)) { + + if (!isStartNode(from, cn1) && !isEndNode(from, cn1)) { /* * the now split to-way still *intersects* the from-way. We @@ -255,9 +257,9 @@ return null; } - + RelativeWayJoinOrientation o1 = determineWayJoinOrientation(from, to1); RelativeWayJoinOrientation o2 = determineWayJoinOrientation(from, to2); - - switch(restrictionType){ + + switch(restrictionType) { case NO_LEFT_TURN: case ONLY_LEFT_TURN: @@ -265,5 +267,5 @@ else if (RelativeWayJoinOrientation.LEFT.equals(o2)) return to2; else return null; - + case NO_RIGHT_TURN: case ONLY_RIGHT_TURN: @@ -271,5 +273,5 @@ else if (RelativeWayJoinOrientation.RIGHT.equals(o2)) return to2; else return null; - + default: /* @@ -280,12 +282,12 @@ } } - - public TurnRestrictionBuilder(){ - } - + + public TurnRestrictionBuilder() { + } + /** * Creates and initializes a new turn restriction based on the primitives * currently selected in layer {@code layer}. - * + * * @param layer the layer. Must not be null. * @return the new initialized turn restriction. The turn restriction isn't @@ -300,8 +302,8 @@ /** - * Tries to initialize a No-U-Turn restriction from the primitives in + * Tries to initialize a No-U-Turn restriction from the primitives in * primitives. If successful, replies true, otherwise false. - * - * @param primitives the primitives + * + * @param primitives the primitives * @return true, if we can propose a U-turn restriction for the primitives * in primitives @@ -309,10 +311,10 @@ protected Relation initNoUTurnRestriction(List primitives) { if (primitives.size() != 2) return null; - + // we need exactly one node and one way in the selection ... List nodes = OsmPrimitive.getFilteredList(primitives, Node.class); List ways = OsmPrimitive.getFilteredList(primitives, Way.class); if (nodes.size() != 1 || ways.size() != 1) return null; - + // .. and the node has to be the start or the node of the way Way way = ways.get(0); @@ -320,5 +322,5 @@ List wayNodes = way.getNodes(); if (wayNodes.size() < 2) return null; // shouldn't happen - just in case - if (! (wayNodes.get(0).equals(node) ||wayNodes.get(wayNodes.size()-1).equals(node))) return null; + if (!(wayNodes.get(0).equals(node) || wayNodes.get(wayNodes.size()-1).equals(node))) return null; Relation tr = new Relation(); @@ -334,35 +336,34 @@ *
Replies true, if the ways {@code w1} and {@code w2} are connected * at the node {@code n}.
- * + * *
If {@code w1} and {@code w2} intersect at the node {@code n}, * this method replies false.
- * + * * @param w1 the first way - * @param w2 the second way - * @param n the node - * @return - */ - public static boolean isConnectingNode(Way w1, Way w2, Node n){ + * @param w2 the second way + * @param n the node + */ + public static boolean isConnectingNode(Way w1, Way w2, Node n) { if (isStartNode(w1, n)) { - return isStartNode(w2, n) | isEndNode(w2, n); - } else if (isEndNode(w1, n)){ - return isStartNode(w2, n) | isEndNode(w2, n); + return isStartNode(w2, n) | isEndNode(w2, n); + } else if (isEndNode(w1, n)) { + return isStartNode(w2, n) | isEndNode(w2, n); } return false; } - + /** * Replies true, if the way {@code w} is closed at the node {@code n}. - * + * * @param w the way - * @param n the node + * @param n the node * @return true, if the way {@code w} is closed at the node {@code n}. */ - public static boolean isClosedAt(Way w, Node n){ + public static boolean isClosedAt(Way w, Node n) { List nodes = w.getNodes(); nodes.retainAll(Collections.singletonList(n)); return nodes.size() >= 2; } - + protected Relation initTurnRestrictionFromTwoWays(List primitives) { Way w1 = null; @@ -370,5 +371,5 @@ Node via = null; if (primitives.size() == 2) { - // if we have exactly two selected primitives, we expect two ways. + // if we have exactly two selected primitives, we expect two ways. // See initNoUTurnRestriction() for the case where we have a selected way // and a selected node @@ -378,7 +379,7 @@ w2 = selWays.get(1); via = getUniqueCommonNode(w1, w2); - } else if (primitives.size() == 3){ - // if we have exactly three selected primitives, we need two ways and a - // node, which should be an acceptable via node + } else if (primitives.size() == 3) { + // if we have exactly three selected primitives, we need two ways and a + // node, which should be an acceptable via node List selWays = OsmPrimitive.getFilteredList(primitives, Way.class); List selNodes = OsmPrimitive.getFilteredList(primitives, Node.class); @@ -388,5 +389,5 @@ w2 = selWays.get(1); via = selNodes.get(0); - if (! w1.getNodes().contains(via) || ! w2.getNodes().contains(via)){ + if (!w1.getNodes().contains(via) || !w2.getNodes().contains(via)) { // the selected node is not an acceptable via node via = null; @@ -394,23 +395,23 @@ } else { // the selection doesn't consists of primitives for which we can build - // a turn restriction + // a turn restriction return null; } - + // if we get here, we know the two "legs" of the turn restriction. We may // or may not know a via node, though assert w1 != null; assert w2 != null; - + Relation tr = new Relation(); tr.put("type", "restriction"); tr.addMember(new RelationMember("from", w1)); tr.addMember(new RelationMember("to", w2)); - - if (via != null){ + + if (via != null) { tr.addMember(new RelationMember("via", via)); RelativeWayJoinOrientation orientation = determineWayJoinOrientation(w1, w2); - if (orientation != null){ - switch(orientation){ + if (orientation != null) { + switch(orientation) { case LEFT: tr.put("restriction", TurnRestrictionType.NO_LEFT_TURN.getTagValue()); @@ -418,5 +419,5 @@ case RIGHT: tr.put("restriction", TurnRestrictionType.NO_RIGHT_TURN.getTagValue()); - break; + break; } } @@ -424,5 +425,5 @@ return tr; } - + protected Relation initEmptyTurnRestriction() { Relation tr = new Relation(); @@ -430,23 +431,23 @@ return tr; } - - /** - * Creates and initializes a new turn restriction based on primitives + + /** + * Creates and initializes a new turn restriction based on primitives * in {@code primitives}. - * - * @param primitives the primitives + * + * @param primitives the primitives * @return the new initialized turn restriction. The turn restriction isn't * added to the layer yet. */ - public synchronized Relation build(List primitives){ + public synchronized Relation build(List primitives) { if (primitives == null || primitives.isEmpty()) { return initEmptyTurnRestriction(); } Relation tr; - switch(primitives.size()){ - // case 0 already handled - case 1: + switch(primitives.size()) { + // case 0 already handled + case 1: tr = initEmptyTurnRestriction(); - if (OsmPrimitive.getFilteredList(primitives, Way.class).size() == 1) { + if (OsmPrimitive.getFilteredList(primitives, Way.class).size() == 1) { // we have exactly one selected way? -> init the "from" leg // of the turn restriction with it @@ -454,5 +455,5 @@ } return tr; - + case 2: tr = initNoUTurnRestriction(primitives); @@ -461,10 +462,10 @@ if (tr != null) return tr; return initEmptyTurnRestriction(); - + default: tr = initTurnRestrictionFromTwoWays(primitives); if (tr != null) return tr; - return initEmptyTurnRestriction(); - } - } + return initEmptyTurnRestriction(); + } + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsPlugin.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsPlugin.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsPlugin.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions; @@ -10,19 +11,19 @@ /** * This is the main class for the turnrestrictions plugin. - * + * */ -public class TurnRestrictionsPlugin extends Plugin{ - +public class TurnRestrictionsPlugin extends Plugin { + public TurnRestrictionsPlugin(PluginInformation info) { - super(info); + super(info); } - + /** - * Called when the JOSM map frame is created or destroyed. + * Called when the JOSM map frame is created or destroyed. */ @Override - public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { + public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { if (oldFrame == null && newFrame != null) { // map frame added - TurnRestrictionsListDialog dialog = new TurnRestrictionsListDialog(); + TurnRestrictionsListDialog dialog = new TurnRestrictionsListDialog(); // add the dialog newFrame.addToggleDialog(dialog); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListProvider.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListProvider.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListProvider.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.dnd; @@ -8,5 +9,5 @@ * Replies the list of currently selected primitive IDs. Replies an empty list if no primitive IDs * are selected. - * + * * @return the list of currently selected primitive IDs */ Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.dnd; @@ -11,16 +12,15 @@ /** - *
PrimitiveIdListTransferHandler is a transfer handler for components which + *
PrimitiveIdListTransferHandler is a transfer handler for components which * provide and/or accept a list of {@link PrimitiveId} via copy/paste or * drag-and-drop.
- * + * *
It creates a {@link Transferable} by retrieving the list of primitive IDs * from a {@link PrimitiveIdListProvider}.
- * + * */ public class PrimitiveIdListTransferHandler extends TransferHandler { - //static private final Logger logger = Logger.getLogger(PrimitiveIdListTransferHandler.class.getName()); private PrimitiveIdListProvider provider; - + /** * Replies true if {@code transferFlavors} includes the data flavor {@link PrimitiveIdTransferable#PRIMITIVE_ID_LIST_FLAVOR}. @@ -35,20 +35,22 @@ return false; } - + /** - * Creates the transfer handler - * + * Creates the transfer handler + * * @param provider the provider of the primitive IDs. Must not be null. * @throws IllegalArgumentException thrown if provider is null. */ - public PrimitiveIdListTransferHandler(PrimitiveIdListProvider provider) throws IllegalArgumentException{ + public PrimitiveIdListTransferHandler(PrimitiveIdListProvider provider) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(provider, "provider"); this.provider = provider; } - + + @Override protected Transferable createTransferable(JComponent c) { - return new PrimitiveIdTransferable(provider.getSelectedPrimitiveIds()); + return new PrimitiveIdTransferable(provider.getSelectedPrimitiveIds()); } + @Override public int getSourceActions(JComponent c) { return COPY; @@ -57,5 +59,5 @@ @Override public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) { - return isSupportedFlavor(transferFlavors); - } + return isSupportedFlavor(transferFlavors); + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdTransferable.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdTransferable.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdTransferable.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.dnd; @@ -14,46 +15,45 @@ /** * To be used for Drag-and-Drop of a set of {@link PrimitiveId}s between - * two components. + * two components. * */ -public class PrimitiveIdTransferable implements Transferable{ - +public class PrimitiveIdTransferable implements Transferable { + /** the data flower for the set of of primitive ids */ - static public final DataFlavor PRIMITIVE_ID_LIST_FLAVOR = + public static final DataFlavor PRIMITIVE_ID_LIST_FLAVOR = new DataFlavor(Set.class, "a set of OSM primitive ids"); - - /** + + /** * this transferable supports two flavors: (1) {@link #PRIMITIVE_ID_LIST_FLAVOR} and * (2) {@link DataFlavor#stringFlavor}. - * + * * See also {@link #getPrimitiveIds()} and {@link #getAsString()} */ - static public final DataFlavor[] SUPPORTED_FLAVORS = new DataFlavor[] { + public static final DataFlavor[] SUPPORTED_FLAVORS = new DataFlavor[] { PRIMITIVE_ID_LIST_FLAVOR, DataFlavor.stringFlavor }; - + private List ids = new ArrayList<>(); - + /** * Creates a transferable from a collection of {@link PrimitiveId}s - * - * @param ids */ public PrimitiveIdTransferable(List ids) { if (ids == null) return; - for(PrimitiveId id: ids) { + for (PrimitiveId id: ids) { this.ids.add(new SimplePrimitiveId(id.getUniqueId(), id.getType())); } } - + /** *
If flavor is {@link #PRIMITIVE_ID_SET_FLAVOR}, replies a the list of * transferred {@link PrimitiveId}s
- * + * *
If flavor is {@link DataFlavor#stringFlavor}, replies a string representation * of the list of transferred {@link PrimitiveId}s
*/ + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { @@ -65,8 +65,8 @@ throw new UnsupportedFlavorException(flavor); } - + /** * Replies the list of OSM primitive ids - * + * * @return the list of OSM primitive ids */ @@ -74,13 +74,13 @@ return ids; } - + /** * Replies a string representation of the list of OSM primitive ids - * + * * @return a string representation of the list of OSM primitive ids */ public String getAsString() { StringBuffer sb = new StringBuffer(); - for(PrimitiveId id: ids) { + for (PrimitiveId id: ids) { if (sb.length() > 0) sb.append(","); sb.append(id.getType().getAPIName()).append("/").append(id.getUniqueId()); @@ -89,13 +89,15 @@ } + @Override public DataFlavor[] getTransferDataFlavors() { return SUPPORTED_FLAVORS; } + @Override public boolean isDataFlavorSupported(DataFlavor flavor) { - for(DataFlavor df: SUPPORTED_FLAVORS) { + for (DataFlavor df: SUPPORTED_FLAVORS) { if (df.equals(flavor)) return true; } return false; - } + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -22,5 +23,4 @@ */ public class AdvancedEditorPanel extends JPanel { - //private static final Logger logger = Logger.getLogger(AdvancedEditorPanel.class.getName()); private TurnRestrictionEditorModel model; @@ -31,6 +31,4 @@ /** * Creates the panel with the tag editor - * - * @return */ protected JPanel buildTagEditorPanel() { @@ -51,6 +49,4 @@ /** * Builds the panel with the table for editing relation members - * - * @return */ protected JPanel buildMemberEditorPanel() { @@ -73,5 +69,4 @@ /** * Creates the main split panel - * @return */ protected JSplitPane buildSplitPane() { @@ -99,5 +94,5 @@ * @throws IllegalArgumentException thrown if model is null */ - public AdvancedEditorPanel(TurnRestrictionEditorModel model) throws IllegalArgumentException{ + public AdvancedEditorPanel(TurnRestrictionEditorModel model) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(model, "model"); this.model = model; @@ -111,4 +106,5 @@ */ class SplitPaneDividerInitializer implements HierarchyListener { + @Override public void hierarchyChanged(HierarchyEvent e) { if (isShowing()) { Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -25,5 +26,5 @@ * BasicEditorPanel provides a UI for editing the basic elements of a turn restriction, * i.e. its restriction type, the from, the to, and the via objects. - * + * */ public class BasicEditorPanel extends VerticallyScrollablePanel { @@ -31,5 +32,5 @@ /** the turn restriction model */ private TurnRestrictionEditorModel model; - + /** the UI widgets */ private TurnRestrictionLegEditor fromEditor; @@ -40,5 +41,5 @@ private TurnRestrictionComboBox cbTurnRestrictions; private VehicleExceptionEditor vehicleExceptionsEditor; - + /** * builds the UI @@ -50,9 +51,9 @@ gc.fill = GridBagConstraints.HORIZONTAL; gc.weightx = 0.0; - + // the editor for selecting the 'from' leg - gc.insets = new Insets(0,0,5,5); + gc.insets = new Insets(0, 0, 5, 5); add(new JLabel(tr("Type:")), gc); - + gc.gridx = 1; gc.weightx = 1.0; @@ -61,11 +62,11 @@ // the editor for selecting the 'from' leg gc.gridx = 0; - gc.gridy = 1; + gc.gridy = 1; gc.weightx = 0.0; add(new JLabel(tr("From:")), gc); - + gc.gridx = 1; gc.weightx = 1.0; - add(fromEditor = new TurnRestrictionLegEditor(model, TurnRestrictionLegRole.FROM),gc); + add(fromEditor = new TurnRestrictionLegEditor(model, TurnRestrictionLegRole.FROM), gc); // the editor for selecting the 'to' leg @@ -73,18 +74,18 @@ gc.gridy = 2; gc.weightx = 0.0; - gc.insets = new Insets(0,0,5,5); + gc.insets = new Insets(0, 0, 5, 5); add(new JLabel(tr("To:")), gc); - + gc.gridx = 1; gc.weightx = 1.0; - add(toEditor = new TurnRestrictionLegEditor(model, TurnRestrictionLegRole.TO),gc); - - // the editor for selecting the 'vias' + add(toEditor = new TurnRestrictionLegEditor(model, TurnRestrictionLegRole.TO), gc); + + // the editor for selecting the 'vias' gc.gridx = 0; gc.gridy = 3; gc.weightx = 0.0; - gc.insets = new Insets(0,0,5,5); + gc.insets = new Insets(0, 0, 5, 5); add(lblVias = new JLabel(tr("Vias:")), gc); - + gc.gridx = 1; gc.weightx = 1.0; @@ -93,14 +94,15 @@ spVias = new JScrollPane(lstVias = new ViaList(new ViaListModel(model, selectionModel), selectionModel)) { // fixes #6016 : Scrollbar hides field entry + @Override public Dimension getPreferredSize() { return new Dimension(100, 80); // only height is relevant, 80 is just a heuristical value } }; - add(spVias,gc); + add(spVias, gc); if (!Main.pref.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false)) { lblVias.setVisible(false); spVias.setVisible(false); } - + // the editor for vehicle exceptions vehicleExceptionsEditor = new VehicleExceptionEditor(model); @@ -110,8 +112,8 @@ gc.weighty = 0.0; gc.gridwidth = 2; - gc.insets = new Insets(0,0,5,5); + gc.insets = new Insets(0, 0, 5, 5); add(vehicleExceptionsEditor, gc); - - // just a filler - grabs remaining space + + // just a filler - grabs remaining space gc.gridx = 0; gc.gridy = 5; @@ -120,12 +122,12 @@ gc.fill = GridBagConstraints.BOTH; add(new JPanel(), gc); - - setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + + setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); } - - + + /** - * Creates the panel. - * + * Creates the panel. + * * @param model the editor model. Must not be null. * @throws IllegalArgumentException thrown if model is null @@ -137,15 +139,15 @@ HelpUtil.setHelpContext(this, HelpUtil.ht("/Plugin/TurnRestrictions#BasicEditor")); } - + /** * Requests the focus on one of the input widgets for turn * restriction data. - * + * * @param focusTarget the target component to request focus for. * Ignored if null. */ - public void requestFocusFor(BasicEditorFokusTargets focusTarget){ + public void requestFocusfor(BasicEditorFokusTargets focusTarget) { if (focusTarget == null) return; - switch(focusTarget){ + switch(focusTarget) { case RESTRICION_TYPE: cbTurnRestrictions.requestFocusInWindow(); @@ -161,25 +163,25 @@ break; } - } - + } + /** * Initializes the set of icons used from the preference key * {@link PreferenceKeys#ROAD_SIGNS}. - * - * @param prefs the JOSM preferences + * + * @param prefs the JOSM preferences */ - public void initIconSetFromPreferences(Preferences prefs){ + public void initIconSetFromPreferences(Preferences prefs) { cbTurnRestrictions.initIconSetFromPreferences(prefs); } - + /** * Initializes the visibility of the list of via-objects depending * on values in the JOSM preferences - * + * * @param prefs the JOSM preferences */ - public void initViasVisibilityFromPreferences(Preferences prefs){ + public void initViasVisibilityFromPreferences(Preferences prefs) { boolean value = prefs.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false); - if (value != lblVias.isVisible()){ + if (value != lblVias.isVisible()) { lblVias.setVisible(value); spVias.setVisible(value); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -10,5 +11,5 @@ /** * ExceptValueModel is a model for the value of the tag 'except' in a turn - * restriction. + * restriction. * */ @@ -16,7 +17,7 @@ /** * The set of standard vehicle types which can be used in the - * 'except' tag - */ - static public final Set STANDARD_VEHICLE_EXCEPTION_VALUES; + * 'except' tag + */ + public static final Set STANDARD_VEHICLE_EXCEPTION_VALUES; static { HashSet s = new HashSet<>(); @@ -28,22 +29,22 @@ STANDARD_VEHICLE_EXCEPTION_VALUES = Collections.unmodifiableSet(s); } - + /** * Replies true, if {@code v} is a standard vehicle type. Replies * false if {@code v} is null - * - * @param v the vehicle type. + * + * @param v the vehicle type. * @return true, if {@code v} is a standard vehicle type. */ - static public boolean isStandardVehicleExceptionValue(String v){ + public static boolean isStandardVehicleExceptionValue(String v) { if (v == null) return false; v = v.trim().toLowerCase(); return STANDARD_VEHICLE_EXCEPTION_VALUES.contains(v); } - + private String value = ""; private boolean isStandard = true; private final Set vehicleExceptions = new HashSet<>(); - + protected void parseValue(String value) { if (value == null || value.trim().equals("")) value = ""; @@ -53,5 +54,5 @@ if (value.equals("")) return; String[] values = value.split(";"); - for (String v: values){ + for (String v: values) { v = v.trim().toLowerCase(); if (isStandardVehicleExceptionValue(v)) { @@ -62,18 +63,18 @@ } } - - /** - * Creates a new model for an empty standard value + + /** + * Creates a new model for an empty standard value */ public ExceptValueModel() {} - - /** - * Creates a new model for the tag value {@code value}. - * + + /** + * Creates a new model for the tag value {@code value}. + * * @param value the tag value * @see #parseValue(String) */ - public ExceptValueModel(String value){ - if (value == null || value.trim().equals("")) + public ExceptValueModel(String value) { + if (value == null || value.trim().equals("")) return; parseValue(value); @@ -82,9 +83,7 @@ /** * Replies the tag value representing the state of this model. - * - * @return */ public String getValue() { - if (isStandard){ + if (isStandard) { StringBuffer sb = new StringBuffer(); // we use an ordered list because equals() @@ -93,5 +92,5 @@ List values = new ArrayList<>(vehicleExceptions); Collections.sort(values); - for (String v: values){ + for (String v: values) { if (sb.length() > 0) { sb.append(";"); @@ -107,6 +106,4 @@ /** * Sets the value in this model - * - * @param value */ public void setValue(String value) { @@ -116,29 +113,27 @@ /** * Replies true if this model currently holds a standard 'except' value - * - * @return */ public boolean isStandard() { return isStandard; - } - + } + /** * Tells this model to use standard values only. - * + * */ public void setStandard(boolean isStandard) { this.isStandard = isStandard; } - + /** * Replies true if {@code vehicleType} is currently set as exception in this * model. - * + * * @param vehicleType one of the standard vehicle types from {@see #STANDARD_VEHICLE_EXCEPTION_VALUES} * @return true if {@code vehicleType} is currently set as exception in this * model. - * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type - */ - public boolean isVehicleException(String vehicleType) throws IllegalArgumentException{ + * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type + */ + public boolean isVehicleException(String vehicleType) throws IllegalArgumentException { if (vehicleType == null) return false; if (!isStandardVehicleExceptionValue(vehicleType)) { @@ -148,12 +143,12 @@ return vehicleExceptions.contains(vehicleType); } - + /** * Sets the {@code vehicleType} as exception in this turn restriction. - * - * @param vehicleType one of the standard vehicle types from {@see #STANDARD_VEHICLE_EXCEPTION_VALUES} - * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type - */ - public void setVehicleException(String vehicleType) throws IllegalArgumentException{ + * + * @param vehicleType one of the standard vehicle types from {@see #STANDARD_VEHICLE_EXCEPTION_VALUES} + * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type + */ + public void setVehicleException(String vehicleType) throws IllegalArgumentException { if (!isStandardVehicleExceptionValue(vehicleType)) { throw new IllegalArgumentException(MessageFormat.format("vehicleType ''{0}'' isn''t a valid standard vehicle type", vehicleType)); @@ -161,16 +156,16 @@ vehicleExceptions.add(vehicleType.trim().toLowerCase()); } - + /** * Sets or removes the {@code vehicleType} as exception in this turn restriction, depending * on whether {@code setOrRemove} is true or false, respectively. - * + * * @param vehicleType one of the standard vehicle types from {@see #STANDARD_VEHICLE_EXCEPTION_VALUES} * @param setOrRemove if true, the exception is set; otherwise, it is removed - * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type - */ - public void setVehicleException(String vehicleType, boolean setOrRemove) throws IllegalArgumentException{ - if (setOrRemove){ + * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type + */ + public void setVehicleException(String vehicleType, boolean setOrRemove) throws IllegalArgumentException { + if (setOrRemove) { setVehicleException(vehicleType); } else { @@ -178,12 +173,12 @@ } } - + /** * Removes the {@code vehicleType} as exception in this turn restriction - * - * @param vehicleType one of the standard vehicle types from {@see #STANDARD_VEHICLE_EXCEPTION_VALUES} - * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type - */ - public void removeVehicleException(String vehicleType) throws IllegalArgumentException{ + * + * @param vehicleType one of the standard vehicle types from {@see #STANDARD_VEHICLE_EXCEPTION_VALUES} + * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type + */ + public void removeVehicleException(String vehicleType) throws IllegalArgumentException { if (!isStandardVehicleExceptionValue(vehicleType)) { throw new IllegalArgumentException(MessageFormat.format("vehicleType ''{0}'' isn''t a valid standard vehicle type", vehicleType)); @@ -210,4 +205,4 @@ ExceptValueModel other = (ExceptValueModel) obj; return getValue().equals(other.getValue()); - } + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -35,6 +36,6 @@ * */ -public class JosmSelectionListModel extends AbstractListModel implements ActiveLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider{ - //static private final Logger logger = Logger.getLogger(JosmSelectionListModel.class.getName()); +public class JosmSelectionListModel extends AbstractListModel + implements ActiveLayerChangeListener, SelectionChangedListener, DataSetListener, PrimitiveIdListProvider { private final List selection = new ArrayList<>(); @@ -73,5 +74,5 @@ public Collection getSelected() { Set sel = new HashSet<>(); - for(int i=0; i< getSize();i++) { + for (int i = 0; i < getSize(); i++) { if (selectionModel.isSelectedIndex(i)) { sel.add(selection.get(i)); @@ -89,7 +90,7 @@ selectionModel.clearSelection(); if (sel == null) return; - for (OsmPrimitive p: sel){ + for (OsmPrimitive p: sel) { int i = selection.indexOf(p); - if (i >= 0){ + if (i >= 0) { selectionModel.addSelectionInterval(i, i); } @@ -136,8 +137,8 @@ if (toUpdate.isEmpty()) return; Collection sel = getSelected(); - for (OsmPrimitive p: toUpdate){ + for (OsmPrimitive p: toUpdate) { int i = selection.indexOf(p); if (i >= 0) { - super.fireContentsChanged(this, i,i); + super.fireContentsChanged(this, i, i); } } @@ -158,5 +159,5 @@ // don't show a JOSM selection if we don't have a data layer setJOSMSelection(null); - } else if (newLayer != layer){ + } else if (newLayer != layer) { // don't show a JOSM selection if this turn restriction editor doesn't // manipulate data in the current data layer @@ -175,5 +176,5 @@ // this turn restriction editor is working on OsmDataLayer layer = Main.getLayerManager().getEditLayer(); - if(layer == null) return; + if (layer == null) return; if (layer != this.layer) return; setJOSMSelection(newSelection); @@ -226,4 +227,5 @@ @Override public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */} + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/} @@ -235,5 +237,5 @@ public List getSelectedPrimitiveIds() { List ret = new ArrayList<>(getSelected().size()); - for(int i=0; i< selection.size(); i++) { + for (int i = 0; i < selection.size(); i++) { if (selectionModel.isSelectedIndex(i)) { ret.add(selection.get(i).getPrimitiveId()); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -64,5 +65,5 @@ add(new JLabel(tr("Selection")), BorderLayout.NORTH); - setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); actCopy = new CopyAction(); lstSelection.addMouseListener(new PopupLauncher()); @@ -75,5 +76,5 @@ * @exception IllegalArgumentException thrown if {@code layer} is null */ - public JosmSelectionPanel(OsmDataLayer layer, JosmSelectionListModel model) throws IllegalArgumentException{ + public JosmSelectionPanel(OsmDataLayer layer, JosmSelectionListModel model) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.model = model; @@ -107,5 +108,5 @@ class PopupMenu extends JPopupMenu { - public PopupMenu() { + PopupMenu() { JMenuItem item = add(actCopy); item.setTransferHandler(transferHandler); @@ -117,5 +118,5 @@ private Action delegate; - public CopyAction(){ + CopyAction() { putValue(NAME, tr("Copy")); putValue(SHORT_DESCRIPTION, tr("Copy to the clipboard")); @@ -131,6 +132,6 @@ } - static private class JosmSelectionTransferHandler extends PrimitiveIdListTransferHandler { - public JosmSelectionTransferHandler(PrimitiveIdListProvider provider) { + private static class JosmSelectionTransferHandler extends PrimitiveIdListTransferHandler { + JosmSelectionTransferHandler(PrimitiveIdListProvider provider) { super(provider); } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/MemberRoleCellEditor.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/MemberRoleCellEditor.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/MemberRoleCellEditor.java (revision 32519) @@ -15,8 +15,8 @@ /** * The cell editor for member roles of relation members in a turn restriction. - * + * */ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor { - //static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName()); + //private static Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName()); private AutoCompletingTextField editor = null; @@ -41,12 +41,14 @@ * replies the table cell editor */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - String role = (String)value; - editor.setText(role); + String role = (String) value; + editor.setText(role); return editor; } + @Override public Object getCellEditorValue() { return editor.getText(); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/NavigationControler.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/NavigationControler.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/NavigationControler.java (revision 32519) @@ -1,13 +1,17 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; public interface NavigationControler { - public enum BasicEditorFokusTargets { + enum BasicEditorFokusTargets { RESTRICION_TYPE, FROM, TO, VIA - } - void gotoBasicEditor(); + } + + void gotoBasicEditor(); + void gotoAdvancedEditor(); - void gotoBasicEditor(BasicEditorFokusTargets focusTarget); + + void gotoBasicEditor(BasicEditorFokusTargets focusTarget); } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -14,15 +15,15 @@ * displayed in the {@link AdvancedEditorPanel}. */ -public class RelationMemberColumnModel extends DefaultTableColumnModel{ +public class RelationMemberColumnModel extends DefaultTableColumnModel { protected void build() { TableColumn col = new TableColumn(); - + // the role column col.setHeaderValue(tr("Role")); col.setResizable(true); - col.setPreferredWidth(100); + col.setPreferredWidth(100); col.setCellEditor(new MemberRoleCellEditor()); addColumn(col); - + // column 1 - the member col = new TableColumn(1); @@ -31,14 +32,14 @@ col.setPreferredWidth(300); col.setCellRenderer(new OsmPrimitivRenderer()); - addColumn(col); + addColumn(col); } - + /** * Creates the column model with a given column selection model. - * + * * @param colSelectionModel the column selection model. Must not be null. * @throws IllegalArgumentException thrown if {@code colSelectionModel} is null */ - public RelationMemberColumnModel(DefaultListSelectionModel colSelectionModel) throws IllegalArgumentException{ + public RelationMemberColumnModel(DefaultListSelectionModel colSelectionModel) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(colSelectionModel, "colSelectionModel"); setSelectionModel(colSelectionModel); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java (revision 32519) @@ -1,4 +1,4 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; - import static org.openstreetmap.josm.tools.I18n.tr; @@ -23,20 +23,19 @@ import org.openstreetmap.josm.tools.CheckParameterUtil; -public class RelationMemberEditorModel extends AbstractTableModel{ - //static private final Logger logger = Logger.getLogger(RelationMemberEditorModel.class.getName()); +public class RelationMemberEditorModel extends AbstractTableModel { private final ArrayList members = new ArrayList<>(); private OsmDataLayer layer; private DefaultListSelectionModel rowSelectionModel; private DefaultListSelectionModel colSelectionModel; - + /** * Creates a new model in the context of an {@link OsmDataLayer}. Internally allocates - * a row and a column selection model, see {@link #getRowSelectionModel()} and + * a row and a column selection model, see {@link #getRowSelectionModel()} and * {@link #getColSelectionModel()}. - * + * * @param layer the data layer. Must not be null. * @exception IllegalArgumentException thrown if layer is null */ - public RelationMemberEditorModel(OsmDataLayer layer) throws IllegalArgumentException{ + public RelationMemberEditorModel(OsmDataLayer layer) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.layer = layer; @@ -47,5 +46,5 @@ /** * Creates a new model in the context of an {@link OsmDataLayer} - * + * * @param layer layer the data layer. Must not be null. * @param rowSelectionModel the row selection model. Must not be null. @@ -55,5 +54,6 @@ * @throws IllegalArgumentException thrown if colSelectionModel is null */ - public RelationMemberEditorModel(OsmDataLayer layer, DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel) throws IllegalArgumentException{ + public RelationMemberEditorModel(OsmDataLayer layer, DefaultListSelectionModel rowSelectionModel, + DefaultListSelectionModel colSelectionModel) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); CheckParameterUtil.ensureParameterNotNull(rowSelectionModel, "rowSelectionModel"); @@ -66,14 +66,14 @@ /** * Replies the row selection model used in this table model. - * - * @return the row selection model + * + * @return the row selection model */ public DefaultListSelectionModel getRowSelectionModel() { return rowSelectionModel; } - + /** * Replies the column selection model used in this table model. - * + * * @return the col selection model */ @@ -81,17 +81,17 @@ return colSelectionModel; } - + /** * Replies the set of {@link OsmPrimitive}s with the role {@code role}. If no * such primitives exists, the empty set is returned. - * + * * @return the set of {@link OsmPrimitive}s with the role {@code role} */ protected Set getPrimitivesWithRole(String role) { HashSet ret = new HashSet<>(); - for (RelationMemberModel rm: members){ - if (rm.getRole().equals(role)){ + for (RelationMemberModel rm: members) { + if (rm.getRole().equals(role)) { OsmPrimitive p = layer.data.getPrimitiveById(rm.getTarget()); - if (p != null){ + if (p != null) { ret.add(p); } @@ -100,15 +100,15 @@ return ret; } - + /** * Replies the list of {@link RelationMemberModel}s with the role {@code role}. If no * such primitives exists, the empty set is returned. - * + * * @return the set of {@link RelationMemberModel}s with the role {@code role} */ protected List getRelationMembersWithRole(String role) { ArrayList ret = new ArrayList<>(); - for (RelationMemberModel rm: members){ - if (rm.getRole().equals(role)){ + for (RelationMemberModel rm: members) { + if (rm.getRole().equals(role)) { ret.add(rm); } @@ -116,15 +116,15 @@ return ret; } - + /** * Removes all members with role {@code role}. - * + * * @param role the role. Ignored if null. * @return true if the list of members was modified; false, otherwise */ - protected boolean removeMembersWithRole(String role){ + protected boolean removeMembersWithRole(String role) { if (role == null) return false; boolean isChanged = false; - for(Iterator it = members.iterator(); it.hasNext(); ){ + for (Iterator it = members.iterator(); it.hasNext();) { RelationMemberModel rm = it.next(); if (rm.getRole().equals(role)) { @@ -135,19 +135,19 @@ return isChanged; } - + /** * Replies the set of {@link OsmPrimitive}s with the role 'from'. If no * such primitives exists, the empty set is returned. - * + * * @return the set of {@link OsmPrimitive}s with the role 'from' */ public Set getFromPrimitives() { - return getPrimitivesWithRole("from"); - } - + return getPrimitivesWithRole("from"); + } + /** * Replies the set of {@link OsmPrimitive}s with the role 'to'. If no * such primitives exists, the empty set is returned. - * + * * @return the set of {@link OsmPrimitive}s with the role 'from' */ @@ -155,45 +155,44 @@ return getPrimitivesWithRole("to"); } - + /** * Replies the list of 'via' objects in the order they occur in the * member list. Replies an empty list if no vias exist - * - * @return */ public List getVias() { ArrayList ret = new ArrayList<>(); - for (RelationMemberModel rm: getRelationMembersWithRole("via")){ + for (RelationMemberModel rm: getRelationMembersWithRole("via")) { ret.add(layer.data.getPrimitiveById(rm.getTarget())); } return ret; } - + /** * Sets the list of vias. Removes all 'vias' if {@code vias} is null. - * + * * null vias are skipped. A via must belong to the dataset of the layer in whose context * this editor is working, otherwise an {@link IllegalArgumentException} is thrown. - * + * * @param vias the vias. * @exception IllegalArgumentException thrown if a via doesn't belong to the dataset of the layer - * in whose context this editor is working - */ - public void setVias(List vias) throws IllegalArgumentException{ + * in whose context this editor is working + */ + public void setVias(List vias) throws IllegalArgumentException { boolean viasDeleted = removeMembersWithRole("via"); - if (vias == null || vias.isEmpty()){ - if (viasDeleted){ + if (vias == null || vias.isEmpty()) { + if (viasDeleted) { fireTableDataChanged(); } return; } - // check vias + // check vias for (OsmPrimitive via: vias) { if (via == null) continue; - if (via.getDataSet() == null || via.getDataSet() != layer.data){ - throw new IllegalArgumentException(MessageFormat.format("via object ''{0}'' must belong to dataset of layer ''{1}''", via.getDisplayName(DefaultNameFormatter.getInstance()), layer.getName())); - } - } - // add vias + if (via.getDataSet() == null || via.getDataSet() != layer.data) { + throw new IllegalArgumentException(MessageFormat.format("via object ''{0}'' must belong to dataset of layer ''{1}''", + via.getDisplayName(DefaultNameFormatter.getInstance()), layer.getName())); + } + } + // add vias for (OsmPrimitive via: vias) { if (via == null) continue; @@ -203,25 +202,25 @@ fireTableDataChanged(); } - + /** * Sets the turn restriction member with role {@code role}. Removes all * members with role {@code role} if {@code id} is null. - * - * @param id the id + * + * @param id the id * @return true if the model was modified; false, otherwise */ - protected boolean setPrimitiveWithRole(PrimitiveId id, String role){ - if (id == null){ + protected boolean setPrimitiveWithRole(PrimitiveId id, String role) { + if (id == null) { return removeMembersWithRole(role); } - + List fromMembers = getRelationMembersWithRole(role); - if (fromMembers.isEmpty()){ + if (fromMembers.isEmpty()) { RelationMemberModel rm = new RelationMemberModel(role, id); members.add(rm); return true; - } else if (fromMembers.size() == 1){ + } else if (fromMembers.size() == 1) { RelationMemberModel rm = fromMembers.get(0); - if (!rm.getTarget().equals(id)){ + if (!rm.getTarget().equals(id)) { rm.setTarget(id); return true; @@ -235,33 +234,33 @@ } } - + /** * Sets the turn restriction member with role 'from'. Removes all * members with role 'from' if {@code id} is null. - * - * @param id the id - */ - public void setFromPrimitive(PrimitiveId id){ + * + * @param id the id + */ + public void setFromPrimitive(PrimitiveId id) { if (setPrimitiveWithRole(id, "from")) { fireTableDataChanged(); } } - + /** * Sets the turn restriction member with role 'to'. Removes all * members with role 'to' if {@code id} is null. - * - * @param id the id - */ - public void setToPrimitive(PrimitiveId id){ + * + * @param id the id + */ + public void setToPrimitive(PrimitiveId id) { if (setPrimitiveWithRole(id, "to")) { fireTableDataChanged(); } } - + /** * Replies the set of {@link OsmPrimitive}s referred to by members in * this model. - * + * * @return the set of {@link OsmPrimitive}s referred to by members in * this model. @@ -269,5 +268,5 @@ public Set getMemberPrimitives() { Set ret = new HashSet<>(); - for (RelationMemberModel rm: members){ + for (RelationMemberModel rm: members) { OsmPrimitive p = layer.data.getPrimitiveById(rm.getTarget()); if (p != null) ret.add(p); @@ -275,33 +274,33 @@ return ret; } - + /** * Populates the model with the relation member of a turn restriction. Clears - * the model if {@code tr} is null. - * + * the model if {@code tr} is null. + * * @param tr the turn restriction */ - public void populate(Relation tr){ + public void populate(Relation tr) { members.clear(); - if (tr == null){ + if (tr == null) { fireTableDataChanged(); return; } - for(RelationMember rm: tr.getMembers()){ + for (RelationMember rm: tr.getMembers()) { members.add(new RelationMemberModel(rm)); } fireTableDataChanged(); } - + /** * Replaces the member of turn restriction {@code tr} by the relation members currently * edited in this model. - * + * * @param tr the turn restriction. Ignored if null. */ - public void applyTo(Relation tr){ + public void applyTo(Relation tr) { if (tr == null) return; List newMembers = new ArrayList<>(); - for(RelationMemberModel model: members){ + for (RelationMemberModel model: members) { RelationMember rm = new RelationMember(model.getRole(), layer.data.getPrimitiveById(model.getTarget())); newMembers.add(rm); @@ -309,22 +308,22 @@ tr.setMembers(newMembers); } - - /** - * Clears the roles of all relation members currently selected in the + + /** + * Clears the roles of all relation members currently selected in the * table. */ - protected void clearSelectedRoles(){ - for(int i=0; i < getRowCount();i++){ + protected void clearSelectedRoles() { + for (int i = 0; i < getRowCount(); i++) { if (rowSelectionModel.isSelectedIndex(i)) { members.get(i).setRole(""); } - } - } - - /** - * Removes the currently selected rows from the model + } + } + + /** + * Removes the currently selected rows from the model */ protected void removedSelectedMembers() { - for(int i=getRowCount()-1; i >= 0;i--){ + for (int i = getRowCount()-1; i >= 0; i--) { if (rowSelectionModel.isSelectedIndex(i)) { members.remove(i); @@ -332,31 +331,31 @@ } } - + /** * Deletes the current selection. - * + * * If only cells in the first column are selected, the roles of the selected * members are reset to the empty string. Otherwise the selected members are - * removed from the model. - * + * removed from the model. + * */ public void deleteSelected() { if (colSelectionModel.isSelectedIndex(0) && !colSelectionModel.isSelectedIndex(1)) { clearSelectedRoles(); - } else if (rowSelectionModel.getMinSelectionIndex() >= 0){ + } else if (rowSelectionModel.getMinSelectionIndex() >= 0) { removedSelectedMembers(); } fireTableDataChanged(); } - + protected List getSelectedIndices() { ArrayList ret = new ArrayList<>(); - for(int i =0; i < members.size(); i++){ - if (rowSelectionModel.isSelectedIndex(i)) + for (int i = 0; i < members.size(); i++) { + if (rowSelectionModel.isSelectedIndex(i)) ret.add(i); } return ret; } - + public boolean canMoveUp() { List sel = getSelectedIndices(); @@ -364,5 +363,5 @@ return sel.get(0) > 0; } - + public boolean canMoveDown() { List sel = getSelectedIndices(); @@ -370,9 +369,9 @@ return sel.get(sel.size()-1) < members.size()-1; } - + public void moveUpSelected() { if (!canMoveUp()) return; List sel = getSelectedIndices(); - for (int idx: sel){ + for (int idx: sel) { RelationMemberModel m = members.remove(idx); members.add(idx-1, m); @@ -381,13 +380,13 @@ rowSelectionModel.clearSelection(); colSelectionModel.setSelectionInterval(0, 1); - for (int idx: sel){ + for (int idx: sel) { rowSelectionModel.addSelectionInterval(idx-1, idx-1); } } - + public void moveDownSelected() { if (!canMoveDown()) return; List sel = getSelectedIndices(); - for (int i = sel.size()-1; i>=0;i--){ + for (int i = sel.size()-1; i >= 0; i--) { int idx = sel.get(i); RelationMemberModel m = members.remove(idx); @@ -397,37 +396,39 @@ rowSelectionModel.clearSelection(); colSelectionModel.setSelectionInterval(0, 1); - for (int idx: sel){ + for (int idx: sel) { rowSelectionModel.addSelectionInterval(idx+1, idx+1); } } - + /** *
Inserts a list of new relation members with the empty role for the primitives * with id in {@code ids}. Inserts the new primitives at the position of the first * selected row. If no row is selected, at the end of the list.
- * - *
null values are skipped. If there is an id for which there is no primitive in the context + * + *
null values are skipped. If there is an id for which there is no primitive in the context * layer, if the primitive is deleted or invisible, an {@link IllegalArgumentException} * is thrown and nothing is inserted.
- * + * * @param ids the list of ids. Ignored if null. * @throws IllegalArgumentException thrown if one of the ids can't be inserted */ public void insertMembers(Collection ids) throws IllegalArgumentException { - if (ids == null) return; + if (ids == null) return; ArrayList newMembers = new ArrayList<>(); - for (PrimitiveId id: ids){ + for (PrimitiveId id: ids) { OsmPrimitive p = layer.data.getPrimitiveById(id); - if (p == null){ + if (p == null) { throw new IllegalArgumentException(tr("Cannot find object with id ''{0}'' in layer ''{1}''", id.toString(), layer.getName())); } - if (p.isDeleted() || ! p.isVisible()) { - throw new IllegalArgumentException(tr("Cannot add object ''{0}'' as relation member because it is deleted or invisible in layer ''{1}''", p.getDisplayName(DefaultNameFormatter.getInstance()), layer.getName())); - } - newMembers.add(new RelationMemberModel("",id)); + if (p.isDeleted() || !p.isVisible()) { + throw new IllegalArgumentException( + tr("Cannot add object ''{0}'' as relation member because it is deleted or invisible in layer ''{1}''", + p.getDisplayName(DefaultNameFormatter.getInstance()), layer.getName())); + } + newMembers.add(new RelationMemberModel("", id)); } if (newMembers.isEmpty()) return; int insertPos = rowSelectionModel.getMinSelectionIndex(); - if ( insertPos >=0){ + if (insertPos >= 0) { members.addAll(insertPos, newMembers); } else { @@ -435,19 +436,22 @@ } fireTableDataChanged(); - if (insertPos < 0) insertPos = 0; + if (insertPos < 0) insertPos = 0; colSelectionModel.setSelectionInterval(0, 1); // select both columns rowSelectionModel.setSelectionInterval(insertPos, insertPos + newMembers.size()-1); } + @Override public int getColumnCount() { return 2; } + @Override public int getRowCount() { return members.size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { - switch(columnIndex){ + switch(columnIndex) { case 0: return members.get(rowIndex).getRole(); case 1: return layer.data.getPrimitiveById(members.get(rowIndex).getTarget()); @@ -464,6 +468,6 @@ @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - if (columnIndex !=0)return; - String role = (String)aValue; + if (columnIndex != 0) return; + String role = (String) aValue; RelationMemberModel model = members.get(rowIndex); model.setRole(role); Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberModel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberModel.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberModel.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -15,11 +16,11 @@ * */ -public class RelationMemberModel implements Serializable{ +public class RelationMemberModel implements Serializable { private String role; private SimplePrimitiveId target; - + /** * Creates a new relation member model - * + * * @param role the member role. Reset to "" if null. * @param target the id of the target object. Must not be null. @@ -28,15 +29,15 @@ public RelationMemberModel(String role, PrimitiveId target) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(target, "target"); - this.role = role == null? "" : role; + this.role = role == null ? "" : role; this.target = new SimplePrimitiveId(target.getUniqueId(), target.getType()); } - + /** - * Creates a new relation member model from a relation member - * + * Creates a new relation member model from a relation member + * * @param member the relation member. Must not be null. * @throws IllegalArgumentException thrown if {@code member} is null */ - public RelationMemberModel(RelationMember member) throws IllegalArgumentException{ + public RelationMemberModel(RelationMember member) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(member, "member"); this.role = member.getRole(); @@ -46,5 +47,5 @@ /** * Replies the current role in this model. Never null. - * + * * @return the current role in this model */ @@ -54,15 +55,15 @@ /** - * Sets the current role in this model. - * + * Sets the current role in this model. + * * @param role the role. Reset to "" if null. */ public void setRole(String role) { - this.role = role == null? "" : role; + this.role = role == null ? "" : role; } /** * Replies the id of the target object of this relation member. - * + * * @return the id of the target object of this relation member. */ @@ -72,14 +73,14 @@ /** - * Sets the id of the target object. - * + * Sets the id of the target object. + * * @param target the id of the target object. Must not be null. * @throws IllegalArgumentException thrown if {@code target} is null */ - public void setTarget(PrimitiveId target) throws IllegalArgumentException{ + public void setTarget(PrimitiveId target) throws IllegalArgumentException { CheckParameterUtil.ensureParameterNotNull(target, "target"); this.target = new SimplePrimitiveId(target.getUniqueId(), target.getType()); } - + @Override public int hashCode() { Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -74,5 +75,5 @@ actDelete = new DeleteAction(); model.getRelationMemberEditorModel().getRowSelectionModel().addListSelectionListener(actDelete); - registerKeyboardAction(actDelete, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + registerKeyboardAction(actDelete, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); // initialize the paste action (will be used in the popup, the action map already includes @@ -82,5 +83,5 @@ actMoveUp = new MoveUpAction(); model.getRelationMemberEditorModel().getRowSelectionModel().addListSelectionListener(actMoveUp); - registerKeyboardAction(actMoveUp,actMoveUp.getKeyStroke(), WHEN_FOCUSED); + registerKeyboardAction(actMoveUp, actMoveUp.getKeyStroke(), WHEN_FOCUSED); actMoveDown = new MoveDownAction(); @@ -93,21 +94,23 @@ * */ - class DeleteAction extends AbstractAction implements ListSelectionListener{ - public DeleteAction() { + class DeleteAction extends AbstractAction implements ListSelectionListener { + DeleteAction() { putValue(NAME, tr("Delete")); putValue(SHORT_DESCRIPTION, tr("Clear the selected roles or delete the selected members")); new ImageProvider("deletesmall").getResource().attachImageIcon(this); - putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0)); + putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)); updateEnabledState(); } public void updateEnabledState() { - setEnabled(model.getRelationMemberEditorModel().getRowSelectionModel().getMinSelectionIndex()>=0); - } - + setEnabled(model.getRelationMemberEditorModel().getRowSelectionModel().getMinSelectionIndex() >= 0); + } + + @Override public void actionPerformed(ActionEvent e) { model.getRelationMemberEditorModel().deleteSelected(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -119,6 +122,6 @@ * */ - class PasteAction extends AbstractAction{ - public PasteAction() { + class PasteAction extends AbstractAction { + PasteAction() { putValue(NAME, tr("Paste")); putValue(SHORT_DESCRIPTION, tr("Insert new relation members from object in the clipboard")); @@ -133,4 +136,5 @@ } + @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent evt) { @@ -143,68 +147,74 @@ try { List ids; - ids = (List)cp.getData(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR); + ids = (List) cp.getData(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR); try { model.getRelationMemberEditorModel().insertMembers(ids); - } catch(IllegalArgumentException e){ + } catch (IllegalArgumentException e) { e.printStackTrace(); // FIXME: provide user feedback } - } catch(IOException e){ - e.printStackTrace(); - } catch(UnsupportedFlavorException e){ - e.printStackTrace(); - } - } - } - - class MoveDownAction extends AbstractAction implements ListSelectionListener{ + } catch (IOException e) { + e.printStackTrace(); + } catch (UnsupportedFlavorException e) { + e.printStackTrace(); + } + } + } + + class MoveDownAction extends AbstractAction implements ListSelectionListener { private KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.ALT_DOWN_MASK); - public MoveDownAction(){ + MoveDownAction() { putValue(NAME, tr("Move down")); putValue(SHORT_DESCRIPTION, tr("Move the selected relation members down by one position")); - putValue(ACCELERATOR_KEY,keyStroke); + putValue(ACCELERATOR_KEY, keyStroke); new ImageProvider("dialogs", "movedown").getResource().attachImageIcon(this); updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { model.getRelationMemberEditorModel().moveDownSelected(); } - public void updateEnabledState(){ + public void updateEnabledState() { setEnabled(model.getRelationMemberEditorModel().canMoveDown()); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } - public KeyStroke getKeyStroke() { + + KeyStroke getKeyStroke() { return keyStroke; } } - class MoveUpAction extends AbstractAction implements ListSelectionListener{ + class MoveUpAction extends AbstractAction implements ListSelectionListener { private KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.ALT_DOWN_MASK); - public MoveUpAction() { + MoveUpAction() { putValue(NAME, tr("Move up")); putValue(SHORT_DESCRIPTION, tr("Move the selected relation members up by one position")); - putValue(ACCELERATOR_KEY,keyStroke); + putValue(ACCELERATOR_KEY, keyStroke); new ImageProvider("dialogs", "moveup").getResource().attachImageIcon(this); updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { model.getRelationMemberEditorModel().moveUpSelected(); } - public void updateEnabledState(){ + public void updateEnabledState() { setEnabled(model.getRelationMemberEditorModel().canMoveUp()); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } - public KeyStroke getKeyStroke() { + + KeyStroke getKeyStroke() { return keyStroke; } @@ -215,5 +225,5 @@ public void launch(MouseEvent evt) { int row = rowAtPoint(evt.getPoint()); - if (getSelectionModel().getMinSelectionIndex() < 0 && row >=0){ + if (getSelectionModel().getMinSelectionIndex() < 0 && row >= 0) { getSelectionModel().setSelectionInterval(row, row); getColumnModel().getSelectionModel().setSelectionInterval(0, 1); @@ -224,5 +234,5 @@ class PopupMenu extends JPopupMenu { - public PopupMenu() { + PopupMenu() { JMenuItem item = add(actPaste); item.setTransferHandler(transferHandler); @@ -252,8 +262,8 @@ try { List ids; - ids = (List)t.getTransferData(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR); + ids = (List) t.getTransferData(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR); try { model.getRelationMemberEditorModel().insertMembers(ids); - } catch(IllegalArgumentException e){ + } catch (IllegalArgumentException e) { e.printStackTrace(); // FIXME: provide user feedback @@ -261,7 +271,7 @@ } return true; - } catch(IOException e){ - e.printStackTrace(); - } catch(UnsupportedFlavorException e){ + } catch (IOException e) { + e.printStackTrace(); + } catch (UnsupportedFlavorException e) { e.printStackTrace(); } @@ -271,5 +281,5 @@ @Override public int getSourceActions(JComponent c) { - return COPY_OR_MOVE; + return COPY_OR_MOVE; } } @@ -280,5 +290,5 @@ * */ - class RelationMemberTableDropTarget extends DropTarget{ + class RelationMemberTableDropTarget extends DropTarget { private boolean dropAccepted = false; @@ -287,5 +297,4 @@ * @param transferFlavors an array of transferFlavors - * @return */ protected boolean isSupportedFlavor(DataFlavor[] transferFlavors) { @@ -296,10 +305,11 @@ } + @Override public synchronized void dragEnter(DropTargetDragEvent dtde) { if (isSupportedFlavor(dtde.getCurrentDataFlavors())) { - if ((dtde.getSourceActions() & DnDConstants.ACTION_COPY_OR_MOVE) != 0){ + if ((dtde.getSourceActions() & DnDConstants.ACTION_COPY_OR_MOVE) != 0) { dtde.acceptDrag(DnDConstants.ACTION_COPY_OR_MOVE); setColumnSelectionAllowed(false); - dropAccepted = true; + dropAccepted = true; } else { dtde.rejectDrag(); @@ -310,4 +320,5 @@ } + @Override public synchronized void dragExit(DropTargetEvent dte) { setColumnSelectionAllowed(true); @@ -319,9 +330,10 @@ int row = rowAtPoint(dtde.getLocation()); int selectedRow = getSelectionModel().getMinSelectionIndex(); - if (row >= 0 && row != selectedRow){ + if (row >= 0 && row != selectedRow) { getSelectionModel().setSelectionInterval(row, row); } } + @Override @SuppressWarnings("unchecked") public synchronized void drop(DropTargetDropEvent dtde) { @@ -332,14 +344,14 @@ } List ids; - ids = (List)dtde.getTransferable().getTransferData(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR); + ids = (List) dtde.getTransferable().getTransferData(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR); try { model.getRelationMemberEditorModel().insertMembers(ids); - } catch(IllegalArgumentException e){ + } catch (IllegalArgumentException e) { e.printStackTrace(); // FIXME: provide user feedback } - } catch(IOException e){ - e.printStackTrace(); - } catch(UnsupportedFlavorException e){ + } catch (IOException e) { + e.printStackTrace(); + } catch (UnsupportedFlavorException e) { e.printStackTrace(); } finally { @@ -348,4 +360,5 @@ } + @Override public synchronized void dropActionChanged(DropTargetDragEvent dtde) { if ((dtde.getSourceActions() & DnDConstants.ACTION_COPY_OR_MOVE) == 0) { Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java (revision 32518) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -9,33 +10,33 @@ */ public class TurnRestrictionComboBox extends JComboBox