You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/05/26 21:51:15 UTC
svn commit: r778859 - in /incubator/pivot/trunk/wtk/test/pivot/wtk/text/test:
NodeAdapterRenderer.java jabberwocky.txt test.txt
Author: tvolkert
Date: Tue May 26 19:51:14 2009
New Revision: 778859
URL: http://svn.apache.org/viewvc?rev=778859&view=rev
Log:
Fixed bug in pivot.wtk.text.test.NodeAdapterRenderer, and removed unused .txt files in that package
Removed:
incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/jabberwocky.txt
incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/test.txt
Modified:
incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/NodeAdapterRenderer.java
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/NodeAdapterRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/NodeAdapterRenderer.java?rev=778859&r1=778858&r2=778859&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/NodeAdapterRenderer.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/NodeAdapterRenderer.java Tue May 26 19:51:14 2009
@@ -26,9 +26,6 @@
public void render(Object node, TreeView treeView, boolean expanded,
boolean selected, TreeView.NodeCheckState checkState,
boolean highlighted, boolean disabled) {
- NodeAdapter nodeAdapter = (NodeAdapter)node;
- setText(nodeAdapter.getText());
-
Object labelFont = treeView.getStyles().get("font");
if (labelFont instanceof Font) {
getStyles().put("font", labelFont);
@@ -52,5 +49,10 @@
if (color instanceof Color) {
getStyles().put("color", color);
}
+
+ if (node != null) {
+ NodeAdapter nodeAdapter = (NodeAdapter)node;
+ setText(nodeAdapter.getText());
+ }
}
}