Changeset 6623 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-01-04T06:39:00+01:00 (10 years ago)

Author:

Don-vip

Message:

fix Sonar issues

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AutoScaleAction.java (modified) (2 diffs)
• CreateMultipolygonAction.java (modified) (7 diffs)
• SelectNonBranchingWaySequences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -211 +211 @@
                 return null;
             // try to zoom to the first selected layer
-            //
             Layer l = getFirstSelectedLayer();
             if (l == null) return null;
@@ -245 +244 @@
             // ensure reasonable zoom level when zooming onto single nodes.
             v.enlargeToMinDegrees(0.0005);
-        }
-        else if (mode.equals("download")) {
+        } else if (mode.equals("download")) {
             Bounds bounds = DownloadDialog.getSavedDownloadBounds();
             if (bounds != null) {

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -61 +61 @@
     /**
      * Constructs a new {@code CreateMultipolygonAction}.
+     * @param update {@code true} if the multipolygon must be updated, {@code false} if it must be created
      */
     public CreateMultipolygonAction(final boolean update) {
         super(getName(update), "multipoly_create", getName(update),
-                update
-                        ? null
+                update  ? null
                         : Shortcut.registerShortcut("tools:multipoly", tr("Tool: {0}", getName(false)), KeyEvent.VK_A, Shortcut.ALT_CTRL),
                 true, update ? "multipoly_update" : "multipoly_create", true);
@@ -73 +73 @@
     private static String getName(boolean update) {
         return update ? tr("Update multipolygon") : tr("Create multipolygon");
+    }
+    
+    private class CreateUpdateMultipolygonTask implements Runnable {
+        private final Collection<Way> selectedWays;
+        private final Relation multipolygonRelation;
+
+        public CreateUpdateMultipolygonTask(Collection<Way> selectedWays, Relation multipolygonRelation) {
+            this.selectedWays = selectedWays;
+            this.multipolygonRelation = multipolygonRelation;
+        }
+
+        @Override
+        public void run() {
+            final Pair<SequenceCommand, Relation> commandAndRelation = createMultipolygonCommand(selectedWays, multipolygonRelation);
+            if (commandAndRelation == null) {
+                return;
+            }
+            final Command command = commandAndRelation.a;
+            final Relation relation = commandAndRelation.b;
+
+
+            // to avoid EDT violations
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    Main.main.undoRedo.add(command);
+                }
+            });
+
+            // Use 'SwingUtilities.invokeLater' to make sure the relationListDialog
+            // knows about the new relation before we try to select it.
+            // (Yes, we are already in event dispatch thread. But DatasetEventManager
+            // uses 'SwingUtilities.invokeLater' to fire events so we have to do
+            // the same.)
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    Main.map.relationListDialog.selectRelation(relation);
+                    if (Main.pref.getBoolean("multipoly.show-relation-editor", false)) {
+                        //Open relation edit window, if set up in preferences
+                        RelationEditor editor = RelationEditor.getEditor(Main.main.getEditLayer(), relation, null);
+
+                        editor.setModal(true);
+                        editor.setVisible(true);
+                    }
+                }
+            });
+        }
     }
 
@@ -109 +157 @@
                 : null;
 
-        // runnable to create/update multipolygon relation
-        final Runnable createOrUpdateMultipolygonTask = new Runnable() {
-            @Override
-            public void run() {
-                final Pair<SequenceCommand, Relation> commandAndRelation = createMultipolygonCommand(selectedWays, multipolygonRelation);
-                if (commandAndRelation == null) {
-                    return;
-                }
-                final Command command = commandAndRelation.a;
-                final Relation relation = commandAndRelation.b;
-
-
-                // to avoid EDT violations
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        Main.main.undoRedo.add(command);
-                    }
-                });
-
-                // Use 'SwingUtilities.invokeLater' to make sure the relationListDialog
-                // knows about the new relation before we try to select it.
-                // (Yes, we are already in event dispatch thread. But DatasetEventManager
-                // uses 'SwingUtilities.invokeLater' to fire events so we have to do
-                // the same.)
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        Main.map.relationListDialog.selectRelation(relation);
-                        if (Main.pref.getBoolean("multipoly.show-relation-editor", false)) {
-                            //Open relation edit window, if set up in preferences
-                            RelationEditor editor = RelationEditor.getEditor(Main.main.getEditLayer(), relation, null);
-
-                            editor.setModal(true);
-                            editor.setVisible(true);
-                        }
-                    }
-                });
-            }
-        };
-
         // download incomplete relation if necessary
         if (multipolygonRelation != null && (multipolygonRelation.isIncomplete() || multipolygonRelation.hasIncompleteMembers())) {
@@ -155 +162 @@
         }
         // create/update multipolygon relation
-        Main.worker.submit(createOrUpdateMultipolygonTask);
+        Main.worker.submit(new CreateUpdateMultipolygonTask(selectedWays, multipolygonRelation));
 
     }
@@ -181 +188 @@
 
         // add ways of existing relation to include them in polygon analysis
-        selectedWays = new HashSet<Way>(selectedWays);
-        selectedWays.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
-
-        final MultipolygonCreate polygon = analyzeWays(selectedWays, true);
+        Set<Way> ways = new HashSet<Way>(selectedWays);
+        ways.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
+
+        final MultipolygonCreate polygon = analyzeWays(ways, true);
         if (polygon == null) {
             return null; //could not make multipolygon.
@@ -206 +213 @@
 
     /**
-     * Returns a pair of a multipolygon creating/modifying {@link Command} as well as the multipolygon {@link Relation}.
+     * Returns a {@link Pair} of a multipolygon creating/modifying {@link Command} as well as the multipolygon {@link Relation}.
      */
     public static Pair<SequenceCommand, Relation> createMultipolygonCommand(Collection<Way> selectedWays, Relation selectedMultipolygonRelation) {
@@ -309 +316 @@
     }
 
-    static public final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"});
+    public static final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"});
 
     /**

trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java

@@ -4 +4 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.Set;
 import java.util.TreeSet;
 
@@ -20 +21 @@
      * outer endpoints of selected ways
      */
-    TreeSet<Node> outerNodes;
+    Set<Node> outerNodes;
     /**
      * endpoints of selected ways
      */
-    TreeSet<Node> nodes;
+    Set<Node> nodes;
 
     /**