tests and SwingJS-site.zip

BobHanson · BobHanson · commit af92bc03b75a · 2020-05-16T01:59:31.000-05:00
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 @@
-20200506131724 
+20200516014108 
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 @@
-20200506131724 
+20200516014108 
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/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -121,7 +121,7 @@ public void processKeyEvent(KeyEvent e, MenuElement[] path, MenuSelectionManager
 			super.processKeyEvent(e, path, m);
 		}
 	};
-
+	
 	int nAction = 0;
 
 	ActionListener listener = new ActionListener() {
@@ -197,6 +197,27 @@ public void keyReleased(KeyEvent e) {
 		frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
 
 		menu = new JMenu("TESTING");
+		
+		menu.addMenuListener(new MenuListener() {
+
+			@Override
+			public void menuSelected(MenuEvent e) {
+				System.out.println("menu MenuListener sel " + e);
+			}
+
+			@Override
+			public void menuDeselected(MenuEvent e) {
+				System.out.println("menu MenuListener des " + e);
+			}
+
+			@Override
+			public void menuCanceled(MenuEvent e) {
+				System.out.println("menu MenuListener can " + e);
+			}
+				
+			});
+
+
 		menu1 = new JMenu("testing1");
 		menu2 = new JMenu("testing2");
 		menu.setHorizontalAlignment(SwingConstants.RIGHT);
@@ -591,6 +612,27 @@ public void actionPerformed(ActionEvent e) {
 		mRight.add(rb1m);
 //		mRight.addMenuListener(this);
 
+		
+		 mRight.addMenuListener(new MenuListener() {
+
+			@Override
+			public void menuSelected(MenuEvent e) {
+				System.out.println("mRight MenuListener sel " + e);
+			}
+
+			@Override
+			public void menuDeselected(MenuEvent e) {
+				System.out.println("mRight MenuListener des " + e);
+			}
+
+			@Override
+			public void menuCanceled(MenuEvent e) {
+				System.out.println("mRight MenuListener can " + e);
+			}
+				
+			});
+
+
 		btn = new JMenuItem("-");
 		btn.setFont(font);
 		mRight.add(btn);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Dialog.java b/sources/net.sf.j2s.java.core/src/test/Test_Dialog.java
@@ -86,10 +86,12 @@ public void propertyChange(PropertyChangeEvent event) {
 	}
 
 	// JSComponent.DialogCaller interface
-	public void onDialogReturn(int value) {
+	public void onDialogReturn(int value) {	
 		if (value != Math.floor(value))
 			return; // in JavaScript, this will be NaN
 		System.out.println("int value is " + value);
+		
+	status.setText("You chose option " + value);
 	}
 
 	// JSComponent.DialogCaller interface
@@ -166,6 +168,20 @@ public void actionPerformed(ActionEvent e) {
 		});
 		p.add(b);
 
+
+		b = new JButton("OptionDialog");
+		b.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				Test_Dialog.this.onDialogReturn(JOptionPane.showOptionDialog(Test_Dialog.this, "Pick one of the following three options:", "Option title",
+						0, 0, null, new Object[] {"Option A", "Option B", "Option C"} , "Option B"));
+			}
+
+		});
+		p.add(b);
+
+		
 		b = new JButton("FileOpenDialog");
 		b.addActionListener(new ActionListener() {
 
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Dialog2.java b/sources/net.sf.j2s.java.core/src/test/Test_Dialog2.java
@@ -137,6 +137,28 @@ public void actionPerformed(ActionEvent e) {
 		});
 		p.add(b);
 
+		b = new JButton("OptionDialog");
+		b.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				new AsyncDialog().showOptionDialog(Test_Dialog2.this, "Pick one of the following three options:", "Option title",
+						0, 0, null, new Object[] {"Option A", "Option B", "Option C"} , "Option B", new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						String msg = "Option selected " + ((AsyncDialog)e.getSource()).getValue() + " (" + e.getActionCommand() + ")";
+						System.out.println(msg);
+						status.setText(msg);
+					}
+					
+				});
+			}
+
+		});
+		p.add(b);
+
+
+
 		b = new JButton("FileOpenDialog");
 		b.addActionListener(new ActionListener() {
 
diff --git a/sources/net.sf.j2s.java.core/src/test/components/ListDemoAWT.java b/sources/net.sf.j2s.java.core/src/test/components/ListDemoAWT.java
@@ -262,7 +262,6 @@ private static void createAndShowGUI() {
 		frame.setVisible(true);
 		demo.checkPeer();
 		
-		
 	}
 
 	private void checkPeer() {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,6 @@ private static void createAndShowGUI() {`
`262`	`262`	`frame.setVisible(true);`
`263`	`263`	`demo.checkPeer();`
`264`	`264`
`265`		`-`
`266`	`265`	`}`
`267`	`266`
`268`	`267`	`private void checkPeer() {`