Importing the XDebugProxy code in the HEAD. The repo was tagged with T_BEFORE_XDEBUGP...

[phpeclipse.git] / net.sourceforge.phpeclipse.xdebug.ui / src / net / sourceforge / phpeclipse / xdebug / ui / php / launching / PHPMainTab.java

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPMainTab.java b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPMainTab.java
index 6927ed2..ac4628a 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPMainTab.java
+++ b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPMainTab.java
@@ -1,13 +1,13 @@
 package net.sourceforge.phpeclipse.xdebug.ui.php.launching;
 
 import java.io.File;
-import java.text.MessageFormat;
+//import java.text.MessageFormat;
 
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileSelector;
 import net.sourceforge.phpdt.internal.ui.util.PHPProjectSelector;
-import net.sourceforge.phpeclipse.xdebug.core.IXDebugPreferenceConstants;
-import net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin;
+//import net.sourceforge.phpeclipse.xdebug.core.IXDebugPreferenceConstants;
+//import net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin;
 import net.sourceforge.phpeclipse.xdebug.php.launching.IXDebugConstants;
 
 import org.eclipse.core.resources.IFile;
@@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
 
 public class PHPMainTab extends AbstractLaunchConfigurationTab {
 
@@ -216,7 +217,7 @@ public class PHPMainTab extends AbstractLaunchConfigurationTab {
        }
 
        protected IProject getContext() {
-               IWorkbenchPage page= XDebugCorePlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+               IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                if (page != null) {
                        ISelection selection = page.getSelection();
                        if (selection instanceof IStructuredSelection) {
@@ -238,6 +239,7 @@ public class PHPMainTab extends AbstractLaunchConfigurationTab {
                }
                return null;
        }
+       
 
        public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
                IProject project = getContext();
@@ -250,7 +252,7 @@ public class PHPMainTab extends AbstractLaunchConfigurationTab {
                try {
                        String project = configuration.getAttribute(IXDebugConstants.ATTR_PHP_PROJECT, (String)null);
                        if (project != null) {
-                       projectSelector.setSelectionText(project);
+                               projectSelector.setSelectionText(project);
                        }
                        String file = configuration.getAttribute(IXDebugConstants.ATTR_PHP_FILE, (String)null);
                        if (file != null) {
@@ -295,8 +297,14 @@ public class PHPMainTab extends AbstractLaunchConfigurationTab {
                        setErrorMessage("Project does not exist");
                        return false;
                }
-               IFile file=project.getFile(fileSelector.getSelectionText().trim());
-               if (!file.exists()) {
+               String fileString=fileSelector.getSelectionText().trim();
+               if (!"".equals(fileString)) {
+                       IFile file=project.getFile(fileSelector.getSelectionText().trim());
+                       if (!file.exists()) {
+                               setErrorMessage("File does not exist");
+                               return false;
+                       }
+               } else {
                        setErrorMessage("File does not exist");
                        return false;
                }