Changeset 7801 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

2014-12-13T01:07:04+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -664 +664 @@
             );
             switch(ret) {
-            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return;
-            case JOptionPane.CLOSED_OPTION: return;
-            case JOptionPane.NO_OPTION: return;
+            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+            case JOptionPane.CLOSED_OPTION:
+            case JOptionPane.NO_OPTION:
+                return;
             case JOptionPane.YES_OPTION:
                 memberTableModel.removeMembersReferringTo(toCheck);
@@ -714 +715 @@
         );
         switch(ret) {
-        case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;
-        case JOptionPane.YES_OPTION: return true;
-        case JOptionPane.NO_OPTION: return false;
-        case JOptionPane.CLOSED_OPTION: return false;
-        case JOptionPane.CANCEL_OPTION: throw new AddAbortException();
+        case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+        case JOptionPane.YES_OPTION:
+            return true;
+        case JOptionPane.NO_OPTION:
+        case JOptionPane.CLOSED_OPTION:
+            return false;
+        case JOptionPane.CANCEL_OPTION:
+            throw new AddAbortException();
         }
         // should not happen
@@ -1581 +1585 @@
             );
             switch(ret) {
-            case JOptionPane.YES_OPTION: return true;
-            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true;
+            case JOptionPane.YES_OPTION:
+            case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION:
+                return true;
             default:
                 return false;