Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (revision 34816) @@ -58,5 +58,5 @@ @Override public void actionPerformed(ActionEvent e) { - DataSet ds = getLayerManager().getEditDataSet(); + DataSet ds = getLayerManager().getEditDataSet(); if (!checkSelection(ds.getSelected())) { showWarningNotification(tr("The current selection cannot be used for splitting.")); Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java (revision 34816) @@ -37,8 +37,8 @@ private static final String TOOL_DESC = tr("Split adjacent ways on T-intersections"); public SplitOnIntersectionsAction() { - super(TITLE, "dumbutils/splitonintersections", TOOL_DESC, - Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")), - KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), - true); + super(TITLE, "dumbutils/splitonintersections", TOOL_DESC, + Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")), + KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), + true); } @@ -95,8 +95,8 @@ SplitWayCommand split = SplitWayCommand.split(entry.getKey(), entry.getValue(), selectedWays); if (split != null) { - // execute, we need the result, see also #16006 - UndoRedoHandler.getInstance().add(split); - selectedWays.remove(split.getOriginalWay()); - selectedWays.addAll(split.getNewWays()); + // execute, we need the result, see also #16006 + UndoRedoHandler.getInstance().add(split); + selectedWays.remove(split.getOriginalWay()); + selectedWays.addAll(split.getNewWays()); list.add(split); } @@ -104,11 +104,11 @@ if (!list.isEmpty()) { - if (list.size() > 1) { - // create a single command for the previously executed commands - SequenceCommand seq = new SequenceCommand(TITLE, list); - for (int i = 0; i < list.size(); i++) { - UndoRedoHandler.getInstance().undo(); - } - UndoRedoHandler.getInstance().add(seq); + if (list.size() > 1) { + // create a single command for the previously executed commands + SequenceCommand seq = new SequenceCommand(TITLE, list); + for (int i = 0; i < list.size(); i++) { + UndoRedoHandler.getInstance().undo(); + } + UndoRedoHandler.getInstance().add(seq); } getLayerManager().getEditDataSet().clearSelection(); Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java (revision 34816) @@ -44,4 +44,5 @@ UndoRedoHandler.getInstance().add(new ChangePropertyCommand(selection, "source", source)); } + @Override protected void updateEnabledState() { @@ -53,26 +54,25 @@ } - @Override protected void updateEnabledState(Collection selection) { if (!selectionBuf.isEmpty()) { - String newSource = null; - for (OsmPrimitive p : selectionBuf) { - String s = p.get("source"); - if (s != null) { - if (newSource == null) - newSource = s; - else { - if (!newSource.equals(s)) { - newSource = null; - break; - } - } - } - } - if (newSource != null && !newSource.isEmpty()) { + String newSource = null; + for (OsmPrimitive p : selectionBuf) { + String s = p.get("source"); + if (s != null) { + if (newSource == null) + newSource = s; + else { + if (!newSource.equals(s)) { + newSource = null; + break; + } + } + } + } + if (newSource != null && !newSource.isEmpty()) { source = newSource; Config.getPref().put("sourcetag.value", source); - } + } } selectionBuf = new ArrayList<>(selection); Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (revision 34816) @@ -132,5 +132,5 @@ */ public static ReplaceGeometryCommand buildUpgradeNodeCommand(Node subjectNode, OsmPrimitive referenceObject) { - if (!subjectNode.getParentWays().isEmpty()) { + if (!subjectNode.getParentWays().isEmpty()) { throw new ReplaceGeometryException(tr("Node belongs to way(s), cannot replace.")); } Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java (revision 34816) @@ -48,5 +48,5 @@ static void addNeighbours(Way w, Node n, Collection nodes) { if (!n.getParentWays().contains(w)) - return; + return; List nodeList = w.getNodes(); @@ -469,12 +469,12 @@ // select nodes and ways inside selected ways and multipolygons for (OsmPrimitive p: selected) { - if (p instanceof Way) { - addAllInsideWay(dataset, (Way)p, newWays, newNodes); - } + if (p instanceof Way) { + addAllInsideWay(dataset, (Way) p, newWays, newNodes); + } } for (OsmPrimitive p: selected) { - if (!(p instanceof Relation) || !p.isMultipolygon()) - continue; - addAllInsideMultipolygon(dataset, (Relation) p, newWays, newNodes); + if ((p instanceof Relation) && p.isMultipolygon()) { + addAllInsideMultipolygon(dataset, (Relation) p, newWays, newNodes); + } } if (ignoreNodesOfFoundWays) { Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java (revision 34816) @@ -45,6 +45,6 @@ if (num == 0) return; int k = 0, idx; - // check if executed again, we cycle through all available commands - if (lastCmd != null && !selection.isEmpty() ) { + // check if executed again, we cycle through all available commands + if (lastCmd != null && !selection.isEmpty()) { idx = UndoRedoHandler.getInstance().commands.lastIndexOf(lastCmd); } else { @@ -57,14 +57,14 @@ cmd = UndoRedoHandler.getInstance().commands.get(idx); if (cmd.getAffectedDataSet() == ds) { - Collection pp = cmd.getParticipatingPrimitives(); - nodes.clear(); - for (OsmPrimitive p : pp) { // find all affected ways - if (p instanceof Node && !p.isDeleted()) nodes.add((Node) p); - } - if (!nodes.isEmpty() && !ds.getSelectedNodes().containsAll(nodes)) { - ds.setSelected(nodes); - lastCmd = cmd; // remember last used command and last selection - return; - } + Collection pp = cmd.getParticipatingPrimitives(); + nodes.clear(); + for (OsmPrimitive p : pp) { // find all affected ways + if (p instanceof Node && !p.isDeleted()) nodes.add((Node) p); + } + if (!nodes.isEmpty() && !ds.getSelectedNodes().containsAll(nodes)) { + ds.setSelected(nodes); + lastCmd = cmd; // remember last used command and last selection + return; + } } k++; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java (revision 34816) @@ -45,5 +45,5 @@ int k = 0, idx; // check if executed again, we cycle through all available commands - if (lastCmd != null && !ds.getSelectedWays().isEmpty() ) { + if (lastCmd != null && !ds.getSelectedWays().isEmpty()) { idx = UndoRedoHandler.getInstance().commands.lastIndexOf(lastCmd); } else { @@ -56,15 +56,15 @@ cmd = UndoRedoHandler.getInstance().commands.get(idx); if (cmd.getAffectedDataSet() == ds) { - Collection pp = cmd.getParticipatingPrimitives(); - ways.clear(); - for (OsmPrimitive p : pp) { - // find all affected ways - if (p instanceof Way && !p.isDeleted()) ways.add((Way) p); - } - if (!ways.isEmpty() && !ds.getSelectedWays().containsAll(ways)) { - ds.setSelected(ways); - lastCmd = cmd; // remember last used command and last selection - return; - } + Collection pp = cmd.getParticipatingPrimitives(); + ways.clear(); + for (OsmPrimitive p : pp) { + // find all affected ways + if (p instanceof Way && !p.isDeleted()) ways.add((Way) p); + } + if (!ways.isEmpty() && !ds.getSelectedWays().containsAll(ways)) { + ds.setSelected(ways); + lastCmd = cmd; // remember last used command and last selection + return; + } } k++; Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java (revision 34815) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java (revision 34816) @@ -40,10 +40,10 @@ if (history == null || history.isEmpty()) return; // empty history if (lastSel != null) { - Collection selection = ds.getSelected(); - if (lastSel.size() == selection.size() && selection.containsAll(lastSel)) { - // repeated action - } else { - index = -1; - } + Collection selection = ds.getSelected(); + if (lastSel.size() == selection.size() && selection.containsAll(lastSel)) { + // repeated action + } else { + index = -1; + } } @@ -61,10 +61,10 @@ k++; if (!newSel.isEmpty()) { - Collection oldSel = ds.getSelected(); - if (oldSel.size() == newSel.size() && newSel.containsAll(oldSel)) { - // ignore no-change selection - continue; - } - break; + Collection oldSel = ds.getSelected(); + if (oldSel.size() == newSel.size() && newSel.containsAll(oldSel)) { + // ignore no-change selection + continue; + } + break; } } @@ -78,8 +78,8 @@ @Override protected void updateEnabledState() { - DataSet ds = getLayerManager().getEditDataSet(); - lastSel = null; - index = -1; - setEnabled(ds != null && ds.getSelectionHistory().isEmpty()); + DataSet ds = getLayerManager().getEditDataSet(); + lastSel = null; + index = -1; + setEnabled(ds != null && ds.getSelectionHistory().isEmpty()); } }