Changeset 550

Timestamp:

11/27/13 17:20:05 (10 years ago)

Author:

ngw8

Message:

JfxBrowser: Back & forward buttons work, URL bar updates

File:

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

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

@@ -21 +21 @@
 import javax.swing.JTextField;
 import javax.swing.JToolBar;
-import javax.swing.UIManager;
 
 import org.expeditee.gui.FreeItems;
@@ -148 +147 @@
                 JfxBrowser owner;
 
+                private JTextField urlField;
+
                 /**
                  * @return A JPanel that either contains a JavaFX Webview or an empty panel if the JFX panel can't be
@@ -170 +171 @@
                                 toolBar.add(forwardButton);
 
-                                JTextField urlField = new JTextField(url);
+                                urlField = new JTextField(url);
                                 toolBar.add(urlField);
 
-                                urlField.addActionListener(new ActionListener() {
-                                        @Override
-                                        public void actionPerformed(ActionEvent e) {
-                                                owner.navigate(e.getActionCommand());
+                                backButton.addActionListener(new ActionListener() {
+                                        @Override
+                                        public void actionPerformed(ActionEvent arg0) {
+                                                owner.navigateForward();
+                                        }
+                                });
+
+                                forwardButton.addActionListener(new ActionListener() {
+                                        @Override
+                                        public void actionPerformed(ActionEvent arg0) {
+                                                owner.navigateBack();
                                         }
                                 });
@@ -242 +250 @@
                                                                                 case 2: // RUNNING
                                                                                         MessageBay.displayMessage("WebEngine running");
+
+                                                                                        // Updating the URL bar to display the URL of the page being loaded
+                                                                                        WebBrowserPanel.this.urlField.setText((String) WebEngineGetLocation.invoke(WebViewGetEngine.invoke(WebBrowserPanel.this.webview)));
                                                                                         break;
                                                                                 case 3: // SUCCEEDED
@@ -361 +372 @@
                                                         WebHistoryGo.invoke(WebEngineGetHistory.invoke(webEngine), -1);
                                                 } catch (InvocationTargetException e) {
-                                                        MessageBay.displayMessage("End of History");
+                                                        MessageBay.displayMessage("Start of History");
                                                 } catch (Exception e) {
                                                         e.printStackTrace();