Workaround for feature request #1154254 (sticky browser URL) that solves bug #1827766...

[phpeclipse.git] / net.sourceforge.phpeclipse.webbrowser / src / net / sourceforge / phpeclipse / webbrowser / internal / WebBrowser.java

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
index 4c4f9ee..6fc07d8 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
@@ -139,7 +139,8 @@ public class WebBrowser extends Composite {
                                public void widgetSelected(SelectionEvent we) {
                                        try {
                                                if (combo.getSelectionIndex() != -1)
-                                                       setURL(combo.getItem(combo.getSelectionIndex()));
+                                                       setURL(combo.getItem(combo.getSelectionIndex()),
+                                                                       false);
                                        } catch (Exception e) {
                                        }
                                }
@@ -236,8 +237,11 @@ public class WebBrowser extends Composite {
                                // else its an editor window
                                if (shell != null)
                                        shell.dispose();
-                               else
-                                       editor.closeEditor();
+                               else {
+                                       // #1365431 (toshihiro) editor.closeEditor(); causes NPE
+                                       if (editor != null)
+                                               editor.closeEditor();
+                               }
                        }
                });
 
@@ -377,11 +381,12 @@ public class WebBrowser extends Composite {
                if (newURL != null)
                        url = newURL;
 
-               if (browse)
+               if (browse) {
                        navigate(url);
 
-               addToHistory(url);
-               updateHistory();
+                       addToHistory(url);
+                       updateHistory();
+               }
        }
 
        protected void addToHistory(String url) {
@@ -657,7 +662,7 @@ public class WebBrowser extends Composite {
                                                WebBrowserPreference.getHomePageURL().substring(9));
        }
 
-       protected String getURL() {
+       public String getURL() {
                return browser.getUrl();
        }