|
@@ -16,12 +16,12 @@ |
16 |
16 |
|
|
17 |
17 |
|
package com.google.gwt.gen2.event.dom.client; |
18 |
18 |
|
|
19 |
|
- |
import java.util.*; |
20 |
|
- |
|
21 |
19 |
|
import com.google.gwt.gen2.event.shared.*; |
22 |
20 |
|
import com.google.gwt.gen2.event.shared.AbstractEvent.*; |
23 |
21 |
|
import com.google.gwt.user.client.ui.*; |
24 |
22 |
|
|
|
23 |
+ |
import java.util.*; |
|
24 |
+ |
|
25 |
25 |
|
/** |
26 |
26 |
|
* legacy listener support for dom events. Will eventually be moved into |
27 |
27 |
|
* user.ui. |
|
@@ -29,24 +29,19 @@ |
29 |
29 |
|
* @param <ListenerType> listener type |
30 |
30 |
|
*/ |
31 |
31 |
|
|
32 |
|
- |
abstract class ListenerWrapperImpl<ListenerType> implements EventHandler |
33 |
|
- |
{ |
|
32 |
+ |
abstract class ListenerWrapperImpl<ListenerType> implements EventHandler { |
34 |
33 |
|
|
35 |
|
- |
static class Click extends ListenerWrapperImpl<ClickListener> implements ClickHandler |
36 |
|
- |
{ |
|
34 |
+ |
static class Click extends ListenerWrapperImpl<ClickListener> implements ClickHandler { |
37 |
35 |
|
|
38 |
|
- |
public static void removeWrappedListener( HasHandlerManager eventSource, ClickListener listener ) |
39 |
|
- |
{ |
|
36 |
+ |
public static void removeWrappedListener( HasHandlerManager eventSource, ClickListener listener ) { |
40 |
37 |
|
removeWrappedListene( eventSource, listener, ClickEvent.TYPE ); |
41 |
38 |
|
} |
42 |
39 |
|
|
43 |
|
- |
protected Click( ClickListener listener ) |
44 |
|
- |
{ |
|
40 |
+ |
protected Click( ClickListener listener ) { |
45 |
41 |
|
super( listener ); |
46 |
42 |
|
} |
47 |
43 |
|
|
48 |
|
- |
public void onClick( ClickEvent event ) |
49 |
|
- |
{ |
|
44 |
+ |
public void onClick( ClickEvent event ) { |
50 |
45 |
|
listener.onClick( source( event ) ); |
51 |
46 |
|
} |
52 |
47 |
|
} |
|
@@ -55,52 +50,42 @@ |
55 |
50 |
|
* Handler wrapper for {@link FocusListener}. |
56 |
51 |
|
*/ |
57 |
52 |
|
static class Focus extends ListenerWrapperImpl<FocusListener> implements FocusHandler, |
58 |
|
- |
BlurHandler |
59 |
|
- |
{ |
|
53 |
+ |
BlurHandler { |
60 |
54 |
|
|
61 |
|
- |
public Focus( FocusListener listener ) |
62 |
|
- |
{ |
|
55 |
+ |
public Focus( FocusListener listener ) { |
63 |
56 |
|
super( listener ); |
64 |
57 |
|
} |
65 |
58 |
|
|
66 |
|
- |
public void onBlur( BlurEvent event ) |
67 |
|
- |
{ |
|
59 |
+ |
public void onBlur( BlurEvent event ) { |
68 |
60 |
|
listener.onLostFocus( source( event ) ); |
69 |
61 |
|
} |
70 |
62 |
|
|
71 |
|
- |
public void onFocus( FocusEvent event ) |
72 |
|
- |
{ |
|
63 |
+ |
public void onFocus( FocusEvent event ) { |
73 |
64 |
|
listener.onFocus( source( event ) ); |
74 |
65 |
|
} |
75 |
66 |
|
} |
76 |
67 |
|
|
77 |
68 |
|
static class Keyboard extends ListenerWrapperImpl<KeyboardListener> implements KeyDownHandler, |
78 |
69 |
|
KeyUpHandler, |
79 |
|
- |
KeyPressHandler |
80 |
|
- |
{ |
|
70 |
+ |
KeyPressHandler { |
81 |
71 |
|
|
82 |
|
- |
public static void removeWrappedListener( HasHandlerManager eventSource, KeyboardListener listener ) |
83 |
|
- |
{ |
|
72 |
+ |
public static void removeWrappedListener( HasHandlerManager eventSource, KeyboardListener listener ) { |
84 |
73 |
|
ListenerWrapperImpl.removeWrappedListene( eventSource, listener, KeyDownEvent.TYPE, KeyUpEvent.TYPE, KeyPressEvent.TYPE ); |
85 |
74 |
|
} |
86 |
75 |
|
|
87 |
|
- |
public Keyboard( KeyboardListener listener ) |
88 |
|
- |
{ |
|
76 |
+ |
public Keyboard( KeyboardListener listener ) { |
89 |
77 |
|
super( listener ); |
90 |
78 |
|
} |
91 |
79 |
|
|
92 |
|
- |
public void onKeyDown( KeyDownEvent event ) |
93 |
|
- |
{ |
|
80 |
+ |
public void onKeyDown( KeyDownEvent event ) { |
94 |
81 |
|
listener.onKeyDown( source( event ), (char) event.getKeyCode(), event.getKeyModifiers() ); |
95 |
82 |
|
} |
96 |
83 |
|
|
97 |
|
- |
public void onKeyPress( KeyPressEvent event ) |
98 |
|
- |
{ |
|
84 |
+ |
public void onKeyPress( KeyPressEvent event ) { |
99 |
85 |
|
listener.onKeyPress( source( event ), (char) event.getNativeEvent().getKeyCode(), event.getKeyModifiers() ); |
100 |
86 |
|
} |
101 |
87 |
|
|
102 |
|
- |
public void onKeyUp( KeyUpEvent event ) |
103 |
|
- |
{ |
|
88 |
+ |
public void onKeyUp( KeyUpEvent event ) { |
104 |
89 |
|
source( event ); |
105 |
90 |
|
listener.onKeyUp( source( event ), (char) event.getKeyCode(), event.getKeyModifiers() ); |
106 |
91 |
|
} |
|
@@ -110,11 +95,12 @@ |
110 |
95 |
|
MouseUpHandler, |
111 |
96 |
|
MouseOutHandler, |
112 |
97 |
|
MouseOverHandler, |
113 |
|
- |
MouseMoveHandler |
114 |
|
- |
{ |
|
98 |
+ |
MouseMoveHandler { |
115 |
99 |
|
|
116 |
|
- |
public static <EventSourceType extends HasHandlerManager & HasMouseDownHandlers & HasMouseUpHandlers & HasMouseOutHandlers & HasMouseOverHandlers & HasMouseMoveHandlers, HandlerType extends MouseDownHandler & MouseUpHandler & MouseOutHandler & MouseOverHandler & MouseMoveHandler> void addHandlers( EventSourceType source, HandlerType handlers ) |
117 |
|
- |
{ |
|
100 |
+ |
public static <EventSourceType extends HasHandlerManager & HasMouseDownHandlers & HasMouseUpHandlers & HasMouseOutHandlers & HasMouseOverHandlers & |
|
101 |
+ |
HasMouseMoveHandlers, HandlerType extends MouseDownHandler & MouseUpHandler & MouseOutHandler & MouseOverHandler & MouseMoveHandler> void |
|
102 |
+ |
addHandlers( |
|
103 |
+ |
EventSourceType source, HandlerType handlers ) { |
118 |
104 |
|
source.addMouseDownHandler( handlers ); |
119 |
105 |
|
source.addMouseUpHandler( handlers ); |
120 |
106 |
|
source.addMouseOutHandler( handlers ); |
|
@@ -122,53 +108,42 @@ |
122 |
108 |
|
source.addMouseMoveHandler( handlers ); |
123 |
109 |
|
} |
124 |
110 |
|
|
125 |
|
- |
public static void remove( HasHandlerManager eventSource, MouseListener listener ) |
126 |
|
- |
{ |
|
111 |
+ |
public static void remove( HasHandlerManager eventSource, MouseListener listener ) { |
127 |
112 |
|
removeWrappedListene( eventSource, listener, MouseDownEvent.TYPE, MouseUpEvent.TYPE, MouseOverEvent.TYPE, MouseOutEvent.TYPE ); |
128 |
113 |
|
} |
129 |
114 |
|
|
130 |
|
- |
protected Mouse( MouseListener listener ) |
131 |
|
- |
{ |
|
115 |
+ |
protected Mouse( MouseListener listener ) { |
132 |
116 |
|
super( listener ); |
133 |
117 |
|
} |
134 |
118 |
|
|
135 |
|
- |
public void onMouseDown( MouseDownEvent event ) |
136 |
|
- |
{ |
|
119 |
+ |
public void onMouseDown( MouseDownEvent event ) { |
137 |
120 |
|
listener.onMouseDown( source( event ), event.getClientX(), event.getScreenY() ); |
138 |
121 |
|
} |
139 |
122 |
|
|
140 |
|
- |
public void onMouseMove( MouseMoveEvent event ) |
141 |
|
- |
{ |
|
123 |
+ |
public void onMouseMove( MouseMoveEvent event ) { |
142 |
124 |
|
listener.onMouseMove( source( event ), event.getClientX(), event.getClientY() ); |
143 |
125 |
|
} |
144 |
126 |
|
|
145 |
|
- |
public void onMouseOut( MouseOutEvent event ) |
146 |
|
- |
{ |
|
127 |
+ |
public void onMouseOut( MouseOutEvent event ) { |
147 |
128 |
|
listener.onMouseLeave( source( event ) ); |
148 |
129 |
|
} |
149 |
130 |
|
|
150 |
|
- |
public void onMouseOver( MouseOverEvent event ) |
151 |
|
- |
{ |
|
131 |
+ |
public void onMouseOver( MouseOverEvent event ) { |
152 |
132 |
|
listener.onMouseEnter( source( event ) ); |
153 |
133 |
|
} |
154 |
134 |
|
|
155 |
|
- |
public void onMouseUp( MouseUpEvent event ) |
156 |
|
- |
{ |
|
135 |
+ |
public void onMouseUp( MouseUpEvent event ) { |
157 |
136 |
|
listener.onMouseUp( source( event ), event.getClientX(), event.getClientY() ); |
158 |
137 |
|
} |
159 |
138 |
|
} |
160 |
139 |
|
|
161 |
|
- |
protected static void removeWrappedListene( HasHandlerManager eventSource, EventListener listener, Type... keys ) |
162 |
|
- |
{ |
|
140 |
+ |
protected static void removeWrappedListene( HasHandlerManager eventSource, EventListener listener, Type... keys ) { |
163 |
141 |
|
HandlerManager manager = eventSource.getHandlerManager(); |
164 |
|
- |
for ( Type key : keys ) |
165 |
|
- |
{ |
|
142 |
+ |
for ( Type key : keys ) { |
166 |
143 |
|
int handlerCount = manager.getHandlerCount( key ); |
167 |
|
- |
for ( int i = 0; i < handlerCount; i++ ) |
168 |
|
- |
{ |
|
144 |
+ |
for ( int i = 0; i < handlerCount; i++ ) { |
169 |
145 |
|
EventHandler handler = manager.getHandler( key, i ); |
170 |
|
- |
if ( handler instanceof ListenerWrapperImpl && ((ListenerWrapperImpl) handler).listener.equals( listener ) ) |
171 |
|
- |
{ |
|
146 |
+ |
if ( handler instanceof ListenerWrapperImpl && ((ListenerWrapperImpl) handler).listener.equals( listener ) ) { |
172 |
147 |
|
manager.removeHandler( key, handler ); |
173 |
148 |
|
} |
174 |
149 |
|
} |
|
@@ -177,13 +152,11 @@ |
177 |
152 |
|
|
178 |
153 |
|
protected final ListenerType listener; |
179 |
154 |
|
|
180 |
|
- |
ListenerWrapperImpl( ListenerType listener ) |
181 |
|
- |
{ |
|
155 |
+ |
ListenerWrapperImpl( ListenerType listener ) { |
182 |
156 |
|
this.listener = listener; |
183 |
157 |
|
} |
184 |
158 |
|
|
185 |
|
- |
Widget source( AbstractEvent e ) |
186 |
|
- |
{ |
|
159 |
+ |
Widget source( AbstractEvent e ) { |
187 |
160 |
|
return (Widget) e.getSource(); |
188 |
161 |
|
} |
189 |
162 |
|
} |