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

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
index 8ff3848..07d0841 100644
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
@@ -1,17 +1,26 @@
 package net.sourceforge.phpdt.internal.debug.ui;
 
+import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
 import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
+import net.sourceforge.phpeclipse.builder.ExternalEditorInput;
+import net.sourceforge.phpeclipse.builder.FileStorage;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IPersistableSourceLocator;
 import org.eclipse.debug.core.model.IStackFrame;
 import org.eclipse.debug.ui.ISourcePresentation;
+import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.FileEditorInput;
 
@@ -49,14 +58,14 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
    * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame)
    */
   public Object getSourceElement(IStackFrame stackFrame) {
-	return ((PHPStackFrame) stackFrame).getFileName();
+    return ((PHPStackFrame) stackFrame).getFileName();
   }
 
   /**
    * @see org.eclipse.debug.ui.ISourcePresentation#getEditorId(IEditorInput, Object)
    */
   public String getEditorId(IEditorInput input, Object element) {
-    return PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor((String)element).getId();
+    return PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor((String) element).getId();
   }
 
   /**
@@ -65,14 +74,36 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
   public IEditorInput getEditorInput(Object element) {
 
     String filename = (String) element;
-    IFile eclipseFile = PHPeclipsePlugin.getWorkspace().getRoot().getFileForLocation(new Path(filename));
-    if (eclipseFile == null) {
-      filename = this.getAbsoluteWorkingDirectory() + "/" + filename;
-      eclipseFile = PHPeclipsePlugin.getWorkspace().getRoot().getFileForLocation(new Path(filename));
-      if (eclipseFile == null) {
+    IWorkbench workbench = PlatformUI.getWorkbench();
+    IWorkbenchWindow window = workbench.getWorkbenchWindows()[0];
+    IWorkbenchPage page = window.getActivePage();
+    IPath path = new Path(filename);
+
+    // If the file exists in the workspace, open it
+    IFile eclipseFile = PHPeclipsePlugin.getWorkspace().getRoot().getFileForLocation(path);
+    //    IFile eclipseFile = PHPeclipsePlugin.getWorkspace().getRoot().getFileForLocation(new Path(filename));
+//    if (eclipseFile == null) {
+//      filename = this.getAbsoluteWorkingDirectory() + "/" + filename;
+//      eclipseFile = PHPeclipsePlugin.getWorkspace().getRoot().getFileForLocation(new Path(filename));
+//      if (eclipseFile == null) {
+//        PHPeclipsePlugin.log(IStatus.INFO, "Could not find file \"" + element + "\".");
+//        return null;
+//      }
+//    } else 
+    if (eclipseFile == null || !eclipseFile.exists()) {
+      //		Otherwise open the stream directly
+      if (page == null) {
         PHPeclipsePlugin.log(IStatus.INFO, "Could not find file \"" + element + "\".");
         return null;
       }
+      FileStorage storage = new FileStorage(path);
+      storage.setReadOnly();
+      //      IEditorRegistry registry = workbench.getEditorRegistry();
+      //      IEditorDescriptor desc = registry.getDefaultEditor(filename);
+      //      if (desc == null) {
+      //        desc = registry.getDefaultEditor();
+      //      }
+      return new ExternalEditorInput(storage);
     }
     return new FileEditorInput(eclipseFile);