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 2009/11/02 15:51:47 UTC
svn commit: r831908 - in /incubator/pivot/trunk:
core/src/org/apache/pivot/collections/Sequence.java
wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
Author: gbrown
Date: Mon Nov 2 14:51:47 2009
New Revision: 831908
URL: http://svn.apache.org/viewvc?rev=831908&view=rev
Log:
Don't show non-directory roots in file browser; fix minor compilation issue with Sequence.Tree in Eclipse 3.3/Windows.
Modified:
incubator/pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java?rev=831908&r1=831907&r2=831908&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java Mon Nov 2 14:51:47 2009
@@ -30,7 +30,7 @@
* Collection of static utility methods providing path access to nested
* sequence data.
*/
- public static class Tree {
+ public static class Tree<T> {
/**
* An object representing a path to a nested node in nested sequence
* data.
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=831908&r1=831907&r2=831908&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Mon Nov 2 14:51:47 2009
@@ -825,9 +825,17 @@
ancestorDirectory = ancestorDirectory.getParentFile();
}
- ArrayList<File> rootFolders = new ArrayList<File>(File.listRoots());
- driveListButton.setListData(rootFolders);
- driveListButton.setVisible(rootFolders.getLength() > 1);
+ File[] roots = File.listRoots();
+ ArrayList<File> drives = new ArrayList<File>();
+ for (int i = 0; i < roots.length; i++) {
+ File root = roots[i];
+ if (root.isDirectory()) {
+ drives.add(root);
+ }
+ }
+
+ driveListButton.setListData(drives);
+ driveListButton.setVisible(drives.getLength() > 1);
File drive;
if (path.getLength() == 0) {