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/02/28 16:00:35 UTC
svn commit: r917188 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/skin/
Author: gbrown
Date: Sun Feb 28 15:00:35 2010
New Revision: 917188
URL: http://svn.apache.org/viewvc?rev=917188&view=rev
Log:
Add modifiers to bind mapping interface and property names to clarify intent.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonListener.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/CalendarButtonListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/LabelListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SpinnerListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Sun Feb 28 15:00:35 2010
@@ -1075,7 +1075,7 @@
}
@Override
- public void bindMappingChanged(ListView listView, ListView.BindMapping previousBindMapping) {
+ public void selectedItemBindMappingChanged(ListView listView, ListView.SelectedItemBindMapping previousSelectedItemBindMapping) {
// No-op
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java Sun Feb 28 15:00:35 2010
@@ -861,7 +861,7 @@
}
@Override
- public void bindMappingChanged(Spinner spinner, Spinner.BindMapping previousBindMapping) {
+ public void selectedItemBindMappingChanged(Spinner spinner, Spinner.SelectedItemBindMapping previousSelectedItemBindMapping) {
// No-op
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Sun Feb 28 15:00:35 2010
@@ -1357,7 +1357,7 @@
}
@Override
- public void bindMappingChanged(TextInput textInput, TextInput.BindMapping previousBindMapping) {
+ public void textBindMappingChanged(TextInput textInput, TextInput.TextBindMapping previousTextBindMapping) {
// No-op
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Sun Feb 28 15:00:35 2010
@@ -60,11 +60,6 @@
/**
* Base class for application contexts.
- * <p>
- * TODO Fire events when entries are added to/removed from the cache?
- * <p>
- * TODO Provide a means of mapping common "actions" to keystrokes (e.g. "copy"
- * to Control-C or Command-C)
*/
public abstract class ApplicationContext {
/**
@@ -91,7 +86,6 @@
private Random random = null;
-
private transient DropTargetListener dropTargetListener = new DropTargetListener() {
@Override
public void dragEnter(DropTargetDragEvent event) {
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java Sun Feb 28 15:00:35 2010
@@ -70,7 +70,7 @@
/**
* Translates between selection state and context data during data binding.
*/
- public interface BindMapping {
+ public interface StateBindMapping {
/**
* Converts a context value to a button state.
*
@@ -148,9 +148,9 @@
}
@Override
- public void bindMappingChanged(Button button, Button.BindMapping previousBindMapping) {
+ public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
for (ButtonListener listener : this) {
- listener.bindMappingChanged(button, previousBindMapping);
+ listener.stateBindMappingChanged(button, previousStateBindMapping);
}
}
}
@@ -200,7 +200,7 @@
private String selectedKey = null;
private String stateKey = null;
- private BindMapping bindMapping = null;
+ private StateBindMapping stateBindMapping = null;
private ButtonListenerList buttonListeners = new ButtonListenerList();
private ButtonStateListenerList buttonStateListeners = new ButtonStateListenerList();
@@ -522,16 +522,16 @@
}
}
- public BindMapping getBindMapping() {
- return bindMapping;
+ public StateBindMapping getStateBindMapping() {
+ return stateBindMapping;
}
- public void setBindMapping(BindMapping bindMapping) {
- BindMapping previousBindMapping = this.bindMapping;
+ public void setStateBindMapping(StateBindMapping stateBindMapping) {
+ StateBindMapping previousStateBindMapping = this.stateBindMapping;
- if (previousBindMapping != bindMapping) {
- this.bindMapping = bindMapping;
- buttonListeners.bindMappingChanged(this, previousBindMapping);
+ if (previousStateBindMapping != stateBindMapping) {
+ this.stateBindMapping = stateBindMapping;
+ buttonListeners.stateBindMappingChanged(this, previousStateBindMapping);
}
}
@@ -544,12 +544,12 @@
Boolean selected = false;
if (value instanceof Boolean) {
selected = (Boolean)value;
- } else if (bindMapping == null) {
+ } else if (stateBindMapping == null) {
if (value != null) {
selected = Boolean.valueOf(value.toString());
}
} else {
- State state = bindMapping.toState(value);
+ State state = stateBindMapping.toState(value);
selected = (state == State.SELECTED);
}
@@ -563,12 +563,12 @@
State state = State.UNSELECTED;
if (value instanceof State) {
state = (State)value;
- } else if (bindMapping == null) {
+ } else if (stateBindMapping == null) {
if (value != null) {
state = State.valueOf(value.toString().toUpperCase());
}
} else {
- state = bindMapping.toState(value);
+ state = stateBindMapping.toState(value);
}
setState(state);
@@ -579,13 +579,13 @@
public void store(Dictionary<String, ?> context) {
if (isEnabled()) {
if (selectedKey != null) {
- JSONSerializer.put(context, selectedKey, (bindMapping == null) ?
- isSelected() : bindMapping.valueOf(state));
+ JSONSerializer.put(context, selectedKey, (stateBindMapping == null) ?
+ isSelected() : stateBindMapping.valueOf(state));
}
if (stateKey != null) {
- JSONSerializer.put(context, stateKey, (bindMapping == null) ?
- state : bindMapping.valueOf(state));
+ JSONSerializer.put(context, stateKey, (stateBindMapping == null) ?
+ state : stateBindMapping.valueOf(state));
}
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonListener.java Sun Feb 28 15:00:35 2010
@@ -57,7 +57,7 @@
}
@Override
- public void bindMappingChanged(Button button, Button.BindMapping previousBindMapping) {
+ public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
}
}
@@ -127,7 +127,7 @@
* Called when a button's bind mapping has changed.
*
* @param button
- * @param previousBindMapping
+ * @param previousStateBindMapping
*/
- public void bindMappingChanged(Button button, Button.BindMapping previousBindMapping);
+ public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping);
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java Sun Feb 28 15:00:35 2010
@@ -32,7 +32,7 @@
/**
* Translates between calendar date and context data during data binding.
*/
- public interface BindMapping {
+ public interface SelectedDateBindMapping {
/**
* Converts a context value to a calendar date.
*
@@ -90,9 +90,9 @@
}
@Override
- public void bindMappingChanged(Calendar calendar, BindMapping previousBindMapping) {
+ public void selectedDateBindMappingChanged(Calendar calendar, SelectedDateBindMapping previousSelectedDateBindMapping) {
for (CalendarListener listener : this) {
- listener.bindMappingChanged(calendar, previousBindMapping);
+ listener.selectedDateBindMappingChanged(calendar, previousSelectedDateBindMapping);
}
}
}
@@ -120,7 +120,7 @@
private Locale locale = Locale.getDefault();
private Filter<CalendarDate> disabledDateFilter = null;
private String selectedDateKey = null;
- private BindMapping bindMapping = null;
+ private SelectedDateBindMapping selectedDateBindMapping = null;
private CalendarListenerList calendarListeners = new CalendarListenerList();
private CalendarSelectionListenerList calendarSelectionListeners =
@@ -330,16 +330,16 @@
}
}
- public BindMapping getBindMapping() {
- return bindMapping;
+ public SelectedDateBindMapping getSelectedDateBindMapping() {
+ return selectedDateBindMapping;
}
- public void setBindMapping(BindMapping bindMapping) {
- BindMapping previousBindMapping = this.bindMapping;
+ public void setSelectedDateBindMapping(SelectedDateBindMapping selectedDateBindMapping) {
+ SelectedDateBindMapping previousSelectedDateBindMapping = this.selectedDateBindMapping;
- if (previousBindMapping != bindMapping) {
- this.bindMapping = bindMapping;
- calendarListeners.bindMappingChanged(this, previousBindMapping);
+ if (previousSelectedDateBindMapping != selectedDateBindMapping) {
+ this.selectedDateBindMapping = selectedDateBindMapping;
+ calendarListeners.selectedDateBindMappingChanged(this, previousSelectedDateBindMapping);
}
}
@@ -357,12 +357,12 @@
if (value instanceof CalendarDate) {
selectedDate = (CalendarDate)value;
- } else if (bindMapping == null) {
+ } else if (selectedDateBindMapping == null) {
if (value != null) {
selectedDate = CalendarDate.decode(value.toString());
}
} else {
- selectedDate = bindMapping.toDate(value);
+ selectedDate = selectedDateBindMapping.toDate(value);
}
setSelectedDate(selectedDate);
@@ -377,8 +377,8 @@
public void store(Dictionary<String, ?> context) {
if (isEnabled()
&& selectedDateKey != null) {
- JSONSerializer.put(context, selectedDateKey, (bindMapping == null) ?
- selectedDate : bindMapping.valueOf(selectedDate));
+ JSONSerializer.put(context, selectedDateKey, (selectedDateBindMapping == null) ?
+ selectedDate : selectedDateBindMapping.valueOf(selectedDate));
}
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Sun Feb 28 15:00:35 2010
@@ -61,10 +61,10 @@
}
@Override
- public void selectionBindMappingChanged(CalendarButton calendarButton,
- Calendar.BindMapping previousSelectionBindMapping) {
+ public void selectedDateBindMappingChanged(CalendarButton calendarButton,
+ Calendar.SelectedDateBindMapping previousSelectedDateBindMapping) {
for (CalendarButtonListener listener : this) {
- listener.selectionBindMappingChanged(calendarButton, previousSelectionBindMapping);
+ listener.selectedDateBindMappingChanged(calendarButton, previousSelectedDateBindMapping);
}
}
}
@@ -89,7 +89,7 @@
private Locale locale = Locale.getDefault();
private Filter<CalendarDate> disabledDateFilter = null;
private String selectedDateKey = null;
- private Calendar.BindMapping selectionBindMapping = null;
+ private Calendar.SelectedDateBindMapping selectedDateBindMapping = null;
private CalendarButtonListenerList calendarButtonListeners =
new CalendarButtonListenerList();
@@ -274,16 +274,16 @@
}
}
- public Calendar.BindMapping getSelectionBindMapping() {
- return selectionBindMapping;
+ public Calendar.SelectedDateBindMapping getSelectedDateBindMapping() {
+ return selectedDateBindMapping;
}
- public void setSelectionBindMapping(Calendar.BindMapping bindMapping) {
- Calendar.BindMapping previousSelectionBindMapping = this.selectionBindMapping;
+ public void setSelectedDateBindMapping(Calendar.SelectedDateBindMapping bindMapping) {
+ Calendar.SelectedDateBindMapping previousSelectedDateBindMapping = this.selectedDateBindMapping;
- if (previousSelectionBindMapping != bindMapping) {
- this.selectionBindMapping = bindMapping;
- calendarButtonListeners.selectionBindMappingChanged(this, previousSelectionBindMapping);
+ if (previousSelectedDateBindMapping != bindMapping) {
+ this.selectedDateBindMapping = bindMapping;
+ calendarButtonListeners.selectedDateBindMappingChanged(this, previousSelectedDateBindMapping);
}
}
@@ -303,12 +303,12 @@
if (value instanceof CalendarDate) {
selectedDate = (CalendarDate)value;
- } else if (selectionBindMapping == null) {
+ } else if (selectedDateBindMapping == null) {
if (value != null) {
selectedDate = CalendarDate.decode(value.toString());
}
} else {
- selectedDate = selectionBindMapping.toDate(value);
+ selectedDate = selectedDateBindMapping.toDate(value);
}
setSelectedDate(selectedDate);
@@ -323,8 +323,8 @@
public void store(Dictionary<String, ?> context) {
if (isEnabled()
&& selectedDateKey != null) {
- JSONSerializer.put(context, selectedDateKey, (selectionBindMapping == null) ?
- selectedDate : selectionBindMapping.valueOf(selectedDate));
+ JSONSerializer.put(context, selectedDateKey, (selectedDateBindMapping == null) ?
+ selectedDate : selectedDateBindMapping.valueOf(selectedDate));
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButtonListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButtonListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButtonListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButtonListener.java Sun Feb 28 15:00:35 2010
@@ -44,8 +44,8 @@
}
@Override
- public void selectionBindMappingChanged(CalendarButton calendarButton,
- Calendar.BindMapping previousSelectionBindMapping) {
+ public void selectedDateBindMappingChanged(CalendarButton calendarButton,
+ Calendar.SelectedDateBindMapping previousSelectedDateBindMapping) {
}
}
@@ -79,8 +79,8 @@
* Called when a calendar button's selection bind mapping has changed.
*
* @param calendarButton
- * @param previousSelectionBindMapping
+ * @param previousSelectedDateBindMapping
*/
- public void selectionBindMappingChanged(CalendarButton calendarButton,
- Calendar.BindMapping previousSelectionBindMapping);
+ public void selectedDateBindMappingChanged(CalendarButton calendarButton,
+ Calendar.SelectedDateBindMapping previousSelectedDateBindMapping);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarListener.java Sun Feb 28 15:00:35 2010
@@ -50,7 +50,7 @@
}
@Override
- public void bindMappingChanged(Calendar calendar, Calendar.BindMapping previousBindMapping) {
+ public void selectedDateBindMappingChanged(Calendar calendar, Calendar.SelectedDateBindMapping previousSelectedDateBindMapping) {
}
}
@@ -98,7 +98,8 @@
* Called when a calendar's bind mapping has changed.
*
* @param calendar
- * @param previousBindMapping
+ * @param previousSelectedDateBindMapping
*/
- public void bindMappingChanged(Calendar calendar, Calendar.BindMapping previousBindMapping);
+ public void selectedDateBindMappingChanged(Calendar calendar,
+ Calendar.SelectedDateBindMapping previousSelectedDateBindMapping);
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java Sun Feb 28 15:00:35 2010
@@ -27,7 +27,7 @@
/**
* Translates between text and context data during data binding.
*/
- public interface BindMapping {
+ public interface TextBindMapping {
/**
* Converts a value from the bind context to a text representation.
*
@@ -60,16 +60,16 @@
}
@Override
- public void bindMappingChanged(Label label, Label.BindMapping previousBindMapping) {
+ public void textBindMappingChanged(Label label, Label.TextBindMapping previousTextBindMapping) {
for (LabelListener listener : this) {
- listener.bindMappingChanged(label, previousBindMapping);
+ listener.textBindMappingChanged(label, previousTextBindMapping);
}
}
}
private String text = null;
private String textKey = null;
- private BindMapping bindMapping = null;
+ private TextBindMapping textBindMapping = null;
private LabelListenerList labelListeners = new LabelListenerList();
@@ -120,16 +120,16 @@
}
}
- public BindMapping getBindMapping() {
- return bindMapping;
+ public TextBindMapping getTextBindMapping() {
+ return textBindMapping;
}
- public void setBindMapping(BindMapping bindMapping) {
- BindMapping previousBindMapping = this.bindMapping;
+ public void setTextBindMapping(TextBindMapping textBindMapping) {
+ TextBindMapping previousTextBindMapping = this.textBindMapping;
- if (previousBindMapping != bindMapping) {
- this.bindMapping = bindMapping;
- labelListeners.bindMappingChanged(this, previousBindMapping);
+ if (previousTextBindMapping != textBindMapping) {
+ this.textBindMapping = textBindMapping;
+ labelListeners.textBindMappingChanged(this, previousTextBindMapping);
}
}
@@ -139,11 +139,11 @@
&& JSONSerializer.containsKey(context, textKey)) {
Object value = JSONSerializer.get(context, textKey);
- if (bindMapping == null
+ if (textBindMapping == null
&& value != null) {
value = value.toString();
} else {
- value = bindMapping.toString(value);
+ value = textBindMapping.toString(value);
}
setText((String)value);
@@ -155,8 +155,8 @@
if (isEnabled()
&& textKey != null) {
String text = getText();
- JSONSerializer.put(context, textKey, (bindMapping == null) ?
- text : bindMapping.valueOf(text));
+ JSONSerializer.put(context, textKey, (textBindMapping == null) ?
+ text : textBindMapping.valueOf(text));
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/LabelListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/LabelListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/LabelListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/LabelListener.java Sun Feb 28 15:00:35 2010
@@ -33,7 +33,7 @@
}
@Override
- public void bindMappingChanged(Label label, Label.BindMapping previousBindMapping) {
+ public void textBindMappingChanged(Label label, Label.TextBindMapping previousTextBindMapping) {
}
}
@@ -57,7 +57,7 @@
* Called when a label's bind mapping has changed.
*
* @param label
- * @param previousBindMapping
+ * @param previousTextBindMapping
*/
- public void bindMappingChanged(Label label, Label.BindMapping previousBindMapping);
+ public void textBindMappingChanged(Label label, Label.TextBindMapping previousTextBindMapping);
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Sun Feb 28 15:00:35 2010
@@ -62,9 +62,9 @@
}
@Override
- public void selectionBindMappingChanged(ListButton listButton, ListView.BindMapping previousSelectionBindMapping) {
+ public void selectedItemBindMappingChanged(ListButton listButton, ListView.SelectedItemBindMapping previousSelectedItemBindMapping) {
for (ListButtonListener listener : this) {
- listener.selectionBindMappingChanged(listButton, previousSelectionBindMapping);
+ listener.selectedItemBindMappingChanged(listButton, previousSelectedItemBindMapping);
}
}
}
@@ -85,7 +85,7 @@
private Filter<?> disabledItemFilter = null;
private String selectedItemKey = null;
- private ListView.BindMapping selectionBindMapping = null;
+ private ListView.SelectedItemBindMapping selectedItemBindMapping = null;
private ListButtonListenerList listButtonListeners = new ListButtonListenerList();
private ListButtonSelectionListenerList listButtonSelectionListeners = new ListButtonSelectionListenerList();
@@ -331,16 +331,16 @@
}
}
- public ListView.BindMapping getSelectionBindMapping() {
- return selectionBindMapping;
+ public ListView.SelectedItemBindMapping getSelectedItemBindMapping() {
+ return selectedItemBindMapping;
}
- public void setSelectionBindMapping(ListView.BindMapping bindMapping) {
- ListView.BindMapping previousSelectionBindMapping = this.selectionBindMapping;
+ public void setSelectedItemBindMapping(ListView.SelectedItemBindMapping selectedItemBindMapping) {
+ ListView.SelectedItemBindMapping previousSelectedItemBindMapping = this.selectedItemBindMapping;
- if (previousSelectionBindMapping != bindMapping) {
- this.selectionBindMapping = bindMapping;
- listButtonListeners.selectionBindMappingChanged(this, previousSelectionBindMapping);
+ if (previousSelectedItemBindMapping != selectedItemBindMapping) {
+ this.selectedItemBindMapping = selectedItemBindMapping;
+ listButtonListeners.selectedItemBindMappingChanged(this, previousSelectedItemBindMapping);
}
}
@@ -352,10 +352,10 @@
Object item = JSONSerializer.get(context, selectedItemKey);
int index;
- if (selectionBindMapping == null) {
+ if (selectedItemBindMapping == null) {
index = ((List<Object>)listData).indexOf(item);
} else {
- index = selectionBindMapping.indexOf(listData, item);
+ index = selectedItemBindMapping.indexOf(listData, item);
}
setSelectedIndex(index);
@@ -369,10 +369,10 @@
int selectedIndex = getSelectedIndex();
Object item;
- if (selectionBindMapping == null) {
+ if (selectedItemBindMapping == null) {
item = listData.get(selectedIndex);
} else {
- item = selectionBindMapping.get(listData, selectedIndex);
+ item = selectedItemBindMapping.get(listData, selectedIndex);
}
JSONSerializer.put(context, selectedItemKey, item);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java Sun Feb 28 15:00:35 2010
@@ -44,7 +44,7 @@
}
@Override
- public void selectionBindMappingChanged(ListButton listButton, ListView.BindMapping previousSelectionBindMapping) {
+ public void selectedItemBindMappingChanged(ListButton listButton, ListView.SelectedItemBindMapping previousSelectedItemBindMapping) {
}
}
@@ -84,8 +84,8 @@
* Called when a list button's selection bind mapping has changed.
*
* @param listButton
- * @param previousSelectionBindMapping
+ * @param previousSelectedItemBindMapping
*/
- public void selectionBindMappingChanged(ListButton listButton,
- ListView.BindMapping previousSelectionBindMapping);
+ public void selectedItemBindMappingChanged(ListButton listButton,
+ ListView.SelectedItemBindMapping previousSelectedItemBindMapping);
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Sun Feb 28 15:00:35 2010
@@ -363,7 +363,7 @@
/**
* Translates between list and bind context data during data binding.
*/
- public interface BindMapping {
+ public interface SelectedItemBindMapping {
/**
* Returns the index of the item in the source list.
*
@@ -465,9 +465,9 @@
}
@Override
- public void bindMappingChanged(ListView listView, BindMapping previousBindMapping) {
+ public void selectedItemBindMappingChanged(ListView listView, SelectedItemBindMapping previousSelectedItemBindMapping) {
for (ListViewListener listener : this) {
- listener.bindMappingChanged(listView, previousBindMapping);
+ listener.selectedItemBindMappingChanged(listView, previousSelectedItemBindMapping);
}
}
}
@@ -652,7 +652,7 @@
private String selectedItemKey = null;
private String selectedItemsKey = null;
- private BindMapping bindMapping = null;
+ private SelectedItemBindMapping selectedItemBindMapping = null;
private ListViewListenerList listViewListeners = new ListViewListenerList();
private ListViewItemListenerList listViewItemListeners = new ListViewItemListenerList();
@@ -1473,16 +1473,16 @@
}
}
- public BindMapping getBindMapping() {
- return bindMapping;
+ public SelectedItemBindMapping getSelectedItemBindMapping() {
+ return selectedItemBindMapping;
}
- public void setBindMapping(BindMapping bindMapping) {
- BindMapping previousBindMapping = this.bindMapping;
+ public void setSelectedItemBindMapping(SelectedItemBindMapping selectedItemBindMapping) {
+ SelectedItemBindMapping previousSelectedItemBindMapping = this.selectedItemBindMapping;
- if (previousBindMapping != bindMapping) {
- this.bindMapping = bindMapping;
- listViewListeners.bindMappingChanged(this, previousBindMapping);
+ if (previousSelectedItemBindMapping != selectedItemBindMapping) {
+ this.selectedItemBindMapping = selectedItemBindMapping;
+ listViewListeners.selectedItemBindMappingChanged(this, previousSelectedItemBindMapping);
}
}
@@ -1494,10 +1494,10 @@
Object item = JSONSerializer.get(context, selectedItemKey);
int index;
- if (bindMapping == null) {
+ if (selectedItemBindMapping == null) {
index = ((List<Object>)listData).indexOf(item);
} else {
- index = bindMapping.indexOf(listData, item);
+ index = selectedItemBindMapping.indexOf(listData, item);
}
setSelectedIndex(index);
@@ -1513,10 +1513,10 @@
Object item = items.get(i);
int index;
- if (bindMapping == null) {
+ if (selectedItemBindMapping == null) {
index = ((List<Object>)listData).indexOf(item);
} else {
- index = bindMapping.indexOf(listData, item);
+ index = selectedItemBindMapping.indexOf(listData, item);
}
if (index != -1) {
@@ -1533,10 +1533,10 @@
int selectedIndex = getSelectedIndex();
Object item;
- if (bindMapping == null) {
+ if (selectedItemBindMapping == null) {
item = listData.get(selectedIndex);
} else {
- item = bindMapping.get(listData, selectedIndex);
+ item = selectedItemBindMapping.get(listData, selectedIndex);
}
JSONSerializer.put(context, selectedItemKey, item);
@@ -1551,10 +1551,10 @@
for (int index = range.start; index <= range.end; index++) {
Object item;
- if (bindMapping == null) {
+ if (selectedItemBindMapping == null) {
item = listData.get(index);
} else {
- item = bindMapping.get(listData, index);
+ item = selectedItemBindMapping.get(listData, index);
}
items.add(item);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java Sun Feb 28 15:00:35 2010
@@ -66,7 +66,7 @@
}
@Override
- public void bindMappingChanged(ListView listView, ListView.BindMapping previousBindMapping) {
+ public void selectedItemBindMappingChanged(ListView listView, ListView.SelectedItemBindMapping previousSelectedItemBindMapping) {
}
}
@@ -146,7 +146,7 @@
* Called when a list view's bind mapping has changed.
*
* @param listView
- * @param previousBindMapping
+ * @param previousSelectedItemBindMapping
*/
- public void bindMappingChanged(ListView listView, ListView.BindMapping previousBindMapping);
+ public void selectedItemBindMappingChanged(ListView listView, ListView.SelectedItemBindMapping previousSelectedItemBindMapping);
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java Sun Feb 28 15:00:35 2010
@@ -74,7 +74,7 @@
/**
* Translates between spinner and bind context data during data binding.
*/
- public interface BindMapping {
+ public interface SelectedItemBindMapping {
/**
* Returns the index of the item in the source list.
*
@@ -188,9 +188,9 @@
}
@Override
- public void bindMappingChanged(Spinner spinner, BindMapping previousBindMapping) {
+ public void selectedItemBindMappingChanged(Spinner spinner, SelectedItemBindMapping previousSelectedItemBindMapping) {
for (SpinnerListener listener : this) {
- listener.bindMappingChanged(spinner, previousBindMapping);
+ listener.selectedItemBindMappingChanged(spinner, previousSelectedItemBindMapping);
}
}
}
@@ -258,7 +258,7 @@
private boolean circular = false;
private int selectedIndex = -1;
private String selectedItemKey = null;
- private BindMapping bindMapping = null;
+ private SelectedItemBindMapping selectedItemBindMapping = null;
private SpinnerListenerList spinnerListeners = new SpinnerListenerList();
private SpinnerItemListenerList spinnerItemListeners = new SpinnerItemListenerList();
@@ -447,16 +447,16 @@
}
}
- public BindMapping getBindMapping() {
- return bindMapping;
+ public SelectedItemBindMapping getSelectedItemBindMapping() {
+ return selectedItemBindMapping;
}
- public void setBindMapping(BindMapping bindMapping) {
- BindMapping previousBindMapping = this.bindMapping;
+ public void setSelectedItemBindMapping(SelectedItemBindMapping selectedItemBindMapping) {
+ SelectedItemBindMapping previousSelectedItemBindMapping = this.selectedItemBindMapping;
- if (previousBindMapping != bindMapping) {
- this.bindMapping = bindMapping;
- spinnerListeners.bindMappingChanged(this, previousBindMapping);
+ if (previousSelectedItemBindMapping != selectedItemBindMapping) {
+ this.selectedItemBindMapping = selectedItemBindMapping;
+ spinnerListeners.selectedItemBindMappingChanged(this, previousSelectedItemBindMapping);
}
}
@@ -468,10 +468,10 @@
Object item = JSONSerializer.get(context, selectedItemKey);
int index;
- if (bindMapping == null) {
+ if (selectedItemBindMapping == null) {
index = ((List<Object>)spinnerData).indexOf(item);
} else {
- index = bindMapping.indexOf(spinnerData, item);
+ index = selectedItemBindMapping.indexOf(spinnerData, item);
}
setSelectedIndex(index);
@@ -485,10 +485,10 @@
int selectedIndex = getSelectedIndex();
Object item;
- if (bindMapping == null) {
+ if (selectedItemBindMapping == null) {
item = spinnerData.get(selectedIndex);
} else {
- item = bindMapping.get(spinnerData, selectedIndex);
+ item = selectedItemBindMapping.get(spinnerData, selectedIndex);
}
JSONSerializer.put(context, selectedItemKey, item);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SpinnerListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SpinnerListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SpinnerListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SpinnerListener.java Sun Feb 28 15:00:35 2010
@@ -43,7 +43,7 @@
}
@Override
- public void bindMappingChanged(Spinner spinner, Spinner.BindMapping previousBindMapping) {
+ public void selectedItemBindMappingChanged(Spinner spinner, Spinner.SelectedItemBindMapping previousSelectedItemBindMapping) {
}
}
@@ -82,7 +82,7 @@
* Called when a spinner's bind mapping has changed.
*
* @param spinner
- * @param previousBindMapping
+ * @param previousSelectedItemBindMapping
*/
- public void bindMappingChanged(Spinner spinner, Spinner.BindMapping previousBindMapping);
+ public void selectedItemBindMappingChanged(Spinner spinner, Spinner.SelectedItemBindMapping previousSelectedItemBindMapping);
}
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=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Sun Feb 28 15:00:35 2010
@@ -62,7 +62,7 @@
/**
* Translates between text and context data during data binding.
*/
- public interface BindMapping {
+ public interface TextBindMapping {
/**
* Converts a value from the bind context to a text representation.
*
@@ -123,9 +123,9 @@
}
@Override
- public void bindMappingChanged(TextInput textInput, TextInput.BindMapping previousBindMapping) {
+ public void textBindMappingChanged(TextInput textInput, TextInput.TextBindMapping previousTextBindMapping) {
for (TextInputListener listener : this) {
- listener.bindMappingChanged(textInput, previousBindMapping);
+ listener.textBindMappingChanged(textInput, previousTextBindMapping);
}
}
@@ -195,7 +195,7 @@
private String prompt = null;
private String textKey = null;
- private BindMapping bindMapping = null;
+ private TextBindMapping textBindMapping = null;
private Validator validator = null;
private boolean textValid = true;
@@ -728,16 +728,16 @@
}
}
- public BindMapping getBindMapping() {
- return bindMapping;
+ public TextBindMapping getTextBindMapping() {
+ return textBindMapping;
}
- public void setBindMapping(BindMapping bindMapping) {
- BindMapping previousBindMapping = this.bindMapping;
+ public void setTextBindMapping(TextBindMapping textBindMapping) {
+ TextBindMapping previousTextBindMapping = this.textBindMapping;
- if (previousBindMapping != bindMapping) {
- this.bindMapping = bindMapping;
- textInputListeners.bindMappingChanged(this, previousBindMapping);
+ if (previousTextBindMapping != textBindMapping) {
+ this.textBindMapping = textBindMapping;
+ textInputListeners.textBindMappingChanged(this, previousTextBindMapping);
}
}
@@ -747,11 +747,11 @@
&& JSONSerializer.containsKey(context, textKey)) {
Object value = JSONSerializer.get(context, textKey);
- if (bindMapping == null
+ if (textBindMapping == null
&& value != null) {
value = value.toString();
} else {
- value = bindMapping.toString(value);
+ value = textBindMapping.toString(value);
}
setText((String)value);
@@ -763,8 +763,8 @@
if (isEnabled()
&& textKey != null) {
String text = getText();
- JSONSerializer.put(context, textKey, (bindMapping == null) ?
- text : bindMapping.valueOf(text));
+ JSONSerializer.put(context, textKey, (textBindMapping == null) ?
+ text : textBindMapping.valueOf(text));
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputListener.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputListener.java Sun Feb 28 15:00:35 2010
@@ -52,7 +52,7 @@
}
@Override
- public void bindMappingChanged(TextInput textInput, TextInput.BindMapping previousBindMapping) {
+ public void textBindMappingChanged(TextInput textInput, TextInput.TextBindMapping previousTextBindMapping) {
}
@Override
@@ -114,9 +114,9 @@
* Called when a text input's bind mapping has changed.
*
* @param textInput
- * @param previousBindMapping
+ * @param previousTextBindMapping
*/
- public void bindMappingChanged(TextInput textInput, TextInput.BindMapping previousBindMapping);
+ public void textBindMappingChanged(TextInput textInput, TextInput.TextBindMapping previousTextBindMapping);
/**
* Called when the text changes validity.
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ButtonSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ButtonSkin.java Sun Feb 28 15:00:35 2010
@@ -124,7 +124,7 @@
}
@Override
- public void bindMappingChanged(Button button, Button.BindMapping previousBindMapping) {
+ public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
// No-op
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java Sun Feb 28 15:00:35 2010
@@ -293,7 +293,7 @@
}
@Override
- public void selectionBindMappingChanged(CalendarButton calendarButton,
- Calendar.BindMapping previousSelectionBindMapping) {
+ public void selectedDateBindMappingChanged(CalendarButton calendarButton,
+ Calendar.SelectedDateBindMapping previousSelectedDateBindMapping) {
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarSkin.java Sun Feb 28 15:00:35 2010
@@ -43,7 +43,7 @@
}
@Override
- public void bindMappingChanged(Calendar calendar, Calendar.BindMapping previousBindMapping) {
+ public void selectedDateBindMappingChanged(Calendar calendar, Calendar.SelectedDateBindMapping previousSelectedDateBindMapping) {
// No-op
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Sun Feb 28 15:00:35 2010
@@ -590,7 +590,7 @@
}
@Override
- public void bindMappingChanged(Label label, Label.BindMapping previousBindMapping) {
+ public void textBindMappingChanged(Label label, Label.TextBindMapping previousTextBindMapping) {
// No-op
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=917188&r1=917187&r2=917188&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Sun Feb 28 15:00:35 2010
@@ -351,7 +351,7 @@
}
@Override
- public void selectionBindMappingChanged(ListButton listButton, ListView.BindMapping previousSelectionBindMapping) {
+ public void selectedItemBindMappingChanged(ListButton listButton, ListView.SelectedItemBindMapping previousSelectedItemBindMapping) {
// No-op
}