X-Git-Url: http://git.phpeclipse.com 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..a5791e8 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 @@ -12,16 +12,15 @@ 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; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.CloseWindowListener; -import org.eclipse.swt.browser.ProgressListener; -import org.eclipse.swt.browser.StatusTextListener; -import org.eclipse.swt.browser.TitleListener; +//import org.eclipse.swt.browser.ProgressListener; +//import org.eclipse.swt.browser.StatusTextListener; +//import org.eclipse.swt.browser.TitleListener; import org.eclipse.swt.browser.WindowEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.IShowInTarget; @@ -88,10 +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) { - fUrl = url; - fInstance.setURL(url); + fUrl = url; + fInstance.setURL(url); // try { // ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { // public void run(IProgressMonitor monitor) throws CoreException { @@ -121,6 +128,8 @@ public class BrowserView extends ViewPart implements IShowInTarget { } } + + public void refresh(String url) { if (fInstance != null && url != null) { if (fUrl == null) { @@ -130,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(); } @@ -142,23 +151,23 @@ public class BrowserView extends ViewPart implements IShowInTarget { } } - public void addProgressListener(ProgressListener listener) { - if (fInstance != null) { - fInstance.addProgressListener(listener); - } - } - - public void addStatusTextListener(StatusTextListener listener) { - if (fInstance != null) { - fInstance.addStatusTextListener(listener); - } - } - - public void addTitleListener(TitleListener listener) { - if (fInstance != null) { - fInstance.addTitleListener(listener); - } - } +// public void addProgressListener(ProgressListener listener) { +// if (fInstance != null) { +// fInstance.addProgressListener(listener); +// } +// } + +// public void addStatusTextListener(StatusTextListener listener) { +// if (fInstance != null) { +// fInstance.addStatusTextListener(listener); +// } +// } + +// public void addTitleListener(TitleListener listener) { +// if (fInstance != null) { +// fInstance.addTitleListener(listener); +// } +// } public boolean show(ShowInContext context) { if (context instanceof ShowInContextBrowser) {