From be369a51da2a08568d32171ac74bf7ea90ee7b34 Mon Sep 17 00:00:00 2001 From: Edward Mann Date: Mon, 3 Sep 2007 18:07:19 +0000 Subject: [PATCH] Added change for feature #1154254 Browser now has a sticky url. --- .../phpeclipse/webbrowser/internal/WebBrowser.java | 2 +- .../phpeclipse/webbrowser/views/BrowserView.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) 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 c4e6e52..6fc07d8 100644 --- 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 @@ -662,7 +662,7 @@ public class WebBrowser extends Composite { WebBrowserPreference.getHomePageURL().substring(9)); } - protected String getURL() { + public String getURL() { return browser.getUrl(); } diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java index c27f80a..443d433 100644 --- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java +++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java @@ -89,9 +89,14 @@ public class BrowserView extends ViewPart implements IShowInTarget { } public void setUrl(final String url) { - if (fInstance != null) { - fUrl = url; - fInstance.setURL(url); + if (fInstance != null) { + if (fInstance.getURL() != null && fInstance.getURL().length() > 0) { + fUrl = fInstance.getURL(); + fInstance.setURL(fUrl); + } else { + fUrl = url; + fInstance.setURL(url); + } // try { // ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { // public void run(IProgressMonitor monitor) throws CoreException { -- 1.7.1