Merge pull request #178 from BobHanson/master

BobHanson · web-flow · commit 55db3eff4425 · 2020-08-13T22:34:16.000-05:00
JSUtilI.getClipboardText()
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 @@
-20200807063741 
+20200813222737 
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 @@
-20200807063741 
+20200813222737 
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/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -5,7 +5,8 @@
 import java.awt.Dimension;
 import java.awt.JSComponent;
 import java.awt.Toolkit;
-import java.awt.image.BufferedImage;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -21,19 +22,17 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.UnsupportedAudioFileException;
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
 
-import swingjs.api.js.JSFunction;
 import javajs.util.AU;
 import javajs.util.AjaxURLConnection;
-import javajs.util.PT;
 import javajs.util.Rdr;
 import javajs.util.SB;
 import javajs.util.ZipTools;
@@ -44,6 +43,7 @@
 import swingjs.api.js.HTML5Applet;
 import swingjs.api.js.J2SInterface;
 import swingjs.api.js.JQuery;
+import swingjs.api.js.JSFunction;
 import swingjs.json.JSON;
 import swingjs.plaf.JSComponentUI;
 import swingjs.plaf.JSFrameUI;
@@ -1102,6 +1102,35 @@ public static void setClipboardContents(String data) {
 		}
 	}
 
+	@Override
+	public void getClipboardText(Consumer<String> whenDone) {
+      getClipboardContentsStatic(whenDone);
+	}
+	
+	public static String getClipboardContentsStatic(Consumer<String> whenDone) {
+		
+		String s = null;
+		
+		try { 
+			/**
+			 * @j2sNative
+			 * 
+			 * navigator.clipboard.readText().then(function(text) {whenDone.accept$O(text)});
+			 * return null;
+			 * 
+			 */ {
+					Transferable data = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
+					s = (data.isDataFlavorSupported(DataFlavor.stringFlavor) ? (String) data.getTransferData(DataFlavor.stringFlavor) : "");				 
+			 }				
+
+		} catch (Throwable t) {
+			// browser does not support this function
+		}
+		if (whenDone != null)
+			whenDone.accept(s);
+		return s;
+	}
+
 	@Override
 	public byte[] getCachedBytes(String path) {
 		return (byte[]) getCachedFileData(path, true);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/JSUtilI.java b/sources/net.sf.j2s.java.core/src/swingjs/api/JSUtilI.java
@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -358,4 +359,11 @@ public interface JSUtilI {
 	 */
 	void setAppClass(Object app);
 
+	/** As of v. 73, not available in Firefox -- will alert the user and return null
+	 * 
+	 * @param whenDone  method to capture return asynchronously, returning null only if the 
+	 * browser does not allow reading the clipboard.
+	 */
+	void getClipboardText(Consumer<String> whenDone);
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/TApp2.java b/sources/net.sf.j2s.java.core/src/test/TApp2.java
@@ -153,7 +153,7 @@ public void keyTyped(KeyEvent e) {
 
 			@Override
 			public void keyPressed(KeyEvent e) {
-				System.out.println("keypressed");
+				System.out.println("keypressed " + e);
 			}
 
 			@Override
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Class.java b/sources/net.sf.j2s.java.core/src/test/Test_Class.java
@@ -1,5 +1,6 @@
 package test;
 
+
 import static java.awt.Color.getColor;
 import static java.awt.Toolkit.getDefaultToolkit;
 
@@ -25,6 +26,15 @@
 ;
 class Test_Class extends Test_Class2<Integer> {
 
+	static class TestStatic {
+		
+		static String sayHello() { return "Hello there"; }
+	}
+
+	
+	
+	
+	
 	public int test_int = 3; // shadows Test_
 
 
@@ -324,6 +334,10 @@ public static String localtest() {
 	
 	public static void main(String[] args) {
 		
+		TestStatic ts = null;
+		
+		System.out.println(ts.sayHello());
+		
 //		System.out.println(new Date() + " " + Date.parse("3/4/2020"));
 
 		System.out.println(Number.class.isAssignableFrom(Double.class));
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Clipboard.java b/sources/net.sf.j2s.java.core/src/test/Test_Clipboard.java
@@ -5,6 +5,7 @@
 import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.GridLayout;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Date;
@@ -25,6 +26,7 @@
 import javax.swing.TransferHandler;
 import javax.swing.table.DefaultTableModel;
 
+import swingjs.JSUtil;
 import swingjs.plaf.JSTableUI;
 
 public class Test_Clipboard extends JFrame {
@@ -157,6 +159,18 @@ public void actionPerformed(ActionEvent e) {
 
 		});
 
+		m.add(btn, null);
+		btn = new JButton("paste");
+		btn.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {				
+				new JSUtil().getClipboardText((text) -> {
+					System.out.println(text);
+				});
+			}
+
+		});
 		m.add(btn, null);
 		add(m, BorderLayout.SOUTH);
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public void keyTyped(KeyEvent e) {`
`153`	`153`
`154`	`154`	`@Override`
`155`	`155`	`public void keyPressed(KeyEvent e) {`
`156`		`- System.out.println("keypressed");`
	`156`	`+ System.out.println("keypressed " + e);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Override`