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/08/18 21:54:18 UTC
svn commit: r805555 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: FileBrowser.java
FileBrowserSheet.java skin/terra/TerraFileBrowserSheetSkin.java
skin/terra/TerraFileBrowserSkin.java
Author: gbrown
Date: Tue Aug 18 19:54:18 2009
New Revision: 805555
URL: http://svn.apache.org/viewvc?rev=805555&view=rev
Log:
Use absolute paths in file selection in file browser/sheet.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java?rev=805555&r1=805554&r2=805555&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java Tue Aug 18 19:54:18 2009
@@ -102,14 +102,18 @@
*/
public void setSelectedFolder(Folder selectedFolder) {
if (selectedFolder == null) {
- throw new IllegalArgumentException("selectedFolder is null.");
+ throw new IllegalArgumentException();
}
- Folder previousSelectedFolder = this.selectedFolder;
- if (previousSelectedFolder != selectedFolder) {
- this.selectedFolder = selectedFolder;
- fileSelection.clear();
- fileBrowserListeners.selectedFolderChanged(this, previousSelectedFolder);
+ if (selectedFolder.exists()) {
+ Folder previousSelectedFolder = this.selectedFolder;
+ if (previousSelectedFolder != selectedFolder) {
+ this.selectedFolder = selectedFolder;
+ fileSelection.clear();
+ fileBrowserListeners.selectedFolderChanged(this, previousSelectedFolder);
+ }
+ } else {
+ setSelectedFolder(new Folder(selectedFolder.getParent()));
}
}
@@ -123,6 +127,18 @@
* selected.
*/
public boolean addSelectedFile(File file) {
+ if (file == null) {
+ throw new IllegalArgumentException();
+ }
+
+ if (file.isAbsolute()) {
+ if (!file.getParentFile().equals(selectedFolder)) {
+ throw new IllegalArgumentException();
+ }
+ } else {
+ file = new File(selectedFolder, file.getPath());
+ }
+
int index = fileSelection.add(file);
if (index != -1) {
fileBrowserListeners.selectedFileAdded(this, file);
@@ -141,6 +157,10 @@
* already selected.
*/
public boolean removeSelectedFile(File file) {
+ if (file == null) {
+ throw new IllegalArgumentException();
+ }
+
int index = fileSelection.remove(file);
if (index != -1) {
fileBrowserListeners.selectedFileRemoved(this, file);
@@ -180,8 +200,7 @@
* Returns the currently selected files.
*
* @return
- * An immutable list of selected files. The file paths are relative to
- * the currently selected folder.
+ * An immutable list of selected files.
*/
public Sequence<File> getSelectedFiles() {
return new ImmutableList<File>(fileSelection);
@@ -191,8 +210,7 @@
* Sets the selected files.
*
* @param selectedFiles
- * The files to select. The file paths are relative to the currently
- * selected folder.
+ * The files to select.
*
* @return
* The files that were selected, with duplicates eliminated.
@@ -218,6 +236,14 @@
throw new IllegalArgumentException("file is null.");
}
+ if (file.isAbsolute()) {
+ if (!file.getParentFile().equals(selectedFolder)) {
+ throw new IllegalArgumentException("file is not a descendant of selected folder.");
+ }
+ } else {
+ file = new File(selectedFolder, file.getPath());
+ }
+
fileSelection.add(file);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=805555&r1=805554&r2=805555&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Tue Aug 18 19:54:18 2009
@@ -92,13 +92,18 @@
public void setSelectedFolder(Folder selectedFolder) {
if (selectedFolder == null) {
- throw new IllegalArgumentException("selectedFolder is null.");
+ throw new IllegalArgumentException();
}
- Folder previousSelectedFolder = this.selectedFolder;
- if (previousSelectedFolder != selectedFolder) {
- this.selectedFolder = selectedFolder;
- fileBrowserSheetListeners.selectedFolderChanged(this, previousSelectedFolder);
+ if (selectedFolder.exists()) {
+ Folder previousSelectedFolder = this.selectedFolder;
+ if (previousSelectedFolder != selectedFolder) {
+ this.selectedFolder = selectedFolder;
+ fileSelection.clear();
+ fileBrowserSheetListeners.selectedFolderChanged(this, previousSelectedFolder);
+ }
+ } else {
+ setSelectedFolder(new Folder(selectedFolder.getParent()));
}
}
@@ -133,8 +138,7 @@
* Returns the currently selected files.
*
* @return
- * An immutable list of selected files. The file paths are relative to
- * the currently selected folder.
+ * An immutable list of selected files.
*/
public Sequence<File> getSelectedFiles() {
return new ImmutableList<File>(fileSelection);
@@ -144,8 +148,7 @@
* Sets the selected files.
*
* @param selectedFiles
- * The files to select. The file paths are relative to the currently
- * selected folder.
+ * The files to select.
*
* @return
* The files that were selected, with duplicates eliminated.
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=805555&r1=805554&r2=805555&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Tue Aug 18 19:54:18 2009
@@ -109,8 +109,6 @@
fileBrowser.getFileBrowserListeners().add(new FileBrowserListener.Adapter() {
public void selectedFileAdded(FileBrowser fileBrowser, File file) {
- file = new File(fileBrowser.getSelectedFolder(), file.getName());
-
if (file.isDirectory()) {
selectedDirectoryCount++;
}
@@ -119,8 +117,6 @@
}
public void selectedFileRemoved(FileBrowser fileBrowser, File file) {
- file = new File(fileBrowser.getSelectedFolder(), file.getName());
-
if (file.isDirectory()) {
selectedDirectoryCount--;
}
@@ -135,7 +131,6 @@
Sequence<File> selectedFiles = fileBrowser.getSelectedFiles();
for (int i = 0, n = selectedFiles.getLength(); i < n; i++) {
File selectedFile = selectedFiles.get(i);
- selectedFile = new File(fileBrowser.getSelectedFolder(), selectedFile.getName());
if (selectedFile.isDirectory()) {
selectedDirectoryCount++;
@@ -147,11 +142,8 @@
if (selectedFile == null) {
saveAsTextInput.setText("");
- } else {
- selectedFile = new File(fileBrowser.getSelectedFolder(), selectedFile.getName());
- if (!selectedFile.isDirectory()) {
- saveAsTextInput.setText(selectedFile.getName());
- }
+ } else if (!selectedFile.isDirectory()) {
+ saveAsTextInput.setText(selectedFile.getName());
}
}
@@ -256,7 +248,7 @@
case SAVE_AS: {
String fileName = saveAsTextInput.getText();
- File selectedFile = new File(fileName);
+ File selectedFile = new File(fileBrowser.getSelectedFolder(), fileName);
fileBrowserSheet.setSelectedFiles(new ArrayList<File>(selectedFile));
break;
}
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=805555&r1=805554&r2=805555&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 Tue Aug 18 19:54:18 2009
@@ -345,8 +345,6 @@
Folder selectedFolder = (Folder)tableView.getTableData();
for (int i = rangeStart; i <= rangeEnd; i++) {
File file = selectedFolder.get(i);
- file = getRelativeFile(selectedFolder, file);
-
fileBrowser.addSelectedFile(file);
}
@@ -359,8 +357,6 @@
Folder selectedFolder = (Folder)tableView.getTableData();
for (int i = rangeStart; i <= rangeEnd; i++) {
File file = selectedFolder.get(i);
- file = getRelativeFile(selectedFolder, file);
-
fileBrowser.removeSelectedFile(file);
}
@@ -371,12 +367,10 @@
public void selectedRangesChanged(TableView tableView, Sequence<Span> previousSelectedRanges) {
updatingSelection = true;
- Folder selectedFolder = (Folder)tableView.getTableData();
-
Sequence<File> files = (Sequence<File>)tableView.getSelectedRows();
for (int i = 0, n = files.getLength(); i < n; i++) {
File file = files.get(i);
- files.update(i, getRelativeFile(selectedFolder, file));
+ files.update(i, file);
}
fileBrowser.setSelectedFiles(files);
@@ -475,12 +469,11 @@
fileTableView.requestFocus();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public void selectedFileAdded(FileBrowser fileBrowser, File file) {
if (!updatingSelection) {
- // TODO This won't work because the table contains absolute files, while the selection
- // does not
List<File> fileTableData = (List<File>)fileTableView.getTableData();
+
int index = fileTableData.indexOf(file);
if (index != -1) {
fileTableView.addSelectedIndex(index);
@@ -491,9 +484,8 @@
@SuppressWarnings("unchecked")
public void selectedFileRemoved(FileBrowser fileBrowser, File file) {
if (!updatingSelection) {
- // TODO This won't work because the table contains absolute files, while the selection
- // does not
List<File> fileTableData = (List<File>)fileTableView.getTableData();
+
int index = fileTableData.indexOf(file);
if (index != -1) {
fileTableView.removeSelectedIndex(index);
@@ -501,20 +493,26 @@
}
}
+ @SuppressWarnings("unchecked")
public void selectedFilesChanged(FileBrowser fileBrowser, Sequence<File> previousSelectedFiles) {
if (!updatingSelection) {
- // TODO Reset the selection
+ fileTableView.clearSelection();
+
+ List<File> fileTableData = (List<File>)fileTableView.getTableData();
+ Sequence<File> selectedFiles = fileBrowser.getSelectedFiles();
+
+ for (int i = 0, n = selectedFiles.getLength(); i < n; i++) {
+ File selectedFile = selectedFiles.get(i);
+
+ int index = fileTableData.indexOf(selectedFile);
+ if (index != -1) {
+ fileTableView.addSelectedIndex(index);
+ }
+ }
}
}
public void disabledFileFilterChanged(FileBrowser fileBrowser, Filter<File> previousDisabledFileFilter) {
fileTableView.setDisabledRowFilter(fileBrowser.getDisabledFileFilter());
}
-
- public static File getRelativeFile(Folder folder, File file) {
- String path = file.getPath();
- path = path.substring(folder.getPath().length() + 1);
-
- return new File(path);
- }
}