svn commit: r1523778 - in /pivot/branches/2.0.x: ./ wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java

[rwhitcomb]

Author: rwhitcomb
Date: Mon Sep 16 19:47:49 2013
New Revision: 1523778

URL: http://svn.apache.org/r1523778
Log:
PIVOT-922: Correc the last renderer that isn't correctly calling "toString"
in the "render" method.  This change also correctly ignores pure Image data
which shouldn't have text.

This is a merge of revision 1523776 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/TableViewHeaderDataRenderer.java

Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
  Merged /pivot/trunk:r1523776

Modified: 
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
URL: 
http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java?rev=1523778&r1=1523777&r2=1523778&view=diff
==============================================================================
--- 
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
 (original)
+++ 
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
 Mon Sep 16 19:47:49 2013
@@ -65,14 +65,10 @@ public class TableViewHeaderDataRenderer
         if (data instanceof TableViewHeaderData) {
             TableViewHeaderData tableViewHeaderData = 
(TableViewHeaderData)data;
             icon = tableViewHeaderData.getIcon();
-            text = tableViewHeaderData.getText();
         } else if (data instanceof Image) {
             icon = (Image)data;
-        } else {
-            if (data != null) {
-                text = data.toString();
-            }
         }
+        text = toString(data);
 
         // Update the icon image view
         imageView.setImage(icon);
@@ -115,16 +111,15 @@ public class TableViewHeaderDataRenderer
 
     @Override
     public String toString(Object data) {
-        if (data == null) {
-            throw new IllegalArgumentException();
-        }
+        String string = null;
 
-        String string;
         if (data instanceof TableViewHeaderData) {
             TableViewHeaderData tableViewHeaderData = 
(TableViewHeaderData)data;
             string = tableViewHeaderData.getText();
-        } else {
-            string = data.toString();
+        } else if (!(data instanceof Image)) {
+            if (data != null) {
+                string = data.toString();
+            }
         }
 
         return string;