Subversion Repository Public Repository

litesoft

Diff Revisions 947 vs 948 for /trunk/GWT_Sandbox/FormEngine/src/com/temp/client/foundation/widget/input/fieldsupport/InputWidgetValidator.java

Diff revisions: vs.
  @@ -10,58 +10,57 @@
10 10
11 11 import java.util.*;
12 12
13 - public class InputWidgetValidator<T> implements InputWidgetValueAdapter<T>
14 - {
13 + public class InputWidgetValidator<T> implements InputWidgetValueAdapter<T> {
15 14 protected final NonDomHandlerManager<ChangeHandler> handlerManager;
16 15 protected final InputWidgetValueAdapter<T> delegate;
17 16 protected final List<ValueValidator<T>> validators = new ArrayList<ValueValidator<T>>();
18 17 protected E13nData errorData;
19 18
20 - public InputWidgetValidator(InputWidgetValueAdapter<T> delegate) {
21 - handlerManager = new NonDomHandlerManager<ChangeHandler>(this);
19 + public InputWidgetValidator( InputWidgetValueAdapter<T> delegate ) {
20 + handlerManager = new NonDomHandlerManager<ChangeHandler>( this );
22 21 this.delegate = delegate;
23 - delegate.addChangeHandler(new ChangeHandler() {
22 + delegate.addChangeHandler( new ChangeHandler() {
24 23 @Override
25 - public void onChange(ChangeEvent event) {
24 + public void onChange( ChangeEvent event ) {
26 25 validateWithErrorStateChangeNotification();
27 26 }
28 - });
27 + } );
29 28 }
30 29
31 - public InputWidgetValidator(InputWidgetValueAdapter<T> delegate, ValueValidator<T> validator1, ValueValidator<T>... additionalValidators) {
32 - this(delegate);
33 - add(validator1);
34 - if (additionalValidators != null) {
35 - for (ValueValidator<T> validator : additionalValidators) {
36 - add(validator);
30 + public InputWidgetValidator( InputWidgetValueAdapter<T> delegate, ValueValidator<T> validator1, ValueValidator<T>... additionalValidators ) {
31 + this( delegate );
32 + add( validator1 );
33 + if ( additionalValidators != null ) {
34 + for ( ValueValidator<T> validator : additionalValidators ) {
35 + add( validator );
37 36 }
38 37 }
39 - if (!validators.isEmpty()) {
38 + if ( !validators.isEmpty() ) {
40 39 validate();
41 40 }
42 41 }
43 42
44 - protected boolean add(ValueValidator<T> validator) {
45 - if (validator != null) {
46 - validators.add(validator);
43 + protected boolean add( ValueValidator<T> validator ) {
44 + if ( validator != null ) {
45 + validators.add( validator );
47 46 return true;
48 47 }
49 48 return false;
50 49 }
51 50
52 - public void addValidator(ValueValidator<T> validator) {
53 - if (add(validator)) {
51 + public void addValidator( ValueValidator<T> validator ) {
52 + if ( add( validator ) ) {
54 53 validateWithErrorStateChangeNotification();
55 54 }
56 55 }
57 56
58 - public void addValidators(ValueValidator<T>... additionalValidators) {
59 - if (additionalValidators != null) {
57 + public void addValidators( ValueValidator<T>... additionalValidators ) {
58 + if ( additionalValidators != null ) {
60 59 boolean anyAdded = false;
61 - for (ValueValidator<T> validator : additionalValidators) {
62 - anyAdded |= add(validator);
60 + for ( ValueValidator<T> validator : additionalValidators ) {
61 + anyAdded |= add( validator );
63 62 }
64 - if (anyAdded) {
63 + if ( anyAdded ) {
65 64 validateWithErrorStateChangeNotification();
66 65 }
67 66 }
  @@ -73,9 +72,9 @@
73 72 public E13nData validate() {
74 73 T value = getValue();
75 74 errorData = null;
76 - for (ValueValidator<T> validator : validators) {
77 - errorData = validator.checkValue(value);
78 - if (errorData != null) {
75 + for ( ValueValidator<T> validator : validators ) {
76 + errorData = validator.checkValue( value );
77 + if ( errorData != null ) {
79 78 break;
80 79 }
81 80 }
  @@ -89,13 +88,13 @@
89 88 return errorData;
90 89 }
91 90
92 - public HandlerRegistration addErrorStateChangeHandler(ChangeHandler handler) {
93 - return handler == null ? null : registerErrorStateChangeHandler(handler);
91 + public HandlerRegistration addErrorStateChangeHandler( ChangeHandler handler ) {
92 + return handler == null ? null : registerErrorStateChangeHandler( handler );
94 93 }
95 94
96 95 @Override
97 - public HandlerRegistration addChangeHandler(ChangeHandler handler) {
98 - return delegate.addChangeHandler(handler);
96 + public HandlerRegistration addChangeHandler( ChangeHandler handler ) {
97 + return delegate.addChangeHandler( handler );
99 98 }
100 99
101 100 @Override
  @@ -104,24 +103,24 @@
104 103 }
105 104
106 105 @Override
107 - public void setValue(T value) {
108 - delegate.setValue(value);
106 + public void setValue( T value ) {
107 + delegate.setValue( value );
109 108 validateWithErrorStateChangeNotification();
110 109 }
111 110
112 111 protected void validateWithErrorStateChangeNotification() {
113 112 boolean hadError = (null != getErrorData());
114 113 boolean hasError = (null != validate());
115 - if (hadError != hasError) {
114 + if ( hadError != hasError ) {
116 115 notifyErrorStateChangeHandlers();
117 116 }
118 117 }
119 118
120 119 protected void notifyErrorStateChangeHandlers() {
121 - handlerManager.fireEvent(new NonDomChangeEvent());
120 + handlerManager.fireEvent( new NonDomChangeEvent() );
122 121 }
123 122
124 - protected HandlerRegistration registerErrorStateChangeHandler(ChangeHandler handler) {
125 - return handlerManager.addHandler(handler);
123 + protected HandlerRegistration registerErrorStateChangeHandler( ChangeHandler handler ) {
124 + return handlerManager.addHandler( handler );
126 125 }
127 126 }