You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2011/12/05 05:50:08 UTC
svn commit: r1210331 -
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
Author: rwhitcomb
Date: Mon Dec 5 04:50:08 2011
New Revision: 1210331
URL: http://svn.apache.org/viewvc?rev=1210331&view=rev
Log:
PIVOT-825 (additional problem)
Moved code around in the "previewSheetClose" method of
TerraFileBrowserSheetSkin so that the selected file(s) are
set before the super.previewSheetClose method is called, so
that any listeners will have a correct notion of what file
is being selected.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=1210331&r1=1210330&r2=1210331&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Mon Dec 5 04:50:08 2011
@@ -265,44 +265,43 @@ public class TerraFileBrowserSheetSkin e
&& !okButton.isEnabled()) {
vote = Vote.DENY;
} else {
- vote = super.previewSheetClose(sheet, result);
- }
+ if (result) {
+ updatingSelection = true;
- if (vote == Vote.APPROVE
- && result) {
- updatingSelection = true;
-
- FileBrowserSheet fileBrowserSheet = (FileBrowserSheet)sheet;
- FileBrowserSheet.Mode mode = fileBrowserSheet.getMode();
-
- switch (mode) {
- case OPEN:
- case OPEN_MULTIPLE:
- case SAVE_TO: {
- fileBrowserSheet.setSelectedFiles(fileBrowser.getSelectedFiles());
- break;
- }
+ FileBrowserSheet fileBrowserSheet = (FileBrowserSheet)sheet;
+ FileBrowserSheet.Mode mode = fileBrowserSheet.getMode();
- case SAVE_AS: {
- String fileName = saveAsTextInput.getText();
- File selectedFile = new File(fileName);
- File parentFile = selectedFile.getParentFile();
- if (parentFile == null) {
- selectedFile = new File(fileBrowser.getRootDirectory(), fileName);
- } else {
- if (parentFile.isAbsolute() || parentFile.getPath().startsWith(File.separator)) {
- fileBrowserSheet.setRootDirectory(parentFile.getAbsoluteFile());
+ switch (mode) {
+ case OPEN:
+ case OPEN_MULTIPLE:
+ case SAVE_TO: {
+ fileBrowserSheet.setSelectedFiles(fileBrowser.getSelectedFiles());
+ break;
+ }
+
+ case SAVE_AS: {
+ String fileName = saveAsTextInput.getText();
+ File selectedFile = new File(fileName);
+ File parentFile = selectedFile.getParentFile();
+ if (parentFile == null) {
+ selectedFile = new File(fileBrowser.getRootDirectory(), fileName);
} else {
- fileBrowserSheet.setRootDirectory(new File(fileBrowser.getRootDirectory(), parentFile.getName()));
- selectedFile = new File(selectedFile.getName());
+ if (parentFile.isAbsolute() || parentFile.getPath().startsWith(File.separator)) {
+ fileBrowserSheet.setRootDirectory(parentFile.getAbsoluteFile());
+ } else {
+ fileBrowserSheet.setRootDirectory(new File(fileBrowser.getRootDirectory(), parentFile.getName()));
+ selectedFile = new File(selectedFile.getName());
+ }
}
+ fileBrowserSheet.setSelectedFiles(new ArrayList<File>(selectedFile));
+ break;
}
- fileBrowserSheet.setSelectedFiles(new ArrayList<File>(selectedFile));
- break;
}
+
+ updatingSelection = false;
}
- updatingSelection = false;
+ vote = super.previewSheetClose(sheet, result);
}
return vote;