X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java
index 29a88f5..72fb11f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java
@@ -22,7 +22,6 @@ import net.sourceforge.phpeclipse.views.PHPConsole;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.help.IHelp;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -38,11 +37,8 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.update.internal.ui.UpdatePerspective;
-import org.eclipse.update.internal.ui.UpdateUIPlugin;
-import org.eclipse.update.internal.ui.views.IEmbeddedWebBrowser;
-//import org.eclipse.jdt.internal.ui.actions.OpenBrowserUtil;
-// import org.eclipse.help.ui.browser.LaunchURL;
+//import org.eclipse.update.internal.ui.UpdatePerspective;
+//import org.eclipse.update.internal.ui.views.IEmbeddedWebBrowser;
 
 public class PHPEclipseShowAction implements IObjectActionDelegate {
   private IWorkbenchPart workbenchPart;
@@ -87,27 +83,12 @@ public class PHPEclipseShowAction implements IObjectActionDelegate {
           case IResource.FILE :
             // single file:
             IFile file = (IFile) resource;
-          String localhostURL;
-//            IPath path = file.getFullPath();
-//
-//            String localhostURL = file.getLocation().toString();
-//            String lowerCaseFileName = localhostURL.toLowerCase();
-//            //       fileName = "http://localhost"+fileName.replaceAll("c:", "");
-//            String documentRoot = store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
-//            documentRoot = documentRoot.replace('\\', '/');
-//            documentRoot = documentRoot.toLowerCase();
-//
-//            if (lowerCaseFileName.startsWith(documentRoot)) {
-//              localhostURL = localhostURL.substring(documentRoot.length());
-//            } else {
-//              MessageDialog.openInformation(shell, "Wrong DocumentRoot", "Adjust DocumentRoot: " + documentRoot);
-//              return;
-//            }
-//
-//            localhostURL = store.getString(PHPeclipsePlugin.LOCALHOST_PREF) + localhostURL.replaceAll(documentRoot, "");
-
-            if ((localhostURL=getLocalhostURL(store, (IFile) resource)) == null) {
-              MessageDialog.openInformation(shell, "Couldn't create localhost URL", "Please configure your localhost and documentRoot");
+            String localhostURL;
+            if ((localhostURL = getLocalhostURL(store, (IFile) resource)) == null) {
+              MessageDialog.openInformation(
+                shell,
+                "Couldn't create localhost URL",
+                "Please configure your localhost and documentRoot");
               return;
             }
             try {
@@ -150,11 +131,10 @@ public class PHPEclipseShowAction implements IObjectActionDelegate {
       store = PHPeclipsePlugin.getDefault().getPreferenceStore();
     }
 
-    IPath path = file.getFullPath();
+    // IPath path = file.getFullPath();
 
     String localhostURL = file.getLocation().toString();
     String lowerCaseFileName = localhostURL.toLowerCase();
-    //       fileName = "http://localhost"+fileName.replaceAll("c:", "");
     String documentRoot = store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
     documentRoot = documentRoot.replace('\\', '/');
     documentRoot = documentRoot.toLowerCase();
@@ -165,30 +145,30 @@ public class PHPEclipseShowAction implements IObjectActionDelegate {
       return null;
     }
 
-    return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) + localhostURL.replaceAll(documentRoot, "");
+    return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) + localhostURL;
 
   }
 
   public static void open(final URL url, final Shell shell, final String dialogTitle) {
-    if (SWT.getPlatform().equals("win32")) {
-      IWorkbenchPage page = PHPeclipsePlugin.getActivePage();
-      try {
-        IViewPart part = page.findView(UpdatePerspective.ID_BROWSER);
-        if (part == null) {
-          part = page.showView(UpdatePerspective.ID_BROWSER);
-        } else
-          page.bringToTop(part);
-        ((IEmbeddedWebBrowser) part).openTo(url.toExternalForm());
-      } catch (PartInitException e) {
-        UpdateUIPlugin.logException(e);
-      }
+    //    if (SWT.getPlatform().equals("win32")) {
+    //      IWorkbenchPage page = PHPeclipsePlugin.getActivePage();
+    //      try {
+    //        IViewPart part = page.findView(UpdatePerspective.ID_BROWSER);
+    //        if (part == null) {
+    //          part = page.showView(UpdatePerspective.ID_BROWSER);
+    //        } else
+    //          page.bringToTop(part);
+    //        ((IEmbeddedWebBrowser) part).openTo(url.toExternalForm());
+    //      } catch (PartInitException e) {
+    //        PHPeclipsePlugin.log(e);
+    //      }
+    //    } else {
+    IHelp help = WorkbenchHelp.getHelpSupport();
+    if (help != null) {
+      WorkbenchHelp.getHelpSupport().displayHelpResource(url.toExternalForm());
     } else {
-      IHelp help = WorkbenchHelp.getHelpSupport();
-      if (help != null) {
-        WorkbenchHelp.getHelpSupport().displayHelpResource(url.toExternalForm());
-      } else {
-        //   showMessage(shell, dialogTitle, ActionMessages.getString("OpenBrowserUtil.help_not_available"), false); //$NON-NLS-1$
-      }
+      //   showMessage(shell, dialogTitle, ActionMessages.getString("OpenBrowserUtil.help_not_available"), false); //$NON-NLS-1$
     }
   }
+  //  }
 }