Improved key press observable to filter out events of type KEY_TYPED completely.

jmhofer · jmhofer · commit de62c8a473a1 · 2013-05-08T10:16:50.000+02:00
diff --git a/rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/ComponentEventSource.java b/rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/ComponentEventSource.java
@@ -103,6 +103,5 @@ private Predicate(int id) {
         public Boolean call(ComponentEvent event) {
             return event.getID() == id;
         }
-        
     }
 }
diff --git a/rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/KeyEventSource.java b/rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/KeyEventSource.java
@@ -85,7 +85,7 @@ public void call() {
      * @see SwingObservable.fromKeyEvents(Component, Set)
      */
     public static Observable<Set<Integer>> currentlyPressedKeysOf(Component component) {
-        return Observable.<KeyEvent, Set<Integer>>scan(fromKeyEventsOf(component), new HashSet<Integer>(), new Func2<Set<Integer>, KeyEvent, Set<Integer>>() {
+        class CollectKeys implements Func2<Set<Integer>, KeyEvent, Set<Integer>>{
             @Override
             public Set<Integer> call(Set<Integer> pressedKeys, KeyEvent event) {
                 Set<Integer> afterEvent = new HashSet<Integer>(pressedKeys);
@@ -102,7 +102,16 @@ public Set<Integer> call(Set<Integer> pressedKeys, KeyEvent event) {
                 }
                 return afterEvent;
             }
+        }
+        
+        Observable<KeyEvent> filteredKeyEvents = fromKeyEventsOf(component).filter(new Func1<KeyEvent, Boolean>() {
+            @Override
+            public Boolean call(KeyEvent event) {
+                return event.getID() == KeyEvent.KEY_PRESSED || event.getID() == KeyEvent.KEY_RELEASED;
+            }
         });
+        
+        return Observable.<KeyEvent, Set<Integer>>scan(filteredKeyEvents, Collections.<Integer>emptySet(), new CollectKeys());
     }
     
     public static class UnitTest {
@@ -158,6 +167,7 @@ public void testObservingPressedKeys() {
             verify(complete, never()).call();
 
             fireKeyEvent(keyEvent(2, KeyEvent.KEY_PRESSED));
+            fireKeyEvent(keyEvent(KeyEvent.VK_UNDEFINED, KeyEvent.KEY_TYPED));
             inOrder.verify(action, times(1)).call(new HashSet<Integer>(asList(1, 2)));
 
             fireKeyEvent(keyEvent(2, KeyEvent.KEY_RELEASED));

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,5 @@ private Predicate(int id) {`
`103`	`103`	`public Boolean call(ComponentEvent event) {`
`104`	`104`	`return event.getID() == id;`
`105`	`105`	`}`
`106`		`-`
`107`	`106`	`}`
`108`	`107`	`}`