Skip to content

Commit 3c6123f

Browse files
author
jmhofer
committed
a few minor cleanups, renamings, javadoc additions
1 parent 2612d75 commit 3c6123f

File tree

5 files changed

+48
-22
lines changed

5 files changed

+48
-22
lines changed

‎rxjava-contrib/rxjava-swing/src/main/java/rx/observables/SwingObservable.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static rx.Observable.filter;
1919

20+
import java.awt.Component;
2021
import java.awt.Dimension;
2122
import java.awt.event.ActionEvent;
2223
import java.awt.event.ComponentEvent;
@@ -25,7 +26,6 @@
2526
import java.util.Set;
2627

2728
import javax.swing.AbstractButton;
28-
import javax.swing.JComponent;
2929

3030
import rx.Observable;
3131
import rx.swing.sources.AbstractButtonSource;
@@ -57,7 +57,7 @@ public static Observable<ActionEvent> fromButtonAction(AbstractButton button) {
5757
* The component to register the observable for.
5858
* @return Observable of key events.
5959
*/
60-
public static Observable<KeyEvent> fromKeyEvents(JComponent component) {
60+
public static Observable<KeyEvent> fromKeyEvents(Component component) {
6161
return KeyEventSource.fromKeyEventsOf(component);
6262
}
6363

@@ -68,7 +68,7 @@ public static Observable<KeyEvent> fromKeyEvents(JComponent component) {
6868
* The component to register the observable for.
6969
* @return Observable of key events.
7070
*/
71-
public static Observable<KeyEvent> fromKeyEvents(JComponent component, final Set<Integer> keyCodes) {
71+
public static Observable<KeyEvent> fromKeyEvents(Component component, final Set<Integer> keyCodes) {
7272
return filter(fromKeyEvents(component), new Func1<KeyEvent, Boolean>() {
7373
@Override
7474
public Boolean call(KeyEvent event) {
@@ -84,7 +84,7 @@ public Boolean call(KeyEvent event) {
8484
* The component to register the observable for.
8585
* @return Observable of currently pressed keys.
8686
*/
87-
public static Observable<Set<Integer>> currentlyPressedKeys(JComponent component) {
87+
public static Observable<Set<Integer>> fromPressedKeys(Component component) {
8888
return KeyEventSource.currentlyPressedKeysOf(component);
8989
}
9090

@@ -95,7 +95,7 @@ public static Observable<Set<Integer>> currentlyPressedKeys(JComponent component
9595
* The component to register the observable for.
9696
* @return Observable of mouse events.
9797
*/
98-
public static Observable<MouseEvent> fromMouseEvents(JComponent component) {
98+
public static Observable<MouseEvent> fromMouseEvents(Component component) {
9999
return MouseEventSource.fromMouseEventsOf(component);
100100
}
101101

@@ -106,7 +106,7 @@ public static Observable<MouseEvent> fromMouseEvents(JComponent component) {
106106
* The component to register the observable for.
107107
* @return Observable of mouse motion events.
108108
*/
109-
public static Observable<MouseEvent> fromMouseMotionEvents(JComponent component) {
109+
public static Observable<MouseEvent> fromMouseMotionEvents(Component component) {
110110
return MouseEventSource.fromMouseMotionEventsOf(component);
111111
}
112112

@@ -117,7 +117,7 @@ public static Observable<MouseEvent> fromMouseMotionEvents(JComponent component)
117117
* The component to register the observable for.
118118
* @return Observable of component events.
119119
*/
120-
public static Observable<ComponentEvent> fromComponentEvents(JComponent component) {
120+
public static Observable<ComponentEvent> fromComponentEvents(Component component) {
121121
return ComponentEventSource.fromComponentEventsOf(component);
122122
}
123123

@@ -128,7 +128,7 @@ public static Observable<ComponentEvent> fromComponentEvents(JComponent componen
128128
* The component to register the observable for.
129129
* @return Observable emitting the current size of the given component after each resize event.
130130
*/
131-
public static Observable<Dimension> fromResizing(JComponent component) {
131+
public static Observable<Dimension> fromResizing(Component component) {
132132
return ComponentEventSource.fromResizing(component);
133133
}
134134
}

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/AbstractButtonSource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838

3939
public enum AbstractButtonSource { ; // no instances
4040

41+
/**
42+
* @see SwingObservable.fromButtonAction
43+
*/
4144
public static Observable<ActionEvent> fromActionOf(final AbstractButton button) {
4245
return Observable.create(new Func1<Observer<ActionEvent>, Subscription>() {
4346
@Override

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/ComponentEventSource.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,27 @@
1515
*/
1616
package rx.swing.sources;
1717

18+
import static rx.swing.sources.ComponentEventSource.Predicate.RESIZED;
19+
20+
import java.awt.Component;
1821
import java.awt.Dimension;
1922
import java.awt.event.ComponentEvent;
2023
import java.awt.event.ComponentListener;
2124

22-
import javax.swing.JComponent;
23-
2425
import rx.Observable;
2526
import rx.Observer;
2627
import rx.Subscription;
28+
import rx.observables.SwingObservable;
2729
import rx.subscriptions.Subscriptions;
2830
import rx.util.functions.Action0;
2931
import rx.util.functions.Func1;
3032

3133
public enum ComponentEventSource { ; // no instances
3234

33-
public static Observable<ComponentEvent> fromComponentEventsOf(final JComponent component) {
35+
/**
36+
* @see SwingObservable.fromComponentEvents
37+
*/
38+
public static Observable<ComponentEvent> fromComponentEventsOf(final Component component) {
3439
return Observable.create(new Func1<Observer<ComponentEvent>, Subscription>() {
3540
@Override
3641
public Subscription call(final Observer<ComponentEvent> observer) {
@@ -67,8 +72,11 @@ public void call() {
6772
});
6873
}
6974

70-
public static Observable<Dimension> fromResizing(final JComponent component) {
71-
return fromComponentEventsOf(component).filter(Predicate.RESIZED).map(new Func1<ComponentEvent, Dimension>() {
75+
/**
76+
* @see SwingObservable.fromResizing
77+
*/
78+
public static Observable<Dimension> fromResizing(final Component component) {
79+
return fromComponentEventsOf(component).filter(RESIZED).map(new Func1<ComponentEvent, Dimension>() {
7280
@Override
7381
public Dimension call(ComponentEvent event) {
7482
return event.getComponent().getSize();

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/KeyEventSource.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@
1616
package rx.swing.sources;
1717

1818
import static java.util.Arrays.asList;
19-
import static org.mockito.Mockito.*;
19+
import static org.mockito.Mockito.inOrder;
20+
import static org.mockito.Mockito.mock;
21+
import static org.mockito.Mockito.never;
22+
import static org.mockito.Mockito.times;
23+
import static org.mockito.Mockito.verify;
2024

25+
import java.awt.Component;
2126
import java.awt.event.KeyEvent;
2227
import java.awt.event.KeyListener;
2328
import java.util.Collections;
2429
import java.util.HashSet;
2530
import java.util.Set;
2631

27-
import javax.swing.JComponent;
2832
import javax.swing.JPanel;
2933

3034
import org.junit.Test;
@@ -42,7 +46,10 @@
4246

4347
public enum KeyEventSource { ; // no instances
4448

45-
public static Observable<KeyEvent> fromKeyEventsOf(final JComponent component) {
49+
/**
50+
* @see SwingObservable.fromKeyEvents(Component)
51+
*/
52+
public static Observable<KeyEvent> fromKeyEventsOf(final Component component) {
4653
return Observable.create(new Func1<Observer<KeyEvent>, Subscription>() {
4754
@Override
4855
public Subscription call(final Observer<KeyEvent> observer) {
@@ -74,7 +81,10 @@ public void call() {
7481
});
7582
}
7683

77-
public static Observable<Set<Integer>> currentlyPressedKeysOf(JComponent component) {
84+
/**
85+
* @see SwingObservable.fromKeyEvents(Component, Set)
86+
*/
87+
public static Observable<Set<Integer>> currentlyPressedKeysOf(Component component) {
7888
return Observable.<KeyEvent, Set<Integer>>scan(fromKeyEventsOf(component), new HashSet<Integer>(), new Func2<Set<Integer>, KeyEvent, Set<Integer>>() {
7989
@Override
8090
public Set<Integer> call(Set<Integer> pressedKeys, KeyEvent event) {
@@ -96,7 +106,7 @@ public Set<Integer> call(Set<Integer> pressedKeys, KeyEvent event) {
96106
}
97107

98108
public static class UnitTest {
99-
private JComponent comp = new JPanel();
109+
private Component comp = new JPanel();
100110

101111
@Test
102112
public void testObservingKeyEvents() {

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/MouseEventSource.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616
package rx.swing.sources;
1717

18+
import java.awt.Component;
1819
import java.awt.event.MouseEvent;
1920
import java.awt.event.MouseListener;
2021
import java.awt.event.MouseMotionListener;
2122

22-
import javax.swing.JComponent;
23-
2423
import rx.Observable;
2524
import rx.Observer;
2625
import rx.Subscription;
@@ -30,7 +29,10 @@
3029

3130
public enum MouseEventSource { ; // no instances
3231

33-
public static Observable<MouseEvent> fromMouseEventsOf(final JComponent component) {
32+
/**
33+
* @see SwingObservable.fromMouseEvents
34+
*/
35+
public static Observable<MouseEvent> fromMouseEventsOf(final Component component) {
3436
return Observable.create(new Func1<Observer<MouseEvent>, Subscription>() {
3537
@Override
3638
public Subscription call(final Observer<MouseEvent> observer) {
@@ -72,7 +74,10 @@ public void call() {
7274
});
7375
}
7476

75-
public static Observable<MouseEvent> fromMouseMotionEventsOf(final JComponent component) {
77+
/**
78+
* @see SwingObservable.fromMouseMotionEvents
79+
*/
80+
public static Observable<MouseEvent> fromMouseMotionEventsOf(final Component component) {
7681
return Observable.create(new Func1<Observer<MouseEvent>, Subscription>() {
7782
@Override
7883
public Subscription call(final Observer<MouseEvent> observer) {

0 commit comments

Comments
 (0)