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 2012/05/08 17:18:56 UTC
svn commit: r1335579 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
FileBrowser.java FileBrowserSheet.java
Author: smartini
Date: Tue May 8 15:18:56 2012
New Revision: 1335579
URL: http://svn.apache.org/viewvc?rev=1335579&view=rev
Log:
PIVOT-832, add even rootFolder in a new version of the constructor, and small fixes to check for not equals
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java?rev=1335579&r1=1335578&r2=1335579&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java Tue May 8 15:18:56 2012
@@ -36,6 +36,8 @@ public class FileBrowser extends Contain
public File getFileAt(int x, int y);
}
+ private static final String USER_HOME = System.getProperty("user.home");
+
private static class FileBrowserListenerList extends WTKListenerList<FileBrowserListener>
implements FileBrowserListener {
@Override
@@ -91,8 +93,18 @@ public class FileBrowser extends Contain
private FileBrowserListenerList fileBrowserListeners = new FileBrowserListenerList();
public FileBrowser() {
- String userHome = System.getProperty("user.home");
- rootDirectory = new File(userHome);
+ this(USER_HOME);
+ }
+
+ public FileBrowser(String rootFolder) {
+ if (rootFolder == null) {
+ throw new IllegalArgumentException();
+ }
+
+ rootDirectory = new File(rootFolder);
+ if (!rootDirectory.isDirectory()) {
+ throw new IllegalArgumentException();
+ }
installSkin(FileBrowser.class);
}
@@ -121,7 +133,7 @@ public class FileBrowser extends Contain
if (rootDirectory.exists()) {
File previousRootDirectory = this.rootDirectory;
- if (previousRootDirectory != rootDirectory) {
+ if (!rootDirectory.equals(previousRootDirectory)) {
this.rootDirectory = rootDirectory;
selectedFiles.clear();
fileBrowserListeners.rootDirectoryChanged(this, previousRootDirectory);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=1335579&r1=1335578&r2=1335579&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Tue May 8 15:18:56 2012
@@ -39,6 +39,8 @@ public class FileBrowserSheet extends Sh
SAVE_TO
}
+ private static final String USER_HOME = System.getProperty("user.home");
+
private static class FileBrowserSheetListenerList
extends WTKListenerList<FileBrowserSheetListener>
implements FileBrowserSheetListener {
@@ -88,10 +90,24 @@ public class FileBrowserSheet extends Sh
}
public FileBrowserSheet(Mode mode) {
+ this(Mode.OPEN, USER_HOME);
+ }
+
+ public FileBrowserSheet(Mode mode, String rootFolder) {
+ if (mode == null) {
+ throw new IllegalArgumentException();
+ }
+
+ if (rootFolder == null) {
+ throw new IllegalArgumentException();
+ }
+
this.mode = mode;
- String userHome = System.getProperty("user.home");
- rootDirectory = new File(userHome);
+ rootDirectory = new File(rootFolder);
+ if (!rootDirectory.isDirectory()) {
+ throw new IllegalArgumentException();
+ }
installSkin(FileBrowserSheet.class);
}
@@ -126,7 +142,7 @@ public class FileBrowserSheet extends Sh
if (rootDirectory.exists()) {
File previousRootDirectory = this.rootDirectory;
- if (previousRootDirectory != rootDirectory) {
+ if (!rootDirectory.equals(previousRootDirectory)) {
this.rootDirectory = rootDirectory;
selectedFiles.clear();
fileBrowserSheetListeners.rootDirectoryChanged(this, previousRootDirectory);