AsyncFileChooser save should clear ok,cancel

hansonr · hansonr · commit d7f830d0bfd1 · 2020-07-16T06:06:06.000-05:00
- in case this is a static chooser being reused.
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20200714124718 
+20200715193703 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200714124718 
+20200715193703 
diff --git a/sources/net.sf.j2s.java.core/src/javajs/async/AsyncFileChooser.java b/sources/net.sf.j2s.java.core/src/javajs/async/AsyncFileChooser.java
@@ -66,6 +66,7 @@ public int showOpenDialog(Component frame) {
 	@Override
 	public int showSaveDialog(Component frame) {
 		isAsyncSave  = false;
+		ok = cancel = null;
 		return super.showSaveDialog(frame);
 	}
 
@@ -187,6 +188,7 @@ public void propertyChange(PropertyChangeEvent evt) {
 		switch (evt.getPropertyName()) {
 		case "SelectedFile":
 		case "SelectedFiles":
+			
 			process(optionSelected = (evt.getNewValue() == null ? CANCEL_OPTION : APPROVE_OPTION));
 			break;
 		}
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JFileChooser.java b/sources/net.sf.j2s.java.core/src/javax/swing/JFileChooser.java
@@ -521,9 +521,9 @@ public void setSelectedFile(File file) {
             if (file.isAbsolute() && !isParent(getCurrentDirectory(), selectedFile)) {
                 setCurrentDirectory(selectedFile.getParentFile());
             }
-            if (!isMultiSelectionEnabled() || selectedFiles == null || selectedFiles.length == 1) {
-                ensureFileIsVisible(selectedFile);
-            }
+//            if (!isMultiSelectionEnabled() || selectedFiles == null || selectedFiles.length == 1) {
+//                ensureFileIsVisible(selectedFile);
+//            }
         }
         firePropertyChange(SELECTED_FILE_CHANGED_PROPERTY, oldValue, selectedFile);
     }
@@ -789,14 +789,18 @@ public int showDialog(Component parent, String approveButtonText) {
 
 						@Override
 						public void run() {
+							File[] files = null;
+							File file = null;
 							/**
 							 * @j2sNative
 							 * 
-							 * this.b$['javax.swing.JFileChooser'].selectedFiles = arguments[0] || null;
-							 * this.b$['javax.swing.JFileChooser'].selectedFile = arguments[0][0] || null;
+							 * files = arguments[0] || null;
+							 * file = arguments[0][0] || null;
 							 * 
 							 * 
 							 */
+							selectedFiles = files;
+							selectedFile = file;
 							firePropertyChange("SelectedFiles", null, selectedFiles);
 						}
 						
@@ -808,13 +812,15 @@ public void run() {
 
 				@Override
 				public void run() {
+					File file = null;
 					/**
 					 * @j2sNative
 					 * 
-					 * this.b$['javax.swing.JFileChooser'].selectedFile = arguments[0] || null;
+					 * file = arguments[0] || null;
 					 * 
 					 * 
 					 */
+					selectedFile = file;
 					firePropertyChange("SelectedFile", null, selectedFile);
 				}
 				

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public int showOpenDialog(Component frame) {`
`66`	`66`	`@Override`
`67`	`67`	`public int showSaveDialog(Component frame) {`
`68`	`68`	`isAsyncSave = false;`
	`69`	`+ ok = cancel = null;`
`69`	`70`	`return super.showSaveDialog(frame);`
`70`	`71`	`}`
`71`	`72`
`@@ -187,6 +188,7 @@ public void propertyChange(PropertyChangeEvent evt) {`
`187`	`188`	`switch (evt.getPropertyName()) {`
`188`	`189`	`case "SelectedFile":`
`189`	`190`	`case "SelectedFiles":`
	`191`	`+`
`190`	`192`	`process(optionSelected = (evt.getNewValue() == null ? CANCEL_OPTION : APPROVE_OPTION));`
`191`	`193`	`break;`
`192`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -521,9 +521,9 @@ public void setSelectedFile(File file) {`
`521`	`521`	`if (file.isAbsolute() && !isParent(getCurrentDirectory(), selectedFile)) {`
`522`	`522`	`setCurrentDirectory(selectedFile.getParentFile());`
`523`	`523`	`}`
`524`		`- if (!isMultiSelectionEnabled() \|\| selectedFiles == null \|\| selectedFiles.length == 1) {`
`525`		`- ensureFileIsVisible(selectedFile);`
`526`		`- }`
	`524`	`+// if (!isMultiSelectionEnabled() \|\| selectedFiles == null \|\| selectedFiles.length == 1) {`
	`525`	`+// ensureFileIsVisible(selectedFile);`
	`526`	`+// }`
`527`	`527`	`}`
`528`	`528`	`firePropertyChange(SELECTED_FILE_CHANGED_PROPERTY, oldValue, selectedFile);`
`529`	`529`	`}`
`@@ -789,14 +789,18 @@ public int showDialog(Component parent, String approveButtonText) {`
`789`	`789`
`790`	`790`	`@Override`
`791`	`791`	`public void run() {`
	`792`	`+ File[] files = null;`
	`793`	`+ File file = null;`
`792`	`794`	`/**`
`793`	`795`	`* @j2sNative`
`794`	`796`	`*`
`795`		`- * this.b$['javax.swing.JFileChooser'].selectedFiles = arguments[0] \|\| null;`
`796`		`- * this.b$['javax.swing.JFileChooser'].selectedFile = arguments[0][0] \|\| null;`
	`797`	`+ * files = arguments[0] \|\| null;`
	`798`	`+ * file = arguments[0][0] \|\| null;`
`797`	`799`	`*`
`798`	`800`	`*`
`799`	`801`	`*/`
	`802`	`+ selectedFiles = files;`
	`803`	`+ selectedFile = file;`
`800`	`804`	`firePropertyChange("SelectedFiles", null, selectedFiles);`
`801`	`805`	`}`
`802`	`806`
`@@ -808,13 +812,15 @@ public void run() {`
`808`	`812`
`809`	`813`	`@Override`
`810`	`814`	`public void run() {`
	`815`	`+ File file = null;`
`811`	`816`	`/**`
`812`	`817`	`* @j2sNative`
`813`	`818`	`*`
`814`		`- * this.b$['javax.swing.JFileChooser'].selectedFile = arguments[0] \|\| null;`
	`819`	`+ * file = arguments[0] \|\| null;`
`815`	`820`	`*`
`816`	`821`	`*`
`817`	`822`	`*/`
	`823`	`+ selectedFile = file;`
`818`	`824`	`firePropertyChange("SelectedFile", null, selectedFile);`
`819`	`825`	`}`
`820`	`826`