|
@@ -36,10 +36,8 @@ |
36 |
36 |
|
* </nl> |
37 |
37 |
|
*/ |
38 |
38 |
|
public class FormEngine implements ServerInteractionListener, |
39 |
|
- |
FormEngineMember |
40 |
|
- |
{ |
41 |
|
- |
public interface Callback |
42 |
|
- |
{ |
|
39 |
+ |
FormEngineMember { |
|
40 |
+ |
public interface Callback { |
43 |
41 |
|
void submit( String name ); |
44 |
42 |
|
} |
45 |
43 |
|
|
|
@@ -56,13 +54,11 @@ |
56 |
54 |
|
private boolean enabled = true; |
57 |
55 |
|
private E13nResolver resolver = null; |
58 |
56 |
|
|
59 |
|
- |
public FormEngine( String name ) |
60 |
|
- |
{ |
|
57 |
+ |
public FormEngine( String name ) { |
61 |
58 |
|
this.name = Validate.noEmptyIdentifier( "Name", name ); |
62 |
59 |
|
} |
63 |
60 |
|
|
64 |
|
- |
public final String getName() |
65 |
|
- |
{ |
|
61 |
+ |
public final String getName() { |
66 |
62 |
|
return name; |
67 |
63 |
|
} |
68 |
64 |
|
|
|
@@ -71,45 +67,36 @@ |
71 |
67 |
|
/** |
72 |
68 |
|
* Add the Form's Members - The order added will be the order processed for Focus |
73 |
69 |
|
*/ |
74 |
|
- |
public void add( FormEngineMember... members ) |
75 |
|
- |
{ |
|
70 |
+ |
public void add( FormEngineMember... members ) { |
76 |
71 |
|
assertBuildMode( "add( members )" ); |
77 |
|
- |
if ( members != null ) |
78 |
|
- |
{ |
79 |
|
- |
for ( FormEngineMember member : members ) |
80 |
|
- |
{ |
|
72 |
+ |
if ( members != null ) { |
|
73 |
+ |
for ( FormEngineMember member : members ) { |
81 |
74 |
|
memberAdd( member ); |
82 |
75 |
|
} |
83 |
76 |
|
} |
84 |
77 |
|
} |
85 |
78 |
|
|
86 |
|
- |
public void setSubmit( ButtonBase submitButton, Callback submitCallback ) |
87 |
|
- |
{ |
|
79 |
+ |
public void setSubmit( ButtonBase submitButton, Callback submitCallback ) { |
88 |
80 |
|
assertBuildMode( "setSubmit" ); |
89 |
81 |
|
this.submitButton = submitButton; |
90 |
82 |
|
this.submitCallback = submitCallback; |
91 |
83 |
|
} |
92 |
84 |
|
|
93 |
|
- |
public void addManaged( ButtonBase... managedButtons ) |
94 |
|
- |
{ |
|
85 |
+ |
public void addManaged( ButtonBase... managedButtons ) { |
95 |
86 |
|
assertBuildMode( "addManaged" ); |
96 |
|
- |
if ( managedButtons != null ) |
97 |
|
- |
{ |
98 |
|
- |
for ( ButtonBase button : managedButtons ) |
99 |
|
- |
{ |
|
87 |
+ |
if ( managedButtons != null ) { |
|
88 |
+ |
for ( ButtonBase button : managedButtons ) { |
100 |
89 |
|
managedAdd( button ); |
101 |
90 |
|
} |
102 |
91 |
|
} |
103 |
92 |
|
} |
104 |
93 |
|
|
105 |
94 |
|
@Override |
106 |
|
- |
public void init( E13nResolver parentResolver ) |
107 |
|
- |
{ |
|
95 |
+ |
public void init( E13nResolver parentResolver ) { |
108 |
96 |
|
Validate.notNull( "resolver", parentResolver ); |
109 |
97 |
|
assertBuildMode( "init" ); |
110 |
98 |
|
|
111 |
|
- |
if ( submitButton == null && members.isEmpty() && managedButtons.isEmpty() ) |
112 |
|
- |
{ |
|
99 |
+ |
if ( submitButton == null && members.isEmpty() && managedButtons.isEmpty() ) { |
113 |
100 |
|
throw new IllegalStateException( "Nothing 'in' the FormEngine, No: Submit Button, Members, or Managed Buttons" ); |
114 |
101 |
|
} |
115 |
102 |
|
|
|
@@ -117,32 +104,24 @@ |
117 |
104 |
|
|
118 |
105 |
|
List<HasEnabled> simpleChildren = new ArrayList<HasEnabled>(); |
119 |
106 |
|
|
120 |
|
- |
for ( FormEngineMember member : members ) |
121 |
|
- |
{ |
|
107 |
+ |
for ( FormEngineMember member : members ) { |
122 |
108 |
|
member.init( resolver ); |
123 |
|
- |
if ( member instanceof InputField ) |
124 |
|
- |
{ |
|
109 |
+ |
if ( member instanceof InputField ) { |
125 |
110 |
|
simpleChildren.add( member ); |
126 |
111 |
|
} |
127 |
112 |
|
} |
128 |
|
- |
for ( ButtonBase button : managedButtons ) |
129 |
|
- |
{ |
|
113 |
+ |
for ( ButtonBase button : managedButtons ) { |
130 |
114 |
|
buttonInit( button ); |
131 |
115 |
|
simpleChildren.add( button ); |
132 |
116 |
|
} |
133 |
|
- |
if ( submitButton != null ) |
134 |
|
- |
{ |
|
117 |
+ |
if ( submitButton != null ) { |
135 |
118 |
|
buttonInit( submitButton ); |
136 |
119 |
|
simpleChildren.add( submitButton ); |
137 |
|
- |
submitButton.addClickHandler( new ClickHandler() |
138 |
|
- |
{ |
|
120 |
+ |
submitButton.addClickHandler( new ClickHandler() { |
139 |
121 |
|
@Override |
140 |
|
- |
public void onClick( ClickEvent event ) |
141 |
|
- |
{ |
142 |
|
- |
if ( validate() ) |
143 |
|
- |
{ |
144 |
|
- |
if ( submitCallback != null ) |
145 |
|
- |
{ |
|
122 |
+ |
public void onClick( ClickEvent event ) { |
|
123 |
+ |
if ( validate() ) { |
|
124 |
+ |
if ( submitCallback != null ) { |
146 |
125 |
|
submitCallback.submit( getName() ); |
147 |
126 |
|
} |
148 |
127 |
|
} |
|
@@ -156,57 +135,45 @@ |
156 |
135 |
|
// Callable anytime: |
157 |
136 |
|
|
158 |
137 |
|
@Override |
159 |
|
- |
public boolean isRunMode() |
160 |
|
- |
{ |
|
138 |
+ |
public boolean isRunMode() { |
161 |
139 |
|
return (resolver != null); |
162 |
140 |
|
} |
163 |
141 |
|
|
164 |
142 |
|
@Override |
165 |
|
- |
public boolean isEnabled() |
166 |
|
- |
{ |
|
143 |
+ |
public boolean isEnabled() { |
167 |
144 |
|
return enabled; |
168 |
145 |
|
} |
169 |
146 |
|
|
170 |
147 |
|
@Override |
171 |
|
- |
public void setEnabled( boolean enabled ) |
172 |
|
- |
{ |
|
148 |
+ |
public void setEnabled( boolean enabled ) { |
173 |
149 |
|
this.enabled = enabled; |
174 |
150 |
|
} |
175 |
151 |
|
|
176 |
152 |
|
// Only callable in Run Mode: |
177 |
153 |
|
|
178 |
154 |
|
@Override |
179 |
|
- |
public void reset() |
180 |
|
- |
{ |
|
155 |
+ |
public void reset() { |
181 |
156 |
|
checkRunMode( "reset" ); |
182 |
|
- |
for ( FormEngineMember member : members ) |
183 |
|
- |
{ |
|
157 |
+ |
for ( FormEngineMember member : members ) { |
184 |
158 |
|
member.reset(); |
185 |
159 |
|
} |
186 |
160 |
|
} |
187 |
161 |
|
|
188 |
162 |
|
@Override |
189 |
|
- |
public void revert() |
190 |
|
- |
{ |
|
163 |
+ |
public void revert() { |
191 |
164 |
|
checkRunMode( "revert" ); |
192 |
|
- |
for ( FormEngineMember member : members ) |
193 |
|
- |
{ |
|
165 |
+ |
for ( FormEngineMember member : members ) { |
194 |
166 |
|
member.revert(); |
195 |
167 |
|
} |
196 |
168 |
|
} |
197 |
169 |
|
|
198 |
170 |
|
@Override |
199 |
|
- |
public boolean isChanged() |
200 |
|
- |
{ |
|
171 |
+ |
public boolean isChanged() { |
201 |
172 |
|
checkRunMode( "isChanged" ); |
202 |
|
- |
if ( isEnabled() ) |
203 |
|
- |
{ |
204 |
|
- |
for ( FormEngineMember member : members ) |
205 |
|
- |
{ |
206 |
|
- |
if ( member.isEnabled() ) |
207 |
|
- |
{ |
208 |
|
- |
if ( member.isChanged() ) |
209 |
|
- |
{ |
|
173 |
+ |
if ( isEnabled() ) { |
|
174 |
+ |
for ( FormEngineMember member : members ) { |
|
175 |
+ |
if ( member.isEnabled() ) { |
|
176 |
+ |
if ( member.isChanged() ) { |
210 |
177 |
|
return true; |
211 |
178 |
|
} |
212 |
179 |
|
} |
|
@@ -216,21 +183,15 @@ |
216 |
183 |
|
} |
217 |
184 |
|
|
218 |
185 |
|
@Override |
219 |
|
- |
public Boolean isFocused() |
220 |
|
- |
{ |
|
186 |
+ |
public Boolean isFocused() { |
221 |
187 |
|
checkRunMode( "isFocused" ); |
222 |
188 |
|
boolean anyFalse = false; |
223 |
|
- |
if ( isEnabled() ) |
224 |
|
- |
{ |
225 |
|
- |
for ( FormEngineMember member : members ) |
226 |
|
- |
{ |
227 |
|
- |
if ( member.isEnabled() ) |
228 |
|
- |
{ |
|
189 |
+ |
if ( isEnabled() ) { |
|
190 |
+ |
for ( FormEngineMember member : members ) { |
|
191 |
+ |
if ( member.isEnabled() ) { |
229 |
192 |
|
Boolean focused = member.isFocused(); |
230 |
|
- |
if ( focused != null ) |
231 |
|
- |
{ |
232 |
|
- |
if ( focused ) |
233 |
|
- |
{ |
|
193 |
+ |
if ( focused != null ) { |
|
194 |
+ |
if ( focused ) { |
234 |
195 |
|
return true; |
235 |
196 |
|
} |
236 |
197 |
|
anyFalse = true; |
|
@@ -242,17 +203,12 @@ |
242 |
203 |
|
} |
243 |
204 |
|
|
244 |
205 |
|
@Override |
245 |
|
- |
public boolean isErrored() |
246 |
|
- |
{ |
|
206 |
+ |
public boolean isErrored() { |
247 |
207 |
|
checkRunMode( "isErrored" ); |
248 |
|
- |
if ( isEnabled() ) |
249 |
|
- |
{ |
250 |
|
- |
for ( FormEngineMember member : members ) |
251 |
|
- |
{ |
252 |
|
- |
if ( member.isEnabled() ) |
253 |
|
- |
{ |
254 |
|
- |
if ( member.isErrored() ) |
255 |
|
- |
{ |
|
208 |
+ |
if ( isEnabled() ) { |
|
209 |
+ |
for ( FormEngineMember member : members ) { |
|
210 |
+ |
if ( member.isEnabled() ) { |
|
211 |
+ |
if ( member.isErrored() ) { |
256 |
212 |
|
return true; |
257 |
213 |
|
} |
258 |
214 |
|
} |
|
@@ -262,16 +218,12 @@ |
262 |
218 |
|
} |
263 |
219 |
|
|
264 |
220 |
|
@Override |
265 |
|
- |
public boolean validate() |
266 |
|
- |
{ |
|
221 |
+ |
public boolean validate() { |
267 |
222 |
|
checkRunMode( "validate" ); |
268 |
223 |
|
boolean valid = true; |
269 |
|
- |
if ( isEnabled() ) |
270 |
|
- |
{ |
271 |
|
- |
for ( FormEngineMember member : members ) |
272 |
|
- |
{ |
273 |
|
- |
if ( member.isEnabled() ) |
274 |
|
- |
{ |
|
224 |
+ |
if ( isEnabled() ) { |
|
225 |
+ |
for ( FormEngineMember member : members ) { |
|
226 |
+ |
if ( member.isEnabled() ) { |
275 |
227 |
|
valid &= member.validate(); |
276 |
228 |
|
} |
277 |
229 |
|
} |
|
@@ -280,33 +232,25 @@ |
280 |
232 |
|
} |
281 |
233 |
|
|
282 |
234 |
|
@Override |
283 |
|
- |
public boolean setFocused() |
284 |
|
- |
{ |
|
235 |
+ |
public boolean setFocused() { |
285 |
236 |
|
checkRunMode( "setFocused" ); |
286 |
|
- |
if ( isEnabled() ) |
287 |
|
- |
{ |
|
237 |
+ |
if ( isEnabled() ) { |
288 |
238 |
|
// 1st - Members |
289 |
|
- |
for ( FormEngineMember member : members ) |
290 |
|
- |
{ |
291 |
|
- |
if ( member.isEnabled() ) |
292 |
|
- |
{ |
293 |
|
- |
if ( member.setFocused() ) |
294 |
|
- |
{ |
|
239 |
+ |
for ( FormEngineMember member : members ) { |
|
240 |
+ |
if ( member.isEnabled() ) { |
|
241 |
+ |
if ( member.setFocused() ) { |
295 |
242 |
|
return true; |
296 |
243 |
|
} |
297 |
244 |
|
} |
298 |
245 |
|
} |
299 |
246 |
|
// 2nd - Submit Button |
300 |
|
- |
if ( submitButton != null && submitButton.isEnabled() ) |
301 |
|
- |
{ |
|
247 |
+ |
if ( submitButton != null && submitButton.isEnabled() ) { |
302 |
248 |
|
submitButton.setFocus( true ); |
303 |
249 |
|
return true; |
304 |
250 |
|
} |
305 |
251 |
|
// 3rd - Managed Buttons |
306 |
|
- |
for ( ButtonBase button : managedButtons ) |
307 |
|
- |
{ |
308 |
|
- |
if ( button.isEnabled() ) |
309 |
|
- |
{ |
|
252 |
+ |
for ( ButtonBase button : managedButtons ) { |
|
253 |
+ |
if ( button.isEnabled() ) { |
310 |
254 |
|
button.setFocus( true ); |
311 |
255 |
|
return true; |
312 |
256 |
|
} |
|
@@ -316,90 +260,73 @@ |
316 |
260 |
|
} |
317 |
261 |
|
|
318 |
262 |
|
@Override |
319 |
|
- |
public E13nResolver getE13nResolver() |
320 |
|
- |
{ |
|
263 |
+ |
public E13nResolver getE13nResolver() { |
321 |
264 |
|
checkRunMode( "getE13nResolver" ); |
322 |
265 |
|
return resolver; |
323 |
266 |
|
} |
324 |
267 |
|
|
325 |
268 |
|
@Override |
326 |
|
- |
public NameToID addNamedWidgetsTo( NameToID nameToID ) |
327 |
|
- |
{ |
|
269 |
+ |
public NameToID addNamedWidgetsTo( NameToID nameToID ) { |
328 |
270 |
|
checkRunMode( "addNamedWidgetsTo" ); |
329 |
|
- |
for ( FormEngineMember member : members ) |
330 |
|
- |
{ |
|
271 |
+ |
for ( FormEngineMember member : members ) { |
331 |
272 |
|
member.addNamedWidgetsTo( nameToID ); |
332 |
273 |
|
} |
333 |
274 |
|
nameToID.tryAdd( submitButton ); |
334 |
|
- |
for ( ButtonBase button : managedButtons ) |
335 |
|
- |
{ |
|
275 |
+ |
for ( ButtonBase button : managedButtons ) { |
336 |
276 |
|
nameToID.tryAdd( button ); |
337 |
277 |
|
} |
338 |
278 |
|
return nameToID; |
339 |
279 |
|
} |
340 |
280 |
|
|
341 |
281 |
|
@Override |
342 |
|
- |
public void busyInteractingWithServer() |
343 |
|
- |
{ |
|
282 |
+ |
public void busyInteractingWithServer() { |
344 |
283 |
|
checkRunMode( "busyInteractingWithServer" ); |
345 |
284 |
|
serverInteractionHelper.snagStateAndDisable(); |
346 |
|
- |
for ( FormEngine subForm : subForms ) |
347 |
|
- |
{ |
|
285 |
+ |
for ( FormEngine subForm : subForms ) { |
348 |
286 |
|
subForm.busyInteractingWithServer(); |
349 |
287 |
|
} |
350 |
288 |
|
} |
351 |
289 |
|
|
352 |
290 |
|
@Override |
353 |
|
- |
public void doneInteractingWithServer() |
354 |
|
- |
{ |
|
291 |
+ |
public void doneInteractingWithServer() { |
355 |
292 |
|
checkRunMode( "doneInteractingWithServer" ); |
356 |
293 |
|
serverInteractionHelper.restoreState(); |
357 |
|
- |
for ( FormEngine subForm : subForms ) |
358 |
|
- |
{ |
|
294 |
+ |
for ( FormEngine subForm : subForms ) { |
359 |
295 |
|
subForm.doneInteractingWithServer(); |
360 |
296 |
|
} |
361 |
297 |
|
} |
362 |
298 |
|
|
363 |
|
- |
protected final void assertBuildMode( String method ) |
364 |
|
- |
{ |
365 |
|
- |
if ( isRunMode() ) |
366 |
|
- |
{ |
367 |
|
- |
throw new IllegalStateException( "Unable to process method '" + method + "' of FormEngine Named '" + name + "', because no longer in Build Mode (init has already been called)" ); |
|
299 |
+ |
protected final void assertBuildMode( String method ) { |
|
300 |
+ |
if ( isRunMode() ) { |
|
301 |
+ |
throw new IllegalStateException( "Unable to process method '" + method + "' of FormEngine Named '" + name + |
|
302 |
+ |
"', because no longer in Build Mode (init has already been called)" ); |
368 |
303 |
|
} |
369 |
304 |
|
} |
370 |
305 |
|
|
371 |
|
- |
protected final void checkRunMode( String method ) |
372 |
|
- |
{ |
373 |
|
- |
if ( !isRunMode() ) |
374 |
|
- |
{ |
375 |
|
- |
throw new IllegalStateException( "Unable to process method '" + method + "' of FormEngine Named '" + name + "', because not in Run Mode (init NOT called)" ); |
|
306 |
+ |
protected final void checkRunMode( String method ) { |
|
307 |
+ |
if ( !isRunMode() ) { |
|
308 |
+ |
throw new IllegalStateException( |
|
309 |
+ |
"Unable to process method '" + method + "' of FormEngine Named '" + name + "', because not in Run Mode (init NOT called)" ); |
376 |
310 |
|
} |
377 |
311 |
|
} |
378 |
312 |
|
|
379 |
|
- |
private void memberAdd( FormEngineMember member ) |
380 |
|
- |
{ |
381 |
|
- |
if ( member != null ) |
382 |
|
- |
{ |
|
313 |
+ |
private void memberAdd( FormEngineMember member ) { |
|
314 |
+ |
if ( member != null ) { |
383 |
315 |
|
members.add( member ); |
384 |
|
- |
if ( member instanceof FormEngine ) |
385 |
|
- |
{ |
|
316 |
+ |
if ( member instanceof FormEngine ) { |
386 |
317 |
|
subForms.add( (FormEngine) member ); |
387 |
318 |
|
} |
388 |
319 |
|
} |
389 |
320 |
|
} |
390 |
321 |
|
|
391 |
|
- |
private void managedAdd( ButtonBase managed ) |
392 |
|
- |
{ |
393 |
|
- |
if ( managed != null ) |
394 |
|
- |
{ |
|
322 |
+ |
private void managedAdd( ButtonBase managed ) { |
|
323 |
+ |
if ( managed != null ) { |
395 |
324 |
|
managedButtons.add( managed ); |
396 |
325 |
|
} |
397 |
326 |
|
} |
398 |
327 |
|
|
399 |
|
- |
private void buttonInit( ButtonBase button ) |
400 |
|
- |
{ |
401 |
|
- |
if ( button instanceof NamedTextButton ) |
402 |
|
- |
{ |
|
328 |
+ |
private void buttonInit( ButtonBase button ) { |
|
329 |
+ |
if ( button instanceof NamedTextButton ) { |
403 |
330 |
|
((NamedTextButton) button).init( resolver ); |
404 |
331 |
|
} |
405 |
332 |
|
} |