Changeset 10216 in josm for trunk/src/org/openstreetmap/josm/actions/PasteAction.java

Timestamp:

2016-05-15T14:48:06+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

File:

• trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) (5 diffs)

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

@@ -64 +64 @@
     public void pasteData(PrimitiveDeepCopy pasteBuffer, Layer source, ActionEvent e) {
         /* Find the middle of the pasteBuffer area */
-        double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
+        double maxEast = -1E100;
+        double minEast = 1E100;
+        double maxNorth = -1E100;
+        double minNorth = 1E100;
         boolean incomplete = false;
         for (PrimitiveData data : pasteBuffer.getAll()) {
@@ -92 +95 @@
 
         // Allow to cancel paste if there are incomplete primitives
-        if (incomplete) {
-            if (!confirmDeleteIncomplete()) return;
+        if (incomplete && !confirmDeleteIncomplete()) {
+            return;
         }
 
@@ -158 +161 @@
                 for (RelationMemberData member: ((RelationData) data).getMembers()) {
                     OsmPrimitiveType memberType = member.getMemberType();
-                    Long newId = null;
+                    Long newId;
                     switch (memberType) {
                     case NODE:
@@ -169 +172 @@
                         newId = newRelationIds.get(member.getMemberId());
                         break;
+                    default: throw new AssertionError();
                     }
                     if (newId != null) {
@@ -183 +187 @@
     }
 
-    protected boolean confirmDeleteIncomplete() {
+    private static boolean confirmDeleteIncomplete() {
         ExtendedDialog ed = new ExtendedDialog(Main.parent,
                 tr("Delete incomplete members?"),