Changeset 537

Timestamp:

11/26/13 16:06:38 (10 years ago)

Author:

ngw8

Message:

JfxBrowser: URI is remembered between closing and reopening Expeditee (by saving to the widget args)

File:

• trunk/src/org/expeditee/items/widgets/JfxBrowser.java (modified) (7 diffs)

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -14 +14 @@
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.List;
 
 import javax.swing.JPanel;
@@ -47 +46 @@
         static Class WebEngine;
         static Method WebEngineLoad;
+        static Method WebEngineGetLocation;
 
         static {
                 String javaLibDir = System.getProperty("java.home") + File.separator + "lib" + File.separator;
                 try {
-                        System.out.println(javaLibDir);
                         ClassLoader classLoader = ClassLoader.getSystemClassLoader();
 
@@ -61 +60 @@
                         addURL.invoke(classLoader, jar.toURI().toURL());
 
-                        System.out.println(System.getProperty("java.class.path"));
-
                         JFXPanel = Class.forName("javafx.embed.swing.JFXPanel", false, classLoader);
-
-                        final File f = new File(JFXPanel.getProtectionDomain().getCodeSource().getLocation().getPath());
-                        System.out.println(f.getPath());
 
                         Platform = classLoader.loadClass("javafx.application.Platform");
@@ -88 +82 @@
                         WebEngine = classLoader.loadClass("javafx.scene.web.WebEngine");
                         WebEngineLoad = WebEngine.getMethod("load", String.class);
+                        WebEngineGetLocation = WebEngine.getMethod("getLocation");
 
 
@@ -212 +207 @@
 
         public JfxBrowser(Text source, String[] args) {
-                // Testing proxy auth
-                super(source, new WebBrowserPanel("http://stackoverflow.com"), -1, 500, -1, -1, 300, -1);
+                // Initial page is either the page stored in the arguments (if there is one stored) or Google
+                super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : "http://google.com"), -1, 500, -1, -1, 300, -1);
 
                 _browser = (WebBrowserPanel) _swingComponent;
@@ -221 +216 @@
                 try {
                         WebEngineLoad.invoke(WebViewGetEngine.invoke(this._browser.webview), url);
-                        
                 } catch (IllegalAccessException e) {
                         e.printStackTrace();
@@ -233 +227 @@
         @Override
         protected String[] getArgs() {
-                return null;
-        }
-
-        @Override
-        public void setSourceData(List<String> data) {
-                super.setSourceData(data);
-                if (data != null && data.size() > 0) {
-                        navigate(data.get(0));
-                }
-        }
-        
-        @Override
-        protected List<String> getData() {
-                return _textRepresentation.getData();
+                String[] r = null;
+                if (this._browser.webview != null) {
+                        try {
+                                r = new String[] { (String) WebEngineGetLocation.invoke(WebViewGetEngine.invoke(this._browser.webview)) };
+                        } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                        } catch (IllegalArgumentException e) {
+                                e.printStackTrace();
+                        } catch (InvocationTargetException e) {
+                                e.printStackTrace();
+                        } catch (SecurityException e) {
+                                e.printStackTrace();
+                        }
+                }
+                return r;
         }
 }