Changeset 34816 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2019-01-12T11:52:51+01:00 (6 years ago)

Author:

gerdp

Message:

fix checkstyle issues

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2

Files:

• actions/SplitObjectAction.java (modified) (1 diff)
• actions/SplitOnIntersectionsAction.java (modified) (3 diffs)
• actions/TagSourceAction.java (modified) (2 diffs)
• replacegeometry/ReplaceGeometryUtils.java (modified) (1 diff)
• selection/NodeWayUtils.java (modified) (2 diffs)
• selection/SelectModNodesAction.java (modified) (2 diffs)
• selection/SelectModWaysAction.java (modified) (2 diffs)
• selection/UndoSelectionAction.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java

@@ -58 +58 @@
     @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."));

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java

@@ -37 +37 @@
     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 +95 @@
             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 +104 @@
 
         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();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java

@@ -44 +44 @@
         UndoRedoHandler.getInstance().add(new ChangePropertyCommand(selection, "source", source));
     }
+
     @Override
     protected void updateEnabledState() {
@@ -53 +54 @@
     }
 
-
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> 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);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -132 +132 @@
      */
     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."));
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -48 +48 @@
     static void addNeighbours(Way w, Node n, Collection<Node> nodes) {
         if (!n.getParentWays().contains(w))
-                return;
+            return;
 
         List<Node> nodeList = w.getNodes();
@@ -469 +469 @@
         // 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) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java

@@ -45 +45 @@
             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 +57 @@
                 cmd = UndoRedoHandler.getInstance().commands.get(idx);
                 if (cmd.getAffectedDataSet() == ds) {
-                        Collection<? extends OsmPrimitive> 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<? extends OsmPrimitive> 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++;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java

@@ -45 +45 @@
             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 +56 @@
                 cmd = UndoRedoHandler.getInstance().commands.get(idx);
                 if (cmd.getAffectedDataSet() == ds) {
-                        Collection<? extends OsmPrimitive> 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<? extends OsmPrimitive> 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++;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java

@@ -40 +40 @@
             if (history == null || history.isEmpty()) return; // empty history
             if (lastSel != null) {
-                Collection<OsmPrimitive> selection = ds.getSelected();
-                if (lastSel.size() == selection.size() && selection.containsAll(lastSel)) {
-                        // repeated action
-                } else {
-                        index = -1;
-                }
+                Collection<OsmPrimitive> selection = ds.getSelected();
+                if (lastSel.size() == selection.size() && selection.containsAll(lastSel)) {
+                    // repeated action
+                } else {
+                    index = -1;
+                }
             }
 
@@ -61 +61 @@
                 k++;
                 if (!newSel.isEmpty()) {
-                        Collection<OsmPrimitive> oldSel = ds.getSelected();
-                        if (oldSel.size() == newSel.size() && newSel.containsAll(oldSel)) {
-                                // ignore no-change selection
-                                continue;
-                        }
-                        break;
+                    Collection<OsmPrimitive> oldSel = ds.getSelected();
+                    if (oldSel.size() == newSel.size() && newSel.containsAll(oldSel)) {
+                        // ignore no-change selection
+                        continue;
+                    }
+                    break;
                 }
             }
@@ -78 +78 @@
     @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());
     }
 }