Author: rwhitcomb Date: Sat Apr 14 01:00:04 2018 New Revision: 1829113 URL: http://svn.apache.org/viewvc?rev=1829113&view=rev Log: Make the ListViewItemRenderer and TreeViewNodeRenderer able to understand and use something of BaseContent to get both the string and icon to render. This allows interchangeable use of ListItem, ButtonData or TreeNode/TreeBranch in many places because they all inherit (now) from BaseContent.
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java?rev=1829113&r1=1829112&r2=1829113&view=diff ============================================================================== --- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java (original) +++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemRenderer.java Sat Apr 14 01:00:04 2018 @@ -71,9 +71,9 @@ public class ListViewItemRenderer extend Image icon = null; String text = null; - if (item instanceof ListItem) { - ListItem listItem = (ListItem) item; - icon = listItem.getIcon(); + if (item instanceof BaseContent) { + BaseContent baseItem = (BaseContent) item; + icon = baseItem.getIcon(); } else if (item instanceof Image) { icon = (Image) item; } @@ -111,9 +111,9 @@ public class ListViewItemRenderer extend public String toString(Object item) { String string = null; - if (item instanceof ListItem) { - ListItem listItem = (ListItem) item; - string = listItem.getText(); + if (item instanceof BaseContent) { + BaseContent baseItem = (BaseContent) item; + string = baseItem.getText(); } else if (!(item instanceof Image)) { if (item != null) { string = item.toString(); Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java?rev=1829113&r1=1829112&r2=1829113&view=diff ============================================================================== --- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java (original) +++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java Sat Apr 14 01:00:04 2018 @@ -72,18 +72,18 @@ public class TreeViewNodeRenderer extend Image icon = null; String text = null; - if (node instanceof TreeNode) { - TreeNode treeNode = (TreeNode) node; + if (node instanceof BaseContent) { + BaseContent baseNode = (BaseContent) node; - if (expanded && treeNode instanceof TreeBranch) { - TreeBranch treeBranch = (TreeBranch) treeNode; + if (expanded && baseNode instanceof TreeBranch) { + TreeBranch treeBranch = (TreeBranch) baseNode; icon = treeBranch.getExpandedIcon(); if (icon == null) { icon = treeBranch.getIcon(); } } else { - icon = treeNode.getIcon(); + icon = baseNode.getIcon(); } } else if (node instanceof Image) { icon = (Image) node; @@ -129,9 +129,9 @@ public class TreeViewNodeRenderer extend public String toString(Object node) { String string = null; - if (node instanceof TreeNode) { - TreeNode treeNode = (TreeNode) node; - string = treeNode.getText(); + if (node instanceof BaseContent) { + BaseContent baseNode = (BaseContent) node; + string = baseNode.getText(); } else if (!(node instanceof Image)) { if (node != null) { string = node.toString();