You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2014/06/16 16:03:18 UTC
svn commit: r1602867 - in
/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk: ListButton.java
ListView.java Spinner.java TableView.java
Author: smartini
Date: Mon Jun 16 14:03:18 2014
New Revision: 1602867
URL: http://svn.apache.org/r1602867
Log:
PIVOT-948, backport from trunk
Modified:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListButton.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=1602867&r1=1602866&r2=1602867&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListButton.java Mon Jun 16 14:03:18 2014
@@ -768,14 +768,14 @@ public class ListButton extends Button {
Object item;
int selectedIndexLocal = getSelectedIndex();
- if (selectedIndexLocal == -1) {
- item = null;
- } else {
- if (selectedItemBindMapping == null) {
- item = listData.get(selectedIndexLocal);
+ if (selectedItemBindMapping == null) {
+ if (selectedIndexLocal == -1) {
+ item = null;
} else {
- item = selectedItemBindMapping.get(listData, selectedIndexLocal);
+ item = listData.get(selectedIndexLocal);
}
+ } else {
+ item = selectedItemBindMapping.get(listData, selectedIndexLocal);
}
JSON.put(context, selectedItemKey, item);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java?rev=1602867&r1=1602866&r2=1602867&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java Mon Jun 16 14:03:18 2014
@@ -1679,15 +1679,15 @@ public class ListView extends Component
&& selectedItemBindType != BindType.LOAD) {
Object item;
- int selectedIndex = getSelectedIndex();
- if (selectedIndex == -1) {
- item = null;
- } else {
- if (selectedItemBindMapping == null) {
- item = listData.get(selectedIndex);
+ int selectedIndexLocal = getSelectedIndex();
+ if (selectedItemBindMapping == null) {
+ if (selectedIndexLocal == -1) {
+ item = null;
} else {
- item = selectedItemBindMapping.get(listData, selectedIndex);
+ item = listData.get(selectedIndexLocal);
}
+ } else {
+ item = selectedItemBindMapping.get(listData, selectedIndexLocal);
}
JSON.put(context, selectedItemKey, item);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java?rev=1602867&r1=1602866&r2=1602867&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/Spinner.java Mon Jun 16 14:03:18 2014
@@ -678,14 +678,15 @@ public class Spinner extends Container {
if (selectedItemKey != null
&& selectedItemBindType != BindType.LOAD) {
Object item;
- if (selectedIndex == -1) {
- item = null;
- } else {
- if (selectedItemBindMapping == null) {
- item = spinnerData.get(selectedIndex);
+
+ if (selectedItemBindMapping == null) {
+ if (selectedIndex == -1) {
+ item = null;
} else {
- item = selectedItemBindMapping.get(spinnerData, selectedIndex);
+ item = spinnerData.get(selectedIndex);
}
+ } else {
+ item = selectedItemBindMapping.get(spinnerData, selectedIndex);
}
JSON.put(context, selectedItemKey, item);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java?rev=1602867&r1=1602866&r2=1602867&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java Mon Jun 16 14:03:18 2014
@@ -2204,15 +2204,15 @@ public class TableView extends Component
&& selectedRowBindType != BindType.LOAD) {
Object row;
- int selectedIndex = getSelectedIndex();
- if (selectedIndex == -1) {
- row = null;
- } else {
- if (selectedRowBindMapping == null) {
- row = tableData.get(selectedIndex);
+ int selectedIndexLocal = getSelectedIndex();
+ if (selectedRowBindMapping == null) {
+ if (selectedIndexLocal == -1) {
+ row = null;
} else {
- row = selectedRowBindMapping.get(tableData, selectedIndex);
+ row = tableData.get(selectedIndexLocal);
}
+ } else {
+ row = selectedRowBindMapping.get(tableData, selectedIndexLocal);
}
JSON.put(context, selectedRowKey, row);