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/06/25 00:58:50 UTC
svn commit: r788204 - in /incubator/pivot/trunk:
tools/src/org/apache/pivot/tools/json/JSONViewer.java
tools/src/org/apache/pivot/tools/json/json_viewer.wtkx
wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
Author: gbrown
Date: Wed Jun 24 22:58:50 2009
New Revision: 788204
URL: http://svn.apache.org/viewvc?rev=788204&view=rev
Log:
Fix minor bug in TreeViewNodeRenderer; minor updates to JSON Viewer.
Modified:
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java?rev=788204&r1=788203&r2=788204&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java Wed Jun 24 22:58:50 2009
@@ -109,7 +109,7 @@
TreeNode treeNode;
if (value instanceof Map<?, ?>) {
- TreeBranch treeBranch = new TreeBranch();
+ TreeBranch treeBranch = new TreeBranch("{}");
Map<String, Object> map = (Map<String, Object>)value;
for (String key : map) {
@@ -127,7 +127,7 @@
treeNode = treeBranch;
} else if (value instanceof List<?>) {
- TreeBranch treeBranch = new TreeBranch();
+ TreeBranch treeBranch = new TreeBranch("[]");
List<Object> list = (List<Object>)value;
for (int i = 0, n = list.getLength(); i < n; i++) {
@@ -146,8 +146,12 @@
treeNode = treeBranch;
} else if (value instanceof String) {
treeNode = new TreeNode("\"" + value.toString() + "\"");
+ } else if (value instanceof Number) {
+ treeNode = new TreeNode(value.toString());
+ } else if (value instanceof Boolean) {
+ treeNode = new TreeNode(value.toString());
} else {
- treeNode = new TreeNode(value == null ? "null" : value.toString());
+ treeNode = new TreeNode("null");
}
return treeNode;
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx?rev=788204&r1=788203&r2=788204&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx Wed Jun 24 22:58:50 2009
@@ -18,12 +18,16 @@
<Window title="JSON Viewer" maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
+ xmlns:content="org.apache.pivot.wtk.content"
xmlns="org.apache.pivot.wtk">
<content>
<ScrollPane horizontalScrollBarPolicy="fillToCapacity"
verticalScrollBarPolicy="fillToCapacity">
<view>
<TreeView wtkx:id="treeView">
+ <nodeRenderer>
+ <content:TreeViewNodeRenderer showIcon="false"/>
+ </nodeRenderer>
<componentKeyListeners>
<wtkx:script>
<![CDATA[
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java?rev=788204&r1=788203&r2=788204&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeRenderer.java Wed Jun 24 22:58:50 2009
@@ -68,65 +68,67 @@
public void render(Object node, TreeView treeView, boolean expanded,
boolean selected, TreeView.NodeCheckState checkState,
boolean highlighted, boolean disabled) {
- Image icon = null;
- String text = null;
+ if (node != null) {
+ Image icon = null;
+ String text = null;
+
+ if (node instanceof TreeNode) {
+ TreeNode treeNode = (TreeNode)node;
+
+ if (expanded
+ && treeNode instanceof TreeBranch) {
+ TreeBranch treeBranch = (TreeBranch)treeNode;
+ icon = treeBranch.getExpandedIcon();
- if (node instanceof TreeNode) {
- TreeNode treeNode = (TreeNode)node;
-
- if (expanded
- && treeNode instanceof TreeBranch) {
- TreeBranch treeBranch = (TreeBranch)treeNode;
- icon = treeBranch.getExpandedIcon();
-
- if (icon == null) {
- icon = treeBranch.getIcon();
+ if (icon == null) {
+ icon = treeBranch.getIcon();
+ }
+ } else {
+ icon = treeNode.getIcon();
}
+
+ text = treeNode.getText();
+ } else if (node instanceof Image) {
+ icon = (Image)node;
} else {
- icon = treeNode.getIcon();
+ if (node != null) {
+ text = node.toString();
+ }
}
- text = treeNode.getText();
- } else if (node instanceof Image) {
- icon = (Image)node;
- } else {
- if (node != null) {
- text = node.toString();
- }
- }
+ // Update the image view
+ imageView.setImage(icon);
+ imageView.getStyles().put("opacity",
+ (treeView.isEnabled() && !disabled) ? 1.0f : 0.5f);
- // Update the image view
- imageView.setImage(icon);
- imageView.getStyles().put("opacity",
- (treeView.isEnabled() && !disabled) ? 1.0f : 0.5f);
-
- // Update the label
- label.setText(text);
-
- if (text == null) {
- label.setDisplayable(false);
- } else {
- label.setDisplayable(true);
-
- Font font = (Font)treeView.getStyles().get("font");
- label.getStyles().put("font", font);
-
- Color color;
- if (treeView.isEnabled() && !disabled) {
- if (selected) {
- if (treeView.isFocused()) {
- color = (Color)treeView.getStyles().get("selectionColor");
+ // Update the label
+ label.setText(text);
+
+ if (text == null) {
+ label.setDisplayable(false);
+ } else {
+ label.setDisplayable(true);
+
+ Font font = (Font)treeView.getStyles().get("font");
+ label.getStyles().put("font", font);
+
+ Color color;
+ if (treeView.isEnabled() && !disabled) {
+ if (selected) {
+ if (treeView.isFocused()) {
+ color = (Color)treeView.getStyles().get("selectionColor");
+ } else {
+ color = (Color)treeView.getStyles().get("inactiveSelectionColor");
+ }
} else {
- color = (Color)treeView.getStyles().get("inactiveSelectionColor");
+ color = (Color)treeView.getStyles().get("color");
}
} else {
- color = (Color)treeView.getStyles().get("color");
+ color = (Color)treeView.getStyles().get("disabledColor");
}
- } else {
- color = (Color)treeView.getStyles().get("disabledColor");
- }
- label.getStyles().put("color", color);
+ label.getStyles().put("color", color);
+ }
}
}