You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2013/09/16 20:10:28 UTC
svn commit: r1523738 - in /pivot/branches/2.0.x: ./
wtk/src/org/apache/pivot/wtk/content/
Author: rwhitcomb
Date: Mon Sep 16 18:10:27 2013
New Revision: 1523738
URL: http://svn.apache.org/r1523738
Log:
PIVOT-922: Corrections to some of the renderers fixed earlier: the
"toString" methods were not taking into account the possibility of
the data being a pure Image (which should not generate any text).
This is a merge of revision 1523736 from trunk to branches/2.0.x.
Modified:
pivot/branches/2.0.x/ (props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
Merged /pivot/trunk:r1523736
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java?rev=1523738&r1=1523737&r2=1523738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java Mon Sep 16 18:10:27 2013
@@ -153,7 +153,7 @@ public class ButtonDataRenderer extends
if (data instanceof ButtonData) {
ButtonData buttonData = (ButtonData)data;
string = buttonData.getText();
- } else {
+ } else if (!(data instanceof Image)) {
if (data != null) {
string = data.toString();
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java?rev=1523738&r1=1523737&r2=1523738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/LinkButtonDataRenderer.java Mon Sep 16 18:10:27 2013
@@ -112,7 +112,7 @@ public class LinkButtonDataRenderer exte
if (data instanceof ButtonData) {
ButtonData buttonData = (ButtonData)data;
string = buttonData.getText();
- } else {
+ } else if (!(data instanceof Image)) {
if (data != null) {
string = data.toString();
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java?rev=1523738&r1=1523737&r2=1523738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java Mon Sep 16 18:10:27 2013
@@ -114,7 +114,7 @@ public class ListViewItemRenderer extend
if (item instanceof ListItem) {
ListItem listItem = (ListItem)item;
string = listItem.getText();
- } else {
+ } else if (!(item instanceof Image)) {
if (item != null) {
string = item.toString();
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java?rev=1523738&r1=1523737&r2=1523738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuBarItemDataRenderer.java Mon Sep 16 18:10:27 2013
@@ -115,7 +115,7 @@ public class MenuBarItemDataRenderer ext
if (data instanceof ButtonData) {
ButtonData buttonData = (ButtonData)data;
string = buttonData.getText();
- } else {
+ } else if (!(data instanceof Image)) {
if (data != null) {
string = data.toString();
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java?rev=1523738&r1=1523737&r2=1523738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/MenuItemDataRenderer.java Mon Sep 16 18:10:27 2013
@@ -146,7 +146,7 @@ public class MenuItemDataRenderer extend
if (data instanceof ButtonData) {
ButtonData buttonData = (ButtonData)data;
string = buttonData.getText();
- } else {
+ } else if (!(data instanceof Image)) {
if (data != null) {
string = data.toString();
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java?rev=1523738&r1=1523737&r2=1523738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java Mon Sep 16 18:10:27 2013
@@ -134,7 +134,7 @@ public class TreeViewNodeRenderer extend
if (node instanceof TreeNode) {
TreeNode treeNode = (TreeNode)node;
string = treeNode.getText();
- } else {
+ } else if (!(node instanceof Image)) {
if (node != null) {
string = node.toString();
}