Upgraded xdebug win32 to 2.0.1

[phpeclipse.git] / net.sourceforge.phpeclipse.webbrowser / src / net / sourceforge / phpeclipse / webbrowser / views / BrowserView.java

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..c60b9e4 100644 (file)
--- 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 {
@@ -121,6 +126,8 @@ public class BrowserView extends ViewPart implements IShowInTarget {
                }
        }
 
+       
+       
        public void refresh(String url) {
                if (fInstance != null && url != null) {
                        if (fUrl == null) {
@@ -130,7 +137,7 @@ public class BrowserView extends ViewPart implements IShowInTarget {
                                if (browser != null) {
                                        String browserUrl = browser.getUrl();
                                        try {
-                                               browserUrl = URLDecoder.decode(browserUrl, Charset.defaultCharset().name());
+                                               browserUrl = URLDecoder.decode(browserUrl, J5CharsetEmulator.defaultCharset().name());
                                        } catch (UnsupportedEncodingException e) {
                                                // e.printStackTrace();
                                        }