svn commit: r944750 - in /pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra: TerraListViewSkin.java TerraTableViewSkin.java

[gbrown]

Author: gbrown
Date: Sun May 16 01:22:45 2010
New Revision: 944750

URL: http://svn.apache.org/viewvc?rev=944750&view=rev
Log:
Fix NPE in TerraListViewSkin and TerraTableViewSkin; add workaround for 
PIVOT-490.

Modified:
    
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
    
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java

Modified: 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=944750&r1=944749&r2=944750&view=diff
==============================================================================
--- 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
 (original)
+++ 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
 Sun May 16 01:22:45 2010
@@ -1225,7 +1225,11 @@ public class TerraListViewSkin extends C
 
                 // Ensure that the selection is visible
                 Bounds visibleSelectionBounds = 
listView.getVisibleArea(selectionBounds);
-                if (visibleSelectionBounds.height < selectionBounds.height) {
+                if (visibleSelectionBounds != null
+                    && visibleSelectionBounds.height < selectionBounds.height) 
{
+                    // TODO Repainting the entire component is a workaround 
for PIVOT-490
+                    repaintComponent();
+
                     listView.scrollAreaToVisible(selectionBounds);
                 }
             }

Modified: 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=944750&r1=944749&r2=944750&view=diff
==============================================================================
--- 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
 (original)
+++ 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
 Sun May 16 01:22:45 2010
@@ -1539,7 +1539,11 @@ public class TerraTableViewSkin extends 
 
                 // Ensure that the selection is visible
                 Bounds visibleSelectionBounds = 
tableView.getVisibleArea(selectionBounds);
-                if (visibleSelectionBounds.height < selectionBounds.height) {
+                if (visibleSelectionBounds != null
+                    && visibleSelectionBounds.height < selectionBounds.height) 
{
+                    // TODO Repainting the entire component is a workaround 
for PIVOT-490
+                    repaintComponent();
+
                     tableView.scrollAreaToVisible(selectionBounds);
                 }
             }