Changeset 11386 in josm for trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

Timestamp:

2016-12-13T02:16:07+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -120 +120 @@
             if (timer.isRunning()) {
                 timer.stop();
-            } else if (set.add(e.getKeyCode()) && enabled) {
-                if (isFocusInMainWindow()) {
-                    for (KeyPressReleaseListener q: keyListeners) {
-                        if (Main.isTraceEnabled()) {
-                            Main.trace(q+" => doKeyPressed("+e+')');
-                        }
-                        q.doKeyPressed(e);
+            } else if (set.add(e.getKeyCode()) && enabled && isFocusInMainWindow()) {
+                for (KeyPressReleaseListener q: keyListeners) {
+                    if (Main.isTraceEnabled()) {
+                        Main.trace(q+" => doKeyPressed("+e+')');
                     }
+                    q.doKeyPressed(e);
                 }
             }
@@ -133 +131 @@
             if (timer.isRunning()) {
                 timer.stop();
-                if (set.remove(e.getKeyCode()) && enabled) {
-                    if (isFocusInMainWindow()) {
-                        for (KeyPressReleaseListener q: keyListeners) {
-                            if (Main.isTraceEnabled()) {
-                                Main.trace(q+" => doKeyReleased("+e+')');
-                            }
-                            q.doKeyReleased(e);
+                if (set.remove(e.getKeyCode()) && enabled && isFocusInMainWindow()) {
+                    for (KeyPressReleaseListener q: keyListeners) {
+                        if (Main.isTraceEnabled()) {
+                            Main.trace(q+" => doKeyReleased("+e+')');
                         }
+                        q.doKeyReleased(e);
                     }
                 }