litesoft
Diff Revisions
2
vs
23
for /trunk/Java/GWT/Client/src/org/litesoft/GWT/client/widgets/nonpublic/external/ControllerSupportDelegate.java
|
@@ -30,7 +30,7 @@ |
30 |
30 |
|
{ |
31 |
31 |
|
private final Widget m_widget; |
32 |
32 |
|
|
33 |
|
- |
private List m_controllers; |
|
33 |
+ |
private List<Controller> m_controllers; |
34 |
34 |
|
private int m_legacyEventBits = 0; |
35 |
35 |
|
// private boolean m_processing = false; |
36 |
36 |
|
|
|
@@ -65,7 +65,7 @@ |
65 |
65 |
|
{ |
66 |
66 |
|
for ( int i = 0, size = m_controllers.size(); i < size; i++ ) |
67 |
67 |
|
{ |
68 |
|
- |
controllerEventBits |= ((Controller) m_controllers.get( i )).getEventBits(); |
|
68 |
+ |
controllerEventBits |= m_controllers.get( i ).getEventBits(); |
69 |
69 |
|
} |
70 |
70 |
|
} |
71 |
71 |
|
DOM.sinkEvents( m_widget.getElement(), m_legacyEventBits | controllerEventBits ); |
|
@@ -88,9 +88,9 @@ |
88 |
88 |
|
{ |
89 |
89 |
|
for ( int i = 0, size = m_controllers.size(); i < size; i++ ) |
90 |
90 |
|
{ |
91 |
|
- |
if ( ((Controller) m_controllers.get( i )).getId() == id ) |
|
91 |
+ |
if ( m_controllers.get( i ).getId() == id ) |
92 |
92 |
|
{ |
93 |
|
- |
return (Controller) m_controllers.get( i ); |
|
93 |
+ |
return m_controllers.get( i ); |
94 |
94 |
|
} |
95 |
95 |
|
} |
96 |
96 |
|
return null; |
|
@@ -108,7 +108,7 @@ |
108 |
108 |
|
|
109 |
109 |
|
if ( m_controllers == null ) |
110 |
110 |
|
{ |
111 |
|
- |
m_controllers = new Vector(); |
|
111 |
+ |
m_controllers = new ArrayList<Controller>(); |
112 |
112 |
|
} |
113 |
113 |
|
m_controllers.add( controller ); |
114 |
114 |
|
DOM.sinkEvents( m_widget.getElement(), DOM.getEventsSunk( m_widget.getElement() ) | |
|
@@ -156,7 +156,7 @@ |
156 |
156 |
|
|
157 |
157 |
|
if ( controllers != null ) |
158 |
158 |
|
{ |
159 |
|
- |
m_controllers = new Vector(); |
|
159 |
+ |
m_controllers = new ArrayList<Controller>(); |
160 |
160 |
|
for ( int i = 0, size = controllers.size(); i < size; i++ ) |
161 |
161 |
|
{ |
162 |
162 |
|
m_controllers.add( (Controller) controllers.get( i ) ); |
|
@@ -177,7 +177,7 @@ |
177 |
177 |
|
{ |
178 |
178 |
|
for ( int i = 0, size = m_controllers.size(); i < size; i++ ) |
179 |
179 |
|
{ |
180 |
|
- |
((Controller) m_controllers.get( i )).plugIn( m_widget ); |
|
180 |
+ |
m_controllers.get( i ).plugIn( m_widget ); |
181 |
181 |
|
} |
182 |
182 |
|
} |
183 |
183 |
|
} |
|
@@ -188,7 +188,7 @@ |
188 |
188 |
|
{ |
189 |
189 |
|
for ( int i = m_controllers.size() - 1; i >= 0; i-- ) |
190 |
190 |
|
{ |
191 |
|
- |
((Controller) m_controllers.get( i )).unplug( m_widget ); |
|
191 |
+ |
m_controllers.get( i ).unplug( m_widget ); |
192 |
192 |
|
} |
193 |
193 |
|
} |
194 |
194 |
|
} |
|
@@ -221,7 +221,7 @@ |
221 |
221 |
|
// m_processing = true; |
222 |
222 |
|
for ( int i = 0, size = m_controllers.size(); i < size; i++ ) |
223 |
223 |
|
{ |
224 |
|
- |
Controller controller = (Controller) m_controllers.get( i ); |
|
224 |
+ |
Controller controller = m_controllers.get( i ); |
225 |
225 |
|
if ( (controller.getEventBits() & DOM.eventGetType( event )) != 0 ) |
226 |
226 |
|
{ |
227 |
227 |
|
controller.onBrowserEvent( m_widget, event ); |