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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 555e20f..b9f2df5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.texteditor.ITextEditor;
 
 /**
  * The main plugin class to be used in the desktop.
@@ -80,6 +81,7 @@ public class PHPeclipsePlugin
 
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
+  private ITextEditor fTextEditor = null; 
   
   private JavaTextTools fJavaTextTools;
   
@@ -192,9 +194,15 @@ public class PHPeclipsePlugin
   }
 
   public static IWorkbenchPage getActivePage() {
-    return PHPeclipsePlugin.getActivePage();
+	return getDefault().internalGetActivePage();
   }
 
+  private IWorkbenchPage internalGetActivePage() {
+	  IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
+	  if (window!=null) return window.getActivePage();
+	  return null;
+  }
+  
   public static IWorkbenchWindow getActiveWorkbenchWindow() {
     return getDefault().getWorkbench().getActiveWorkbenchWindow();
   }
@@ -275,6 +283,7 @@ public class PHPeclipsePlugin
     // windows preferences:
     store.setDefault(LOCALHOST_PREF, "http://localhost");
 
+    store.setDefault(SHOW_EXTERNAL_PREVIEW_PREF, "true");
     store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false");
     store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
 
@@ -294,8 +303,10 @@ public class PHPeclipsePlugin
     store.setDefault(
       DOCUMENTROOT_PREF,
       getWorkspace().getRoot().getLocation().toString());
+      
     //  if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
     if (windowsSystem.equals(BootLoader.WS_WIN32)) {
+      store.setDefault(PHP_RUN_PREF, "c:\\apache\\php\\php.exe");
       store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}");
       store.setDefault(
         MYSQL_PREF,
@@ -308,6 +319,7 @@ public class PHPeclipsePlugin
         APACHE_RESTART_PREF,
         "c:\\apache\\apache.exe -k restart");
     } else {
+      store.setDefault(PHP_RUN_PREF, "/apache/php/php");
       store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
       store.setDefault(MYSQL_PREF, "/apache/mysql/bin/mysqld --standalone");
       store.setDefault(
@@ -423,4 +435,12 @@ public class PHPeclipsePlugin
     manager.registerAdapters(new PHPElementAdapterFactory(), PHPElement.class);
     manager.registerAdapters(new ResourceAdapterFactory(), IResource.class);
   }
+
+  public void setTextEditor(ITextEditor textEditor) {
+    this.fTextEditor = textEditor;
+  }
+
+  public ITextEditor getTextEditor() {
+    return fTextEditor;
+  }
 }
\ No newline at end of file