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

[noelgrandin]

Author: noelgrandin
Date: Tue Oct 25 12:49:59 2011
New Revision: 1188638

URL: http://svn.apache.org/viewvc?rev=1188638&view=rev
Log:
cleanup conditions from recent commit

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=1188638&r1=1188637&r2=1188638&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
 Tue Oct 25 12:49:59 2011
@@ -1080,7 +1080,7 @@ public class TerraListViewSkin extends C
         if (highlightIndex != -1
             && listView.getSelectMode() != ListView.SelectMode.NONE
             && showHighlight
-            && consumed == true) {
+            && consumed) {
             repaintComponent(getItemBounds(highlightIndex));
         }
 
@@ -1150,8 +1150,8 @@ public class TerraListViewSkin extends C
             }
         }
 
-// TODO: add a style "wrapSelectNext" or similar to disable this behavior (now 
enabled by default) ...
-        if (true && consumed == false)
+// TODO: add a style "wrapSelectNext" or similar to disable this behaviour 
(now enabled by default) ...
+        if (!consumed)
         {
             for (int i = 0, n = listData.getLength(); i < n; i++) {
                 if (!listView.isItemDisabled(i)) {

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=1188638&r1=1188637&r2=1188638&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
 Tue Oct 25 12:49:59 2011
@@ -32,20 +32,20 @@ import org.apache.pivot.wtk.Component;
 import org.apache.pivot.wtk.Dimensions;
 import org.apache.pivot.wtk.GraphicsUtilities;
 import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Keyboard.Modifier;
 import org.apache.pivot.wtk.Mouse;
 import org.apache.pivot.wtk.Orientation;
 import org.apache.pivot.wtk.Platform;
 import org.apache.pivot.wtk.SortDirection;
 import org.apache.pivot.wtk.Span;
 import org.apache.pivot.wtk.TableView;
+import org.apache.pivot.wtk.TableView.SelectMode;
 import org.apache.pivot.wtk.TableViewColumnListener;
 import org.apache.pivot.wtk.TableViewListener;
 import org.apache.pivot.wtk.TableViewRowListener;
 import org.apache.pivot.wtk.TableViewSelectionListener;
 import org.apache.pivot.wtk.Theme;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
-import org.apache.pivot.wtk.Keyboard.Modifier;
-import org.apache.pivot.wtk.TableView.SelectMode;
 import org.apache.pivot.wtk.skin.ComponentSkin;
 
 /**
@@ -1371,7 +1371,7 @@ public class TerraTableViewSkin extends 
         if (highlightIndex != -1
             && tableView.getSelectMode() != TableView.SelectMode.NONE
             && showHighlight
-            && consumed == true) {
+            && consumed) {
             repaintComponent(getRowBounds(highlightIndex));
         }
 

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=1188638&r1=1188637&r2=1188638&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
 Tue Oct 25 12:49:59 2011
@@ -39,19 +39,19 @@ import org.apache.pivot.wtk.Checkbox;
 import org.apache.pivot.wtk.Component;
 import org.apache.pivot.wtk.GraphicsUtilities;
 import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
+import org.apache.pivot.wtk.Keyboard.Modifier;
 import org.apache.pivot.wtk.Mouse;
 import org.apache.pivot.wtk.Orientation;
 import org.apache.pivot.wtk.Platform;
 import org.apache.pivot.wtk.Theme;
 import org.apache.pivot.wtk.TreeView;
+import org.apache.pivot.wtk.TreeView.SelectMode;
 import org.apache.pivot.wtk.TreeViewBranchListener;
 import org.apache.pivot.wtk.TreeViewListener;
 import org.apache.pivot.wtk.TreeViewNodeListener;
 import org.apache.pivot.wtk.TreeViewNodeStateListener;
 import org.apache.pivot.wtk.TreeViewSelectionListener;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
-import org.apache.pivot.wtk.Keyboard.Modifier;
-import org.apache.pivot.wtk.TreeView.SelectMode;
 import org.apache.pivot.wtk.skin.ComponentSkin;
 
 /**
@@ -1897,7 +1897,7 @@ public class TerraTreeViewSkin extends C
             break;
         }
 
-        if (consumed == true) {
+        if (consumed) {
             clearHighlightedNode();
         }