Merging code from trunk that fixes #774, this work was done by incastrix

[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 443d433..bb4c837 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
@@ -12,7 +12,6 @@ package net.sourceforge.phpeclipse.webbrowser.views;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.nio.charset.Charset;
 
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
@@ -88,15 +87,18 @@ public class BrowserView extends ViewPart implements IShowInTarget {
                super.dispose();
        }
 
+       public String getUrl() {
+               if (fInstance != null) {
+                       return fInstance.getURL();
+               } else {
+                       return null;
+               }
+       }
+
        public void setUrl(final String url) {
-               if (fInstance != null) {
-              if (fInstance.getURL() != null && fInstance.getURL().length() > 0) {
-                fUrl = fInstance.getURL();
-                fInstance.setURL(fUrl);
-            } else {
-                fUrl = url;
-                fInstance.setURL(url);
-            }
+               if (fInstance != null) {
+                               fUrl = url;
+                               fInstance.setURL(url);
                        // try {
                        // ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
                        // public void run(IProgressMonitor monitor) throws CoreException {
@@ -126,6 +128,8 @@ public class BrowserView extends ViewPart implements IShowInTarget {
                }
        }
 
+       
+       
        public void refresh(String url) {
                if (fInstance != null && url != null) {
                        if (fUrl == null) {
@@ -135,7 +139,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();
                                        }