You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by cb...@apache.org on 2010/09/16 16:22:38 UTC

svn commit: r997761 - in /pivot/trunk: tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java

Author: cbartlett
Date: Thu Sep 16 14:22:38 2010
New Revision: 997761

URL: http://svn.apache.org/viewvc?rev=997761&view=rev
Log:
Fix possible IllegalArgumentException from TextArea.setText((String) null)

Modified:
    pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java

Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java?rev=997761&r1=997760&r2=997761&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java Thu Sep 16 14:22:38 2010
@@ -40,12 +40,12 @@ import org.apache.pivot.wtk.ComponentMou
 import org.apache.pivot.wtk.Display;
 import org.apache.pivot.wtk.Mouse;
 import org.apache.pivot.wtk.ScrollPane;
-import org.apache.pivot.wtk.ScrollPane.ScrollBarPolicy;
 import org.apache.pivot.wtk.SplitPane;
 import org.apache.pivot.wtk.TextArea;
 import org.apache.pivot.wtk.TreeView;
 import org.apache.pivot.wtk.TreeViewSelectionListener;
 import org.apache.pivot.wtk.Window;
+import org.apache.pivot.wtk.ScrollPane.ScrollBarPolicy;
 
 public class ComponentExplorerWindow extends Window implements Bindable {
     private String classProperty;
@@ -160,7 +160,7 @@ public class ComponentExplorerWindow ext
                         break;
                     }
                 } else {
-                    sourceTextArea.setText((String)null);
+                    sourceTextArea.setText("");
                 }
 
                 contentPane.setContent(component);

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java?rev=997761&r1=997760&r2=997761&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewTextAreaCellRenderer.java Thu Sep 16 14:22:38 2010
@@ -56,7 +56,7 @@ public class TableViewTextAreaCellRender
             text = toString(row, columnName);
         }
 
-        setText(text);
+        setText(text == null ? "" : text);
     }
 
     protected void renderStyles(TableView tableView, boolean rowSelected, boolean rowDisabled) {