Changeset 1164

Timestamp:

09/27/18 16:55:37 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/gio/InputManager.java (modified) (17 diffs)

trunk/src/org/expeditee/gio/InputManager.java

@@ -75 +75 @@
                 // Initialise the map of input-event -> gesture translators
                 _translators = new HashMap<InputType, List<InputEventToGestureTranslator>>(InputType.values().length);
-                for (InputType type : InputType.values()) _translators.put(type, new LinkedList<InputEventToGestureTranslator>());
+                for (InputType type : InputType.values()) {
+                        _translators.put(type, new LinkedList<InputEventToGestureTranslator>());
+                }
                 
                 // Initialise the list of gesture listeners
@@ -122 +124 @@
                 
                 // Run event handlers in reverse order
-                while (it.hasPrevious()) it.previous().onWindowEvent(type);
+                while (it.hasPrevious()) {
+                        it.previous().onWindowEvent(type);
+                }
         }
         
@@ -155 +159 @@
         public final void moveCursor(int x, int y)
         {
-                //System.err.println("Input manager position to: " + x + "," + y);
                 setCursorPosition(getCursorPosition().clone().add(x, y));
         }
@@ -175 +178 @@
                 Long nextTimeout = _timeoutQueue.getNextTimeout();
                 
-                if (nextTimeout != null) updateTimer(nextTimeout);
+                if (nextTimeout != null) {
+                        updateTimer(nextTimeout);
+                }
                 
                 return handle;
@@ -199 +204 @@
                 Long nextTimeout = _timeoutQueue.getNextTimeout();
                 
-                if (nextTimeout != null) updateTimer(nextTimeout);
+                if (nextTimeout != null) {
+                        updateTimer(nextTimeout);
+                }
         }
 
@@ -205 +212 @@
         protected final void triggerTimeoutEvents(Collection<TimeoutHandle> handles)
         {
-                if (handles == null) return;
-                
-                for (TimeoutHandle handle : handles) triggerTimeoutEvent(handle);
+                if (handles == null) {
+                        return;
+                }
+                
+                for (TimeoutHandle handle : handles) {
+                        triggerTimeoutEvent(handle);
+                }
         }
 
@@ -213 +224 @@
         protected final void triggerTimeoutEvent(TimeoutHandle handle)
         {
-                if (handle == null) return;
+                if (handle == null) {
+                        return;
+                }
                 
                 TimeoutInputEvent event = new TimeoutInputEvent(handle);
@@ -232 +245 @@
         public void addInteractiveWidget(Widget iw)
         {
-                if (iw == null) return;
-                
-                if (!_widgets.contains(iw)) _widgets.add(iw);
+                if (iw == null) {
+                        return;
+                }
+                
+                if (!_widgets.contains(iw)) {
+                        _widgets.add(iw);
+                }
         }
         
@@ -240 +257 @@
         public void removeInteractiveWidget(Widget iw)
         {
-                if (iw == null) return;
-                
-                if (_widgets.contains(iw)) _widgets.remove(iw);
+                if (iw == null) {
+                        return;
+                }
+                
+                if (_widgets.contains(iw)) {
+                        _widgets.remove(iw);
+                }
         }
 
@@ -260 +281 @@
         public final void registerInputEventListener(InputEventListener listener)
         {
-                if (listener == null) return;
+                if (listener == null) {
+                        return;
+                }
                 
                 _inputEventListeners.add(listener);
@@ -268 +291 @@
         public final void removeInputEventListener(InputEventListener listener)
         {
-                if (listener == null) return;
+                if (listener == null) {
+                        return;
+                }
                 
                 _inputEventListeners.remove(listener);
@@ -283 +308 @@
                 // Allow listeners to optionally consume input before gesture translation
                 for (InputEventListener listener : _inputEventListeners) {
-                        if (listener.onInputEvent(event)) return;
+                        if (listener.onInputEvent(event)) {
+                                return;
+                        }
                 }
                 
@@ -296 +323 @@
                         InputEventToGestureTranslator translator = it.previous();
                         List<Gesture> translatorGestures = translator.onInputEvent(event);
-                        if (gestures == null && translatorGestures != null && !translatorGestures.isEmpty()) gestures = translatorGestures;
+                        if (gestures == null && translatorGestures != null && !translatorGestures.isEmpty()) {
+                                gestures = translatorGestures;
+                        }
                 }
                 
@@ -321 +350 @@
         public final void addInputEventToGestureTranslator(InputEventToGestureTranslator translator)
         {
-                if (translator == null) return;
+                if (translator == null) {
+                        return;
+                }
                 
                 Set<InputType> types = translator.getMonitoredInputTypes();
                 
-                for (InputType type : types) _translators.get(type).add(translator);
+                for (InputType type : types) {
+                        _translators.get(type).add(translator);
+                }
         }
         
@@ -334 +367 @@
         public final List<InputEventToGestureTranslator> getInputEventToGestureTranslators(InputType type)
         {
-                if (type == null) return null;
+                if (type == null) {
+                        return null;
+                }
                 
                 return _translators.get(type);
@@ -348 +383 @@
         public final void registerGestureListener(GestureListener listener)
         {
-                if (listener == null) return;
+                if (listener == null) {
+                        return;
+                }
                 
                 _gestureListeners.add(listener);
@@ -362 +399 @@
         protected void distributeGestures(List<Gesture> gestures, boolean robotic)
         {
-                if (gestures == null) return;
-                
-                for (Gesture gesture : gestures) distributeGesture(gesture, robotic);
+                if (gestures == null) {
+                        return;
+                }
+                
+                for (Gesture gesture : gestures) {
+                        distributeGesture(gesture, robotic);
+                }
         }