Changeset 34782 in osm

Timestamp:

2018-12-15T17:55:04+01:00 (6 years ago)

Author:

donvip

Message:

fix warnings

Location:

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

Files:

• SplitOnIntersectionsAction.java (modified) (4 diffs)
• TagBufferAction.java (modified) (2 diffs)

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

@@ -41 +41 @@
     public SplitOnIntersectionsAction() {
         super(TITLE, "dumbutils/splitonintersections", TOOL_DESC,
-                Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", TITLE),
-                        KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), true);
+                Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", TITLE), KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT),
+                true);
     }
 
@@ -88 +88 @@
         }
 
-                if (splitWays.isEmpty()) {
-                        new Notification(tr("The selection cannot be used for action ''{0}''", TOOL_DESC))
-                                        .setIcon(JOptionPane.WARNING_MESSAGE).show();
-                        return;
-                }
+        if (splitWays.isEmpty()) {
+            new Notification(tr("The selection cannot be used for action ''{0}''", TOOL_DESC))
+                    .setIcon(JOptionPane.WARNING_MESSAGE).show();
+            return;
+        }
 
-                // fix #16006: Don't generate SequenceCommand when ways are part of the same relation.
+        // fix #16006: Don't generate SequenceCommand when ways are part of the same relation.
         boolean createSequenceCommand = true;
         Set<Relation> allWayRefs = new HashSet<>();
@@ -103 +103 @@
         }
         for (Entry<Way, List<Node>> entry : splitWays.entrySet()) {
-                SplitWayCommand cmd = SplitWayCommand.split(entry.getKey(), entry.getValue(), selectedWays);
-                if (!createSequenceCommand) {
-                        UndoRedoHandler.getInstance().add(cmd);
-                }
-                list.add(cmd);
+            SplitWayCommand cmd = SplitWayCommand.split(entry.getKey(), entry.getValue(), selectedWays);
+            if (!createSequenceCommand) {
+                UndoRedoHandler.getInstance().add(cmd);
+            }
+            list.add(cmd);
         }
 
@@ -114 +114 @@
                 UndoRedoHandler.getInstance().add(list.size() == 1 ? list.get(0) : new SequenceCommand(TITLE, list));
             } else {
-                                new Notification(
-                                                tr("Affected ways are members of the same relation. {0} actions were created for this split.",
-                                                                list.size())).setIcon(JOptionPane.WARNING_MESSAGE).show();
-                        }
+                new Notification(
+                        tr("Affected ways are members of the same relation. {0} actions were created for this split.",
+                                list.size())).setIcon(JOptionPane.WARNING_MESSAGE).show();
+            }
             getLayerManager().getEditDataSet().clearSelection();
         }

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

@@ -80 +80 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        TagCollection oldTags = getCommonTags(selectionBuf);
-        if (!oldTags.isEmpty()) {
-            tagsToPaste = new TagCollection(oldTags);
-        }
-        selectionBuf.clear();
-        selectionBuf.addAll(selection);
+        TagCollection oldTags = getCommonTags(selectionBuf);
+        if (!oldTags.isEmpty()) {
+                tagsToPaste = new TagCollection(oldTags);
+        }
+        selectionBuf.clear();
+        selectionBuf.addAll(selection);
 
         setEnabled(!selection.isEmpty() && !tagsToPaste.isEmpty());
@@ -95 +95 @@
      */
     private static TagCollection getCommonTags(Set<OsmPrimitive> selection) {
-        if (selection.isEmpty())
-                return EmptyTags;
-//              // Fix #8350 - only care about tagged objects
-                return TagCollection.commonToAllPrimitives(SubclassFilteredCollection.filter(selection, p -> p.isTagged()));
+        if (selection.isEmpty())
+            return EmptyTags;
+        // Fix #8350 - only care about tagged objects
+        return TagCollection.commonToAllPrimitives(SubclassFilteredCollection.filter(selection, p -> p.isTagged()));
     }
 }