You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/09/03 13:51:25 UTC

svn commit: r810901 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra: TerraTableViewHeaderSkin.java TerraTreeViewSkin.java

Author: smartini
Date: Thu Sep  3 11:51:25 2009
New Revision: 810901

URL: http://svn.apache.org/viewvc?rev=810901&view=rev
Log:
fix some warnings, from netbeans

Modified:
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=810901&r1=810900&r2=810901&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Thu Sep  3 11:51:25 2009
@@ -122,8 +122,8 @@
     private static final int RESIZE_HANDLE_SIZE = 6;
     public static final int MINIMUM_COLUMN_WIDTH = 2;
 
-    protected SortIndicatorImage sortAscendingImage = new SortIndicatorImage(SortDirection.ASCENDING);
-    protected SortIndicatorImage sortDescendingImage = new SortIndicatorImage(SortDirection.DESCENDING);
+    private SortIndicatorImage sortAscendingImage = new SortIndicatorImage(SortDirection.ASCENDING);
+    private SortIndicatorImage sortDescendingImage = new SortIndicatorImage(SortDirection.DESCENDING);
 
     public TerraTableViewHeaderSkin() {
         TerraTheme theme = (TerraTheme)Theme.getTheme();

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=810901&r1=810900&r2=810901&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Thu Sep  3 11:51:25 2009
@@ -1225,7 +1225,8 @@
                 // descendant of our younger sibling
                 for (int n = visibleNodes.getLength(), nodeDepth = youngerSibling.depth;
                     insertIndex < n && visibleNodes.get(insertIndex).depth > nodeDepth;
-                    insertIndex++);
+                    insertIndex++) {
+                }
             }
 
             visibleNodes.insert(nodeInfo, insertIndex);
@@ -1276,7 +1277,8 @@
                 // it's a descendant of the last child node
                 for (int n = visibleNodes.getLength(), nodeDepth = last.depth;
                     rangeEnd < n && visibleNodes.get(rangeEnd).depth > nodeDepth;
-                    rangeEnd++);
+                    rangeEnd++) {
+                }
 
                 visibleNodes.remove(rangeStart, rangeEnd - rangeStart);
 



Re: svn commit: r810901 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra: TerraTableViewHeaderSkin.java TerraTreeViewSkin.java

Posted by Sandro Martini <sa...@gmail.com>.
Hi Greg,
I haven't modified the logic in the loop to avoid problems ... i can
try to make what you say, but to ensure that all works good, what
tests con i make after: at least do you remember a class to run and
see if all it's good ?

Bye

Re: svn commit: r810901 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra: TerraTableViewHeaderSkin.java TerraTreeViewSkin.java

Posted by Greg Brown <gk...@mac.com>.
>                 for (int n = visibleNodes.getLength(), nodeDepth =  
> youngerSibling.depth;
>                     insertIndex < n &&  
> visibleNodes.get(insertIndex).depth > nodeDepth;
> -                    insertIndex++);
> +                    insertIndex++) {
> +                }
>             }
>

This could also be written as a while loop, where the index is  
incremented within the block (eliminating the empty braces).