| |
@@ -27,11 +27,10 @@ |
| 27 |
27 |
|
* needed by gen2 widgets. |
| 28 |
28 |
|
* |
| 29 |
29 |
|
* @deprecated gen2Widget's functionality has been subsumed by the 1.6 Widget |
| 30 |
|
- |
* functionality |
| |
30 |
+ |
* functionality |
| 31 |
31 |
|
*/ |
| 32 |
32 |
|
@Deprecated |
| 33 |
|
- |
public abstract class Gen2TableWidget extends Widget implements HasHandlerManager |
| 34 |
|
- |
{ |
| |
33 |
+ |
public abstract class Gen2TableWidget extends Widget implements HasHandlerManager { |
| 35 |
34 |
|
|
| 36 |
35 |
|
private HandlerManager handlerManager; |
| 37 |
36 |
|
|
| |
@@ -41,40 +40,33 @@ |
| 41 |
40 |
|
* @return the handler manager |
| 42 |
41 |
|
*/ |
| 43 |
42 |
|
@Override |
| 44 |
|
- |
public final HandlerManager getHandlerManager() |
| 45 |
|
- |
{ |
| 46 |
|
- |
if ( handlerManager == null ) |
| 47 |
|
- |
{ |
| |
43 |
+ |
public final HandlerManager getHandlerManager() { |
| |
44 |
+ |
if ( handlerManager == null ) { |
| 48 |
45 |
|
handlerManager = createLegacyHandlerManager(); |
| 49 |
46 |
|
} |
| 50 |
47 |
|
return handlerManager; |
| 51 |
48 |
|
} |
| 52 |
49 |
|
|
| 53 |
50 |
|
@Override |
| 54 |
|
- |
public void onBrowserEvent( Event nativeEvent ) |
| 55 |
|
- |
{ |
| |
51 |
+ |
public void onBrowserEvent( Event nativeEvent ) { |
| 56 |
52 |
|
super.onBrowserEvent( nativeEvent ); |
| 57 |
|
- |
if ( handlerManager != null ) |
| 58 |
|
- |
{ |
| |
53 |
+ |
if ( handlerManager != null ) { |
| 59 |
54 |
|
DomEvent.fireNativeEvent( nativeEvent, handlerManager ); |
| 60 |
55 |
|
} |
| 61 |
56 |
|
} |
| 62 |
57 |
|
|
| 63 |
58 |
|
@Override |
| 64 |
|
- |
public void setStyleName( String name ) |
| 65 |
|
- |
{ |
| |
59 |
+ |
public void setStyleName( String name ) { |
| 66 |
60 |
|
setStylePrimaryName( name ); |
| 67 |
61 |
|
} |
| 68 |
62 |
|
|
| 69 |
63 |
|
// This code can probably not be compiled out, but this toString is |
| 70 |
64 |
|
// sufficiently more useful the cost seems worth it. |
| 71 |
65 |
|
@Override |
| 72 |
|
- |
public String toString() |
| 73 |
|
- |
{ |
| |
66 |
+ |
public String toString() { |
| 74 |
67 |
|
String accum = this.getStylePrimaryName() + " widget"; |
| 75 |
68 |
|
String id = this.getElement().getId(); |
| 76 |
|
- |
if ( id != null && id.trim().length() > 0 ) |
| 77 |
|
- |
{ |
| |
69 |
+ |
if ( id != null && id.trim().length() > 0 ) { |
| 78 |
70 |
|
accum += "id " + id; |
| 79 |
71 |
|
} |
| 80 |
72 |
|
return accum; |
| |
@@ -91,8 +83,7 @@ |
| 91 |
83 |
|
* |
| 92 |
84 |
|
* @return {@link HandlerRegistration} used to remove the handler |
| 93 |
85 |
|
*/ |
| 94 |
|
- |
protected <HandlerType extends EventHandler> HandlerRegistration addDomHandler( DomEvent.Type<?, HandlerType> key, final HandlerType handler ) |
| 95 |
|
- |
{ |
| |
86 |
+ |
protected <HandlerType extends EventHandler> HandlerRegistration addDomHandler( DomEvent.Type<?, HandlerType> key, final HandlerType handler ) { |
| 96 |
87 |
|
sinkEvents( key.getNativeEventType() ); |
| 97 |
88 |
|
return addHandler( key, handler ); |
| 98 |
89 |
|
} |
| |
@@ -106,8 +97,7 @@ |
| 106 |
97 |
|
* |
| 107 |
98 |
|
* @return {@link HandlerRegistration} used to remove the handler |
| 108 |
99 |
|
*/ |
| 109 |
|
- |
protected <HandlerType extends EventHandler> HandlerRegistration addHandler( AbstractEvent.Type<?, HandlerType> type, final HandlerType handler ) |
| 110 |
|
- |
{ |
| |
100 |
+ |
protected <HandlerType extends EventHandler> HandlerRegistration addHandler( AbstractEvent.Type<?, HandlerType> type, final HandlerType handler ) { |
| 111 |
101 |
|
return getHandlerManager().addHandler( type, handler ); |
| 112 |
102 |
|
} |
| 113 |
103 |
|
|
| |
@@ -127,8 +117,7 @@ |
| 127 |
117 |
|
* |
| 128 |
118 |
|
* @see #createHandlerManager() |
| 129 |
119 |
|
*/ |
| 130 |
|
- |
protected HandlerManager createLegacyHandlerManager() |
| 131 |
|
- |
{ |
| |
120 |
+ |
protected HandlerManager createLegacyHandlerManager() { |
| 132 |
121 |
|
return new HandlerManager( this ); |
| 133 |
122 |
|
} |
| 134 |
123 |
|
|
| |
@@ -137,10 +126,8 @@ |
| 137 |
126 |
|
* |
| 138 |
127 |
|
* @param event the event |
| 139 |
128 |
|
*/ |
| 140 |
|
- |
protected void fireEvent( AbstractEvent event ) |
| 141 |
|
- |
{ |
| 142 |
|
- |
if ( handlerManager != null ) |
| 143 |
|
- |
{ |
| |
129 |
+ |
protected void fireEvent( AbstractEvent event ) { |
| |
130 |
+ |
if ( handlerManager != null ) { |
| 144 |
131 |
|
handlerManager.fireEvent( event ); |
| 145 |
132 |
|
} |
| 146 |
133 |
|
} |
| |
@@ -152,8 +139,7 @@ |
| 152 |
139 |
|
* |
| 153 |
140 |
|
* @return does this event type have a current handler |
| 154 |
141 |
|
*/ |
| 155 |
|
- |
protected final boolean isEventHandled( AbstractEvent.Type type ) |
| 156 |
|
- |
{ |
| |
142 |
+ |
protected final boolean isEventHandled( AbstractEvent.Type type ) { |
| 157 |
143 |
|
return handlerManager == null ? false : handlerManager.isEventHandled( type ); |
| 158 |
144 |
|
} |
| 159 |
145 |
|
|
| |
@@ -166,10 +152,8 @@ |
| 166 |
152 |
|
* @param type the event type |
| 167 |
153 |
|
* @param handler the handler |
| 168 |
154 |
|
*/ |
| 169 |
|
- |
protected <HandlerType extends EventHandler> void removeHandler( AbstractEvent.Type<?, HandlerType> type, final HandlerType handler ) |
| 170 |
|
- |
{ |
| 171 |
|
- |
if ( handlerManager == null ) |
| 172 |
|
- |
{ |
| |
155 |
+ |
protected <HandlerType extends EventHandler> void removeHandler( AbstractEvent.Type<?, HandlerType> type, final HandlerType handler ) { |
| |
156 |
+ |
if ( handlerManager == null ) { |
| 173 |
157 |
|
handlerManager = new HandlerManager( this ); |
| 174 |
158 |
|
} |
| 175 |
159 |
|
handlerManager.removeHandler( type, handler ); |
View this file contents
View the full history
Commits for