| |
@@ -1,18 +1,19 @@ |
| 1 |
1 |
|
// This Source Code is in the Public Domain per: http://litesoft.org/License.txt |
| 2 |
2 |
|
package org.litesoft.GWT.forms.client.components.factories.input; |
| 3 |
3 |
|
|
| |
4 |
+ |
import java.io.*; |
| 4 |
5 |
|
import java.util.*; |
| 5 |
6 |
|
|
| 6 |
|
- |
import com.google.gwt.user.client.ui.*; |
| 7 |
7 |
|
import org.litesoft.GWT.forms.client.components.factories.*; |
| 8 |
8 |
|
import org.litesoft.GWT.forms.client.components.impls.input.*; |
| 9 |
9 |
|
import org.litesoft.GWT.forms.client.nonpublic.*; |
| 10 |
10 |
|
import org.litesoft.core.simpletypes.*; |
| 11 |
|
- |
import org.litesoft.rpcpassable.*; |
| 12 |
11 |
|
import org.litesoft.ui.def.nonpublic.*; |
| 13 |
12 |
|
import org.litesoft.ui.def.nonpublic.support.*; |
| 14 |
13 |
|
import org.litesoft.uispecification.*; |
| 15 |
14 |
|
|
| |
15 |
+ |
import com.google.gwt.user.client.ui.*; |
| |
16 |
+ |
|
| 16 |
17 |
|
public class UiComboBoxWidgetFactory implements InputWidgetFactory |
| 17 |
18 |
|
{ |
| 18 |
19 |
|
public Widget create( FormInstanceComponentHandler pComponentHandler, // |
| |
@@ -39,7 +40,7 @@ |
| 39 |
40 |
|
private FormComboBox mFC; |
| 40 |
41 |
|
private SimpleKeyValuePair mOptionZero; |
| 41 |
42 |
|
private SimpleKeyValuePair[] mValidOptions; |
| 42 |
|
- |
private List<RPCpassable> mNewValidOptions = new ArrayList<RPCpassable>(); |
| |
43 |
+ |
private List<Serializable> mNewValidOptions = new ArrayList<Serializable>(); |
| 43 |
44 |
|
private boolean mHasFocus = false; |
| 44 |
45 |
|
|
| 45 |
46 |
|
public MyFormAdapter( FormInstanceComponentHandler pComponentHandler, // |
| |
@@ -51,7 +52,7 @@ |
| 51 |
52 |
|
mFC.addItems( mValidOptions = pMD.getValidOptions() ); |
| 52 |
53 |
|
} |
| 53 |
54 |
|
|
| 54 |
|
- |
public void updateValidOptions( RPCpassable[] pValidOptions ) |
| |
55 |
+ |
public void updateValidOptions( Serializable[] pValidOptions ) |
| 55 |
56 |
|
{ |
| 56 |
57 |
|
convertOptions( pValidOptions ); |
| 57 |
58 |
|
if ( !mHasFocus || mFC.areOptionsAlwaysUpdatable() ) |
| |
@@ -60,12 +61,12 @@ |
| 60 |
61 |
|
} |
| 61 |
62 |
|
} |
| 62 |
63 |
|
|
| 63 |
|
- |
private void convertOptions( RPCpassable[] pValidOptions ) |
| |
64 |
+ |
private void convertOptions( Serializable[] pValidOptions ) |
| 64 |
65 |
|
{ |
| 65 |
66 |
|
mNewValidOptions.clear(); |
| 66 |
67 |
|
if ( pValidOptions != null ) |
| 67 |
68 |
|
{ |
| 68 |
|
- |
for ( RPCpassable zValidOption : pValidOptions ) |
| |
69 |
+ |
for ( Serializable zValidOption : pValidOptions ) |
| 69 |
70 |
|
{ |
| 70 |
71 |
|
SimpleKeyValuePair option = convertOption( zValidOption ); |
| 71 |
72 |
|
if ( option != null ) |
| |
@@ -120,12 +121,12 @@ |
| 120 |
121 |
|
super.setComponentCurrentValue( pCurrentValue ); |
| 121 |
122 |
|
} |
| 122 |
123 |
|
|
| 123 |
|
- |
protected RPCpassable convertComponentValueToSendable( Object pValue ) |
| |
124 |
+ |
protected Serializable convertComponentValueToSendable( Object pValue ) |
| 124 |
125 |
|
{ |
| 125 |
|
- |
return !areEqual( pValue, mOptionZero ) ? (RPCpassable) pValue : null; |
| |
126 |
+ |
return !areEqual( pValue, mOptionZero ) ? (Serializable) pValue : null; |
| 126 |
127 |
|
} |
| 127 |
128 |
|
|
| 128 |
|
- |
protected Object convertSendableToComponentValue( RPCpassable pValue ) |
| |
129 |
+ |
protected Object convertSendableToComponentValue( Serializable pValue ) |
| 129 |
130 |
|
{ |
| 130 |
131 |
|
return convertOption( pValue ); |
| 131 |
132 |
|
} |
| |
@@ -161,7 +162,7 @@ |
| 161 |
162 |
|
super.blurOccurred(); |
| 162 |
163 |
|
} |
| 163 |
164 |
|
|
| 164 |
|
- |
private SimpleKeyValuePair convertOption( RPCpassable pValue ) |
| |
165 |
+ |
private SimpleKeyValuePair convertOption( Serializable pValue ) |
| 165 |
166 |
|
{ |
| 166 |
167 |
|
if ( pValue == null ) |
| 167 |
168 |
|
{ |
View this file contents
View the full history
Commits for