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 2009/03/19 17:49:20 UTC
svn commit: r756083 - in /incubator/pivot/trunk/wtk/src/pivot/wtk:
Button.java Calendar.java CalendarButton.java Component.java Container.java
Label.java ListButton.java ListView.java Spinner.java TextArea.java
TextInput.java
Author: gbrown
Date: Thu Mar 19 16:49:18 2009
New Revision: 756083
URL: http://svn.apache.org/viewvc?rev=756083&view=rev
Log:
Use Dictionary<String, ?> in Component load() and store() methods instead of Dictionary<String, Object>.
Modified:
incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Calendar.java
incubator/pivot/trunk/wtk/src/pivot/wtk/CalendarButton.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Component.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Label.java
incubator/pivot/trunk/wtk/src/pivot/wtk/ListButton.java
incubator/pivot/trunk/wtk/src/pivot/wtk/ListView.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Spinner.java
incubator/pivot/trunk/wtk/src/pivot/wtk/TextArea.java
incubator/pivot/trunk/wtk/src/pivot/wtk/TextInput.java
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Button.java Thu Mar 19 16:49:18 2009
@@ -553,7 +553,7 @@
}
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (selectedKey != null
&& context.containsKey(selectedKey)) {
Object value = context.get(selectedKey);
@@ -583,13 +583,14 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (selectedKey != null) {
- context.put(selectedKey, isSelected());
+ ((Dictionary<String, Boolean>)context).put(selectedKey, isSelected());
}
if (stateKey != null) {
- context.put(stateKey, state);
+ ((Dictionary<String, State>)context).put(stateKey, state);
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Calendar.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Calendar.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Calendar.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Calendar.java Thu Mar 19 16:49:18 2009
@@ -286,7 +286,7 @@
* picker's bind key, if one is set.
*/
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (selectedDateKey != null
&& context.containsKey(selectedDateKey)) {
Object value = context.get(selectedDateKey);
@@ -307,9 +307,10 @@
* picker's bind key, if one is set.
*/
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (selectedDateKey != null) {
- context.put(selectedDateKey, selectedDate);
+ ((Dictionary<String, CalendarDate>)context).put(selectedDateKey, selectedDate);
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/CalendarButton.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/CalendarButton.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/CalendarButton.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/CalendarButton.java Thu Mar 19 16:49:18 2009
@@ -248,7 +248,7 @@
* picker button's bind key, if one is set.
*/
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
String selectedDateKey = getSelectedDateKey();
if (selectedDateKey != null
@@ -271,11 +271,12 @@
* picker button's bind key, if one is set.
*/
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
String selectedDateKey = getSelectedDateKey();
if (selectedDateKey != null) {
- context.put(selectedDateKey, getSelectedDate());
+ ((Dictionary<String, CalendarDate>)context).put(selectedDateKey, getSelectedDate());
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Component.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Component.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Component.java Thu Mar 19 16:49:18 2009
@@ -1977,7 +1977,7 @@
*
* @param context
*/
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
}
/**
@@ -1987,7 +1987,7 @@
*
* @param context
*/
- public void store(Dictionary<String, Object> context) {
+ public void store(Dictionary<String, ?> context) {
}
public DragSource getDragSource() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Container.java Thu Mar 19 16:49:18 2009
@@ -495,7 +495,7 @@
* @param context
*/
@SuppressWarnings("unchecked")
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (contextKey != null
&& context.containsKey(contextKey)) {
Object value = context.get(contextKey);
@@ -528,7 +528,7 @@
* @param context
*/
@SuppressWarnings("unchecked")
- public void store(Dictionary<String, Object> context) {
+ public void store(Dictionary<String, ?> context) {
if (contextKey != null) {
// Bound value is expected to be a sub-context
Object value = context.get(contextKey);
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Label.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Label.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Label.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Label.java Thu Mar 19 16:49:18 2009
@@ -92,7 +92,7 @@
}
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (textKey != null
&& context.containsKey(textKey)) {
Object value = context.get(textKey);
@@ -105,9 +105,10 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (textKey != null) {
- context.put(textKey, getText());
+ ((Dictionary<String, String>)context).put(textKey, getText());
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/ListButton.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/ListButton.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/ListButton.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/ListButton.java Thu Mar 19 16:49:18 2009
@@ -270,7 +270,7 @@
}
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (selectedItemKey != null
&& context.containsKey(selectedItemKey)) {
Object item = context.get(selectedItemKey);
@@ -279,10 +279,11 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (selectedItemKey != null) {
Object item = getSelectedItem();
- context.put(selectedItemKey, item);
+ ((Dictionary<String, Object>)context).put(selectedItemKey, item);
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/ListView.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/ListView.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/ListView.java Thu Mar 19 16:49:18 2009
@@ -1006,7 +1006,7 @@
@Override
@SuppressWarnings("unchecked")
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (selectedItemKey != null
&& context.containsKey(selectedItemKey)) {
Object item = context.get(selectedItemKey);
@@ -1021,15 +1021,16 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (selectedItemKey != null) {
Object item = getSelectedItem();
- context.put(selectedItemKey, item);
+ ((Dictionary<String, Object>)context).put(selectedItemKey, item);
}
if (selectedItemsKey != null) {
Sequence<Object> items = getSelectedItems();
- context.put(selectedItemsKey, items);
+ ((Dictionary<String, Sequence<Object>>)context).put(selectedItemsKey, items);
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Spinner.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Spinner.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Spinner.java Thu Mar 19 16:49:18 2009
@@ -390,7 +390,7 @@
}
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (selectedItemKey != null
&& context.containsKey(selectedItemKey)) {
Object item = context.get(selectedItemKey);
@@ -399,10 +399,11 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (selectedItemKey != null) {
Object item = getSelectedItem();
- context.put(selectedItemKey, item);
+ ((Dictionary<String, Object>)context).put(selectedItemKey, item);
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/TextArea.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/TextArea.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/TextArea.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/TextArea.java Thu Mar 19 16:49:18 2009
@@ -160,6 +160,7 @@
public TextArea() {
installSkin(TextArea.class);
+ setText("");
}
@Override
@@ -295,7 +296,7 @@
}
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (textKey != null
&& context.containsKey(textKey)) {
Object value = context.get(textKey);
@@ -308,9 +309,10 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (textKey != null) {
- context.put(textKey, getText());
+ ((Dictionary<String, String>)context).put(textKey, getText());
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/TextInput.java?rev=756083&r1=756082&r2=756083&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/TextInput.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/TextInput.java Thu Mar 19 16:49:18 2009
@@ -583,7 +583,7 @@
}
@Override
- public void load(Dictionary<String, Object> context) {
+ public void load(Dictionary<String, ?> context) {
if (textKey != null
&& context.containsKey(textKey)) {
Object value = context.get(textKey);
@@ -596,9 +596,10 @@
}
@Override
- public void store(Dictionary<String, Object> context) {
+ @SuppressWarnings("unchecked")
+ public void store(Dictionary<String, ?> context) {
if (textKey != null) {
- context.put(textKey, getText());
+ ((Dictionary<String, String>)context).put(textKey, getText());
}
}