Changeset 18487 in josm for trunk

Timestamp:

2022-06-13T17:59:52+02:00 (23 months ago)

Author:

taylor.smock

Message:

PMD/Checkstyle fixes for r18485

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/CopyActionTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -1153 +1153 @@
                         if (cycleList.size() == 2 && !waitForMouseUpParameter
                                 // This was a nested if statement (see commented code below)
-                                && (!(osm.equals(old) || osm.isNew() || platformMenuShortcutKeyMask))) {
+                                && !(osm.equals(old) || osm.isNew() || platformMenuShortcutKeyMask)) {
                                 cyclePrims = false;
                                 osm = old;
-                            // else defer toggling to mouseRelease time in those cases:
-                            /*
-                             * osm == old -- the true nearest node is the
-                             * selected one osm is a new node -- do not break
-                             * unglue ways in ALT mode ctrl is pressed -- ctrl
-                             * generally works on mouseReleased
-                             */
+                                // else defer toggling to mouseRelease time in those cases:
+                                /*
+                                 * osm == old -- the true nearest node is the
+                                 * selected one osm is a new node -- do not break
+                                 * unglue ways in ALT mode ctrl is pressed -- ctrl
+                                 * generally works on mouseReleased
+                                 */
                         }
                     }

trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java

@@ -47 +47 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    static public JOSMTestRules test = new JOSMTestRules().preferences().fakeAPI().main().projection();
+    public static JOSMTestRules test = new JOSMTestRules().preferences().fakeAPI().main().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java

@@ -24 +24 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    static public JOSMTestRules test = new JOSMTestRules().main().projection();
+    public static JOSMTestRules test = new JOSMTestRules().main().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java

@@ -32 +32 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    static public JOSMTestRules test = new JOSMTestRules().main().projection();
+    public static JOSMTestRules test = new JOSMTestRules().main().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java

@@ -42 +42 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    static public JOSMTestRules test = new JOSMTestRules().projection().main();
+    public static JOSMTestRules test = new JOSMTestRules().projection().main();
 
     /**