replaced a lot of deprecated code; if someone runs into a commit conflict afterwards...

[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 8edbbc5..db5d321 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
@@ -14,7 +14,6 @@ import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.browser.ProgressListener;
 import org.eclipse.swt.browser.StatusTextListener;
 import org.eclipse.swt.browser.TitleListener;
@@ -136,17 +135,21 @@ public class BrowserView extends ViewPart implements IShowInTarget {
        }
 
        public boolean show(ShowInContext context) {
-               if (context.getSelection() instanceof IStructuredSelection) {
-                       IStructuredSelection ss = (IStructuredSelection) context.getSelection();
-                       if (ss.getFirstElement() instanceof IFile) {
-                               IFile file = (IFile) ss.getFirstElement();
-                               String localhostURL;
-                               localhostURL = file.getLocation().toString();
+               if (context instanceof ShowInContextBrowser) {
+                       ShowInContextBrowser contextBrowser = (ShowInContextBrowser) context;
+                       String localhostURL = contextBrowser.getLocalhostUrl();
+                       if (localhostURL != null) {
                                setUrl(localhostURL);
-//                             bringToTop(this);
                                return true;
                        }
                }
+               if (context.getInput() instanceof IFile) {
+                       IFile file = (IFile) context.getInput();
+                       String localhostURL;
+                       localhostURL = "file:///" + file.getLocation().toString();
+                       setUrl(localhostURL);
+                       return true;
+               }
                return false;
        }
 }
\ No newline at end of file