Merge pull request #126 from BobHanson/hanson1

BobHanson · web-flow · commit 44689c4877ec · 2019-11-03T23:39:03.000-06:00
minor fixes
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 @@
-20191103054350 
+20191103225630 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20191103054350 
+20191103225630 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java
@@ -4354,25 +4354,24 @@ public void paintImmediately(int x, int y, int w, int h) {
 			return;
 		}
 
-		while (!isOpaque()) {//see TextAnalyzer2 -- doesn't erase canvas on hide && ((JSComponent)c).秘paintsSelf()) {
-			parent = c.getParent();
-			if (parent != null) {
-				x += c.getX();
-				y += c.getY();
-				c = parent;
-			} else {
-				break;
-			}
-
-			if (!(c instanceof JComponent)) {
-				break;
-			}
-		}
-		if (c instanceof JComponent) {
-			((JComponent) c)._paintImmediately(x, y, w, h);
-		} else {
-			c.repaint(x, y, w, h);
-		}
+		// Get back to first opaque self or parent so as to draw the background and all parts in between, in order.
+		while (!c.isOpaque() && (parent = c.getParent()) != null) {//see TextAnalyzer2 -- doesn't erase canvas on hide && ((JSComponent)c).秘paintsSelf()) {
+			x += c.getX();
+			y += c.getY();
+			c = parent;
+		}
+		((JComponent) c)._paintImmediately(x, y, w, h);
+
+// SwingJS everything is a JComponent
+//			if (!(c instanceof JComponent)) {
+//				break;
+//			}
+//		}
+//		if (c instanceof JComponent) {
+//			((JComponent) c)._paintImmediately(x, y, w, h);
+//		} else {
+//			c.repaint(x, y, w, h);
+//		}
 	}
 
 	/**
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
@@ -798,6 +798,8 @@ public void run() {
 			JSUtil.J2S.getFileFromDialog(/**@j2sNative function(file){r.run$(file)}||*/ null, "java.io.File");			
 			return JDialog.ASYNCHRONOUS_INTEGER;
 		case SAVE_DIALOG:
+			if (selectedFile != null)
+				lastFileName = selectedFile.getName();
 			String name = JSUtil.prompt((dialogTitle == null ? "File to Save?" : dialogTitle), lastFileName);
 			if (name == null)
 				return CANCEL_OPTION;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java
@@ -196,7 +196,10 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 				 * 			jQueryEvent.preventDefault(); jQueryEvent.stopPropagation();
 				 */
 				// fall through
-			case KeyEvent.VK_SHIFT:
+				//case KeyEvent.VK_SHIFT: 
+					//BH note 2019.11.03 
+					//Including VK_SHIFT here caused Firefox to ignore a first upper-case L in 
+					//SequenceSearcher pattern JTextField
 			case KeyEvent.VK_CONTROL:
 				ret = HANDLED;
 				break;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/TextListener.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/TextListener.java
@@ -142,7 +142,7 @@ void handleJSTextEvent(JSTextUI ui, int eventType, Object jqevent) {
 			} else if (keyCode != KeyEvent.VK_BACK_SPACE){
 				setCaret = false;
 			}
-			if (lastKeyEvent != KeyEvent.KEY_TYPED)
+			if (lastKeyEvent != KeyEvent.KEY_TYPED);// could be lastKeyEvent == 0 ??
 			  break;
 			// fall through if this is a continuation press
 		case KeyEvent.KEY_RELEASED:
diff --git a/sources/net.sf.j2s.java.core/src/test/async/AsyncDialog.java b/sources/net.sf.j2s.java.core/src/test/async/AsyncDialog.java
@@ -11,7 +11,7 @@
 import javax.swing.JOptionPane;
 
 /**
- * A class to manage asynchronous input and confirmation dialogs.
+ * A class to manage asynchronous input, option, and confirmation dialogs.
  * 
  * @author Bob Hanson hansonr
  *
@@ -21,6 +21,7 @@ public class AsyncDialog extends Window implements PropertyChangeListener {
 
 	private ActionListener actionListener;
 	private Object choice;
+	private String[] options;
 
 	public AsyncDialog(ActionListener a) {
 		super(null);
@@ -35,51 +36,72 @@ public AsyncDialog(ActionListener a) {
 	public void propertyChange(PropertyChangeEvent evt) {
 		switch (evt.getPropertyName()) {
 		case "value":
-			process(evt.getNewValue());
+			Object val = evt.getNewValue();
+			if (options != null) {
+				int i;
+				for (i = 0; i < options.length; i++) {
+					if (options[i] == val) 
+						break;
+				}
+				val = Integer.valueOf(i < options.length ? i : JOptionPane.CLOSED_OPTION);
+			}
+			process(val);
 		}
 	}
 
-	public void showInputDialog(Component frame, String message, String title, int type,
-			Icon icon, Integer[] choices, Integer initialChoice) {
-		if (frame != null) {
-			setBounds(frame.getBounds());
-		}
+	// These options can be supplemented as desired.
+
+	public void showInputDialog(Component frame, String message, String title, int type, Icon icon, Integer[] choices,
+			Integer initialChoice) {
+		setFrame(frame);
 		process(JOptionPane.showInputDialog(this, message, title, type, icon, choices, initialChoice));
 	}
 
+	public void showOptionDialog(Component frame, String message, String title, int optionType, int messageType,
+			Icon icon, String[] options, String initialValue) {
+		setFrame(frame);
+		this.options = options;
+		process(JOptionPane.showOptionDialog(this, message, title, optionType, messageType, icon, options,
+				initialValue));
+	}
+
 	public void showConfirmDialog(Component frame, String message, String title, int optionType) {
 		showConfirmDialog(frame, message, title, optionType, JOptionPane.QUESTION_MESSAGE);
 	}
 
 	public void showConfirmDialog(Component frame, String message, String title, int optionType, int messageType) {
+		setFrame(frame);
+		process(JOptionPane.showConfirmDialog(this, message, title, optionType, messageType));
+	}
+
+	private void setFrame(Component frame) {
 		if (frame != null) {
 			setBounds(frame.getBounds());
 		}
-		process(JOptionPane.showConfirmDialog(this, message, title, optionType, messageType));
 	}
 
 	private boolean processed;
-	
+
 	/**
 	 * Return for confirm dialog.
 	 * 
-	 * @param ret  may be JavaScript NaN, testable as ret != ret or ret != - -ret
+	 * @param ret may be JavaScript NaN, testable as ret != ret or ret != - -ret
 	 */
 	private void process(int ret) {
 		if (ret != - -ret || processed)
 			return;
 		process(new Integer(ret));
 	}
-	
+
 	private void process(Object ret) {
 		if (ret instanceof javax.swing.plaf.UIResource || processed)
 			return;
 		processed = true;
-		choice = ret;	
+		choice = ret;
 		actionListener.actionPerformed(new ActionEvent(this, 0, "SelectedOption"));
 		dispose();
 	}
-	
+
 	/**
 	 * retrieve selection from the ActionEvent, for which "this" is getSource()
 	 * 
@@ -95,5 +117,5 @@ public int getOption() {
 		}
 		return ((Integer) choice).intValue();
 	}
-	
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/async/AsyncFileChooser.java b/sources/net.sf.j2s.java.core/src/test/async/AsyncFileChooser.java
@@ -14,7 +14,6 @@
  * @author Bob Hanson
  */
 
-@SuppressWarnings("serial")
 public class AsyncFileChooser extends JFileChooser implements PropertyChangeListener {
 
 	private Runnable ok, cancel;
@@ -32,6 +31,41 @@ public AsyncFileChooser(File file, FileSystemView view) {
 		super(file, view);
 	}
 
+	@Deprecated
+	public int showDialog(Component frame) {
+		return err();
+	}
+
+	@Override
+	@Deprecated
+	public int showDialog(Component frame, String type) {
+		
+		// this method will be called from super constructor(frame)
+		
+		return (ok == null ? err() : super.showDialog(frame,  type));
+	}
+
+	@Override
+	@Deprecated
+	public int showOpenDialog(Component frame) {
+		return err();
+	}
+
+	@Override
+	@Deprecated
+	public int showSaveDialog(Component frame) {
+		return err();
+	}
+
+	private int err() {
+		try {
+			throw new java.lang.IllegalAccessException("Warning! AsyncFileChooser interface bypassed!");
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+		}
+		return JFileChooser.CANCEL_OPTION;
+	}
+
 	/**
 	 * 
 	 * @param frame
@@ -43,19 +77,19 @@ public AsyncFileChooser(File file, FileSystemView view) {
 	public int showDialog(Component frame, String type, Runnable ok, Runnable cancel) {
 		this.ok = ok;
 		this.cancel = cancel;
-		return process(showDialog(frame, type));
+		return process(super.showDialog(frame, type));
 	}
 
 	public void showOpenDialog(Component frame, Runnable ok, Runnable cancel) {
 		this.ok = ok;
 		this.cancel = cancel;
-		process(showOpenDialog(frame));
+		process(super.showOpenDialog(frame));
 	}
 
 	public void showSaveDialog(Component frame, Runnable ok, Runnable cancel) {
 		this.ok = ok;
 		this.cancel = cancel;
-		process(showSaveDialog(frame));
+		process(super.showSaveDialog(frame));
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ void handleJSTextEvent(JSTextUI ui, int eventType, Object jqevent) {`
`142`	`142`	`} else if (keyCode != KeyEvent.VK_BACK_SPACE){`
`143`	`143`	`setCaret = false;`
`144`	`144`	`}`
`145`		`- if (lastKeyEvent != KeyEvent.KEY_TYPED)`
	`145`	`+ if (lastKeyEvent != KeyEvent.KEY_TYPED);// could be lastKeyEvent == 0 ??`
`146`	`146`	`break;`
`147`	`147`	`// fall through if this is a continuation press`
`148`	`148`	`case KeyEvent.KEY_RELEASED:`