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 2010/07/25 20:09:04 UTC
svn commit: r979081 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraListViewSkin.java TerraTableViewSkin.java TerraTreeViewSkin.java
Author: gbrown
Date: Sun Jul 25 18:09:03 2010
New Revision: 979081
URL: http://svn.apache.org/viewvc?rev=979081&view=rev
Log:
Fix potential NPE in TerraListViewSkin, TerraTableViewSkin, and TerraTreeViewSkin.
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
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.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=979081&r1=979080&r2=979081&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 Jul 25 18:09:03 2010
@@ -268,7 +268,8 @@ public class TerraListViewSkin extends C
selectionBounds = selectionBounds.union(getItemBounds(rangeEnd));
Bounds visibleSelectionBounds = listView.getVisibleArea(selectionBounds);
- if (visibleSelectionBounds.height < selectionBounds.height) {
+ if (visibleSelectionBounds != null
+ && visibleSelectionBounds.height < selectionBounds.height) {
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=979081&r1=979080&r2=979081&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 Jul 25 18:09:03 2010
@@ -293,7 +293,8 @@ public class TerraTableViewSkin extends
selectionBounds = selectionBounds.union(getRowBounds(rangeEnd));
Bounds visibleSelectionBounds = tableView.getVisibleArea(selectionBounds);
- if (visibleSelectionBounds.height < selectionBounds.height) {
+ if (visibleSelectionBounds != null
+ && visibleSelectionBounds.height < selectionBounds.height) {
tableView.scrollAreaToVisible(selectionBounds);
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=979081&r1=979080&r2=979081&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Sun Jul 25 18:09:03 2010
@@ -1536,7 +1536,8 @@ public class TerraTreeViewSkin extends C
if (nodeBounds != null) {
Bounds visibleSelectionBounds = treeView.getVisibleArea(nodeBounds);
- if (visibleSelectionBounds.height < nodeBounds.height) {
+ if (visibleSelectionBounds != null
+ && visibleSelectionBounds.height < nodeBounds.height) {
treeView.scrollAreaToVisible(nodeBounds);
}
}