You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/04/21 23:15:42 UTC
svn commit: r936518 - in /pivot/trunk:
tutorials/src/org/apache/pivot/tutorials/databinding/ tutorials/www/
wtk/src/org/apache/pivot/wtk/
Author: gbrown
Date: Wed Apr 21 21:15:41 2010
New Revision: 936518
URL: http://svn.apache.org/viewvc?rev=936518&view=rev
Log:
Resolve issue PIVOT-466.
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
pivot/trunk/tutorials/www/data-binding.xml
pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java Wed Apr 21 21:15:41 2010
@@ -65,14 +65,13 @@ public class DataBinding implements Appl
});
loadJSONButton.getButtonPressListeners().add(new ButtonPressListener() {
- @SuppressWarnings("unchecked")
@Override
public void buttonPressed(Button button) {
JSONSerializer serializer = new JSONSerializer();
InputStream inputStream = getClass().getResourceAsStream("contact.json");
try {
- form.load((Map<String, Object>)serializer.readObject(inputStream));
+ form.load(serializer.readObject(inputStream));
sourceLabel.setText("JSON");
} catch(Exception exception) {
System.err.println(exception);
Modified: pivot/trunk/tutorials/www/data-binding.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/www/data-binding.xml?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/tutorials/www/data-binding.xml (original)
+++ pivot/trunk/tutorials/www/data-binding.xml Wed Apr 21 21:15:41 2010
@@ -26,11 +26,12 @@ limitations under the License.
Data binding refers to the process of automatically populating or extracting data from
a set of user interface elements. In Pivot, data binding is driven primarily by two
methods of the <tt>Component</tt> class: <tt>load()</tt> and <tt>store()</tt>. Each
- method takes an instance of <tt>Dictionary<String, ?></tt> called the "context".
- Calling <tt>load()</tt> causes data from the context to be "loaded" into the component;
- calling <tt>store()</tt> performs the reverse operation and "stores" data from the
- component into the context. A third method, <tt>clear()</tt> allows a caller to reset
- any bindings.
+ method takes an <tt>Object</tt> argument called the "context". The context is either an
+ instance of a Java bean class or an instance of
+ <tt>org.apache.pivot.collections.Dictionary</tt>. Calling <tt>load()</tt> causes data
+ from the context to be "loaded" into the component; calling <tt>store()</tt> performs
+ the reverse operation and "stores" data from the component into the context. A third
+ method, <tt>clear()</tt> allows a caller to reset any bindings.
</p>
<p>
@@ -185,14 +186,13 @@ limitations under the License.
});
loadJSONButton.getButtonPressListeners().add(new ButtonPressListener() {
- @SuppressWarnings("unchecked")
@Override
public void buttonPressed(Button button) {
JSONSerializer serializer = new JSONSerializer();
InputStream inputStream = getClass().getResourceAsStream("contact.json");
try {
- form.load((Map<String, Object>)serializer.readObject(inputStream));
+ form.load(serializer.readObject(inputStream));
sourceLabel.setText("JSON");
} catch(Exception exception) {
System.err.println(exception);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java Wed Apr 21 21:15:41 2010
@@ -16,7 +16,6 @@
*/
package org.apache.pivot.wtk;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.ListenerList;
@@ -73,7 +72,7 @@ public abstract class Button extends Com
public interface SelectedBindMapping {
/**
* Converts a context value to a selection state during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -81,7 +80,7 @@ public abstract class Button extends Com
/**
* Converts a selection state to a context value during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param selected
*/
@@ -94,7 +93,7 @@ public abstract class Button extends Com
public interface StateBindMapping {
/**
* Converts a context value to a button state during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -102,7 +101,7 @@ public abstract class Button extends Com
/**
* Converts a button state to a context value during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param state
*/
@@ -643,7 +642,7 @@ public abstract class Button extends Com
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (toggleButton) {
if (triState) {
// Bind using state key
@@ -690,7 +689,7 @@ public abstract class Button extends Com
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (toggleButton) {
if (triState) {
// Bind using state key
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java Wed Apr 21 21:15:41 2010
@@ -376,7 +376,7 @@ public class Calendar extends Container
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (selectedDateKey != null
&& JSON.containsKey(context, selectedDateKey)
&& selectedDateBindType != BindType.STORE) {
@@ -399,7 +399,7 @@ public class Calendar extends Container
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (selectedDateKey != null
&& selectedDateBindType != BindType.LOAD) {
JSON.put(context, selectedDateKey, (selectedDateBindMapping == null) ?
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Wed Apr 21 21:15:41 2010
@@ -323,7 +323,7 @@ public class CalendarButton extends Butt
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (selectedDateKey != null
&& JSON.containsKey(context, selectedDateKey)
&& selectedDateBindType != BindType.STORE) {
@@ -346,7 +346,7 @@ public class CalendarButton extends Butt
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (selectedDateKey != null
&& selectedDateBindType != BindType.LOAD) {
JSON.put(context, selectedDateKey, (selectedDateBindMapping == null) ?
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java Wed Apr 21 21:15:41 2010
@@ -18,7 +18,6 @@ package org.apache.pivot.wtk;
import java.awt.Color;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.ListenerList;
@@ -209,7 +208,7 @@ public class ColorChooser extends Contai
* chooser's bind key, if one is set.
*/
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (selectedColorKey != null
&& JSON.containsKey(context, selectedColorKey)
&& selectedColorBindType != BindType.STORE) {
@@ -236,7 +235,7 @@ public class ColorChooser extends Contai
* chooser's bind key, if one is set.
*/
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (selectedColorKey != null
&& selectedColorBindType != BindType.LOAD) {
JSON.put(context, selectedColorKey, (selectedColorBindMapping == null) ?
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java Wed Apr 21 21:15:41 2010
@@ -18,7 +18,6 @@ package org.apache.pivot.wtk;
import java.awt.Color;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.wtk.content.ListButtonColorItemRenderer;
@@ -218,7 +217,7 @@ public class ColorChooserButton extends
* picker button's bind key, if one is set.
*/
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (selectedColorKey != null
&& JSON.containsKey(context, selectedColorKey)
&& selectedColorBindType != BindType.STORE) {
@@ -245,7 +244,7 @@ public class ColorChooserButton extends
* picker button's bind key, if one is set.
*/
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (selectedColorKey != null
&& selectedColorBindType != BindType.LOAD) {
JSON.put(context, selectedColorKey, (selectedColorBindMapping == null) ?
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Wed Apr 21 21:15:41 2010
@@ -2353,7 +2353,7 @@ public abstract class Component implemen
*
* @param context
*/
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
}
/**
@@ -2363,7 +2363,7 @@ public abstract class Component implemen
*
* @param context
*/
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java Wed Apr 21 21:15:41 2010
@@ -21,7 +21,6 @@ import java.awt.Rectangle;
import java.util.Iterator;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.ImmutableIterator;
import org.apache.pivot.util.ListenerList;
@@ -580,7 +579,7 @@ public abstract class Container extends
* @param context
*/
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
for (Component component : components) {
component.load(context);
}
@@ -592,7 +591,7 @@ public abstract class Container extends
* @param context
*/
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
for (Component component : components) {
component.store(context);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java Wed Apr 21 21:15:41 2010
@@ -20,7 +20,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.ListenerList;
@@ -255,7 +254,7 @@ public class ImageView extends Component
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (imageKey != null
&& JSON.containsKey(context, imageKey)) {
Object value = JSON.get(context, imageKey);
@@ -273,7 +272,7 @@ public class ImageView extends Component
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (isEnabled()
&& imageKey != null) {
JSON.put(context, imageKey, getImage());
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java Wed Apr 21 21:15:41 2010
@@ -16,7 +16,6 @@
*/
package org.apache.pivot.wtk;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.ListenerList;
@@ -30,7 +29,7 @@ public class Label extends Component {
public interface TextBindMapping {
/**
* Converts a value from the bind context to a text representation during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -38,7 +37,7 @@ public class Label extends Component {
/**
* Converts a text string to a value to be stored in the bind context during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param text
*/
@@ -174,7 +173,7 @@ public class Label extends Component {
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (textKey != null
&& JSON.containsKey(context, textKey)
&& textBindType != BindType.STORE) {
@@ -193,7 +192,7 @@ public class Label extends Component {
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (textKey != null
&& textBindType != BindType.LOAD) {
String text = getText();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Wed Apr 21 21:15:41 2010
@@ -17,7 +17,6 @@
package org.apache.pivot.wtk;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.json.JSON;
import org.apache.pivot.json.JSONSerializer;
@@ -484,7 +483,7 @@ public class ListButton extends Button {
@Override
@SuppressWarnings("unchecked")
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
// Bind to list data
if (listDataKey != null
&& listDataBindType != BindType.STORE
@@ -519,7 +518,7 @@ public class ListButton extends Button {
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
// Bind to list data
if (listDataKey != null
&& listDataBindType != BindType.LOAD) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Wed Apr 21 21:15:41 2010
@@ -21,7 +21,6 @@ import java.net.URL;
import java.util.Comparator;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.ListListener;
import org.apache.pivot.collections.Map;
@@ -367,7 +366,7 @@ public class ListView extends Component
public interface ListDataBindMapping {
/**
* Converts a context value to list data during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -375,7 +374,7 @@ public class ListView extends Component
/**
* Converts list data to a context value during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param listData
*/
@@ -388,7 +387,7 @@ public class ListView extends Component
public interface ItemBindMapping {
/**
* Returns the index of the item in the source list during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param listData
* The source list data.
@@ -404,7 +403,7 @@ public class ListView extends Component
/**
* Retrieves the value at the given index during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param listData
* The source list data.
@@ -1746,7 +1745,7 @@ public class ListView extends Component
@Override
@SuppressWarnings("unchecked")
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
// Bind to list data
if (listDataKey != null
&& listDataBindType != BindType.STORE
@@ -1840,7 +1839,7 @@ public class ListView extends Component
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
// Bind to list data
if (listDataKey != null
&& listDataBindType != BindType.LOAD) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java Wed Apr 21 21:15:41 2010
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk;
import java.util.Comparator;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.ListListener;
import org.apache.pivot.collections.Sequence;
@@ -70,7 +69,7 @@ public class Spinner extends Container {
public interface SpinnerDataBindMapping {
/**
* Converts a context value to spinner data during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -78,7 +77,7 @@ public class Spinner extends Container {
/**
* Converts spinner data to a context value during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param spinnerData
*/
@@ -99,7 +98,7 @@ public class Spinner extends Container {
public interface ItemBindMapping {
/**
* Returns the index of the item in the source list during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param spinnerData
* The source spinner data.
@@ -115,7 +114,7 @@ public class Spinner extends Container {
/**
* Retrieves the item at the given index during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param spinnerData
* The source spinner data.
@@ -580,7 +579,7 @@ public class Spinner extends Container {
@Override
@SuppressWarnings("unchecked")
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
// Bind to spinner data
if (spinnerDataKey != null
&& spinnerDataBindType != BindType.STORE
@@ -615,7 +614,7 @@ public class Spinner extends Container {
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
// Bind to spinner data
if (spinnerDataKey != null
&& spinnerDataBindType != BindType.LOAD) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Wed Apr 21 21:15:41 2010
@@ -2236,7 +2236,7 @@ public class TableView extends Component
@Override
@SuppressWarnings("unchecked")
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
// Bind to list data
if (tableDataKey != null
&& tableDataBindType != BindType.STORE
@@ -2305,7 +2305,7 @@ public class TableView extends Component
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
// Bind to table data
if (tableDataKey != null
&& tableDataBindType != BindType.LOAD) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Wed Apr 21 21:15:41 2010
@@ -22,7 +22,6 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.net.URL;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.json.JSON;
import org.apache.pivot.serialization.SerializationException;
@@ -105,7 +104,7 @@ public class TextArea extends Component
public interface TextBindMapping {
/**
* Converts a value from the bind context to a text representation during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -113,7 +112,7 @@ public class TextArea extends Component
/**
* Converts a text string to a value to be stored in the bind context during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param text
*/
@@ -861,7 +860,7 @@ public class TextArea extends Component
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (textKey != null
&& JSON.containsKey(context, textKey)
&& textBindType != BindType.STORE) {
@@ -878,7 +877,7 @@ public class TextArea extends Component
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (textKey != null
&& textBindType != BindType.LOAD) {
String text = getText();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=936518&r1=936517&r2=936518&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Wed Apr 21 21:15:41 2010
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk;
import java.awt.Toolkit;
import java.io.IOException;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.wtk.text.Element;
@@ -65,7 +64,7 @@ public class TextInput extends Component
public interface TextBindMapping {
/**
* Converts a value from the bind context to a text representation during a
- * {@link Component#load(Dictionary)} operation.
+ * {@link Component#load(Object)} operation.
*
* @param value
*/
@@ -73,7 +72,7 @@ public class TextInput extends Component
/**
* Converts a text string to a value to be stored in the bind context during a
- * {@link Component#store(Dictionary)} operation.
+ * {@link Component#store(Object)} operation.
*
* @param text
*/
@@ -798,7 +797,7 @@ public class TextInput extends Component
}
@Override
- public void load(Dictionary<String, ?> context) {
+ public void load(Object context) {
if (textKey != null
&& JSON.containsKey(context, textKey)
&& textBindType != BindType.STORE) {
@@ -815,7 +814,7 @@ public class TextInput extends Component
}
@Override
- public void store(Dictionary<String, ?> context) {
+ public void store(Object context) {
if (textKey != null
&& textBindType != BindType.LOAD) {
String text = getText();