*** empty log message ***

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPeclipsePlugin.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 9384fc1..b9f2df5 100644 (file)
--- 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;
   
@@ -135,12 +137,12 @@ public class PHPeclipsePlugin
     return fImageDescriptorRegistry;
   }
   // @TODO: refactor this into a better method name !
-  public PHPDocumentProvider getCompilationUnitDocumentProvider() {
+  public synchronized PHPDocumentProvider getCompilationUnitDocumentProvider() {
     if (fCompilationUnitDocumentProvider == null)
-      fCompilationUnitDocumentProvider = new PHPDocumentProvider();
+      fCompilationUnitDocumentProvider= new PHPDocumentProvider();
     return fCompilationUnitDocumentProvider;
   }
-
+  
   private static void setJVM() {
     String osName = System.getProperty("os.name");
 
@@ -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,12 +303,14 @@ 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,
-        "c:\\apache\\mysql\\bin\\mysqld.exe --standalone");
+        "c:\\apache\\mysql\\bin\\mysqld-nt.exe --standalone");
       store.setDefault(
         APACHE_START_PREF,
         "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\"");
@@ -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(
@@ -325,8 +337,8 @@ public class PHPeclipsePlugin
     store.setDefault(PHP_PARSE_ON_SAVE, "true");
 
     // show line numbers:
-    store.setDefault(LINE_NUMBER_RULER, "false");
-    store.setDefault(FORMATTER_TAB_SIZE, "4");
+ //   store.setDefault(LINE_NUMBER_RULER, "false");
+//    store.setDefault(FORMATTER_TAB_SIZE, "4");
 
     // php syntax highlighting
     store.setDefault(PHP_USERDEF_XMLFILE, ""); //assume there is none  chooA
@@ -361,42 +373,42 @@ public class PHPeclipsePlugin
       store,
       PHP_DEFAULT,
       PHPColorProvider.DEFAULT);
-    PreferenceConverter.setDefault(
-      store,
-      PHP_EDITOR_BACKGROUND,
-      PHPColorProvider.BACKGROUND);
-    PreferenceConverter.setDefault(
-      store,
-      LINKED_POSITION_COLOR,
-      PHPColorProvider.LINKED_POSITION_COLOR);
-    PreferenceConverter.setDefault(
-      store,
-      LINE_NUMBER_COLOR,
-      PHPColorProvider.LINE_NUMBER_COLOR);
-
-    // set default PHPDoc colors:
-    PreferenceConverter.setDefault(
-      store,
-      PHPDOC_KEYWORD, 
-      PHPColorProvider.PHPDOC_KEYWORD);
-    PreferenceConverter.setDefault(
-      store,
-      PHPDOC_LINK, 
-      PHPColorProvider.PHPDOC_LINK);      
-    PreferenceConverter.setDefault(
-      store,
-      PHPDOC_DEFAULT, 
-      PHPColorProvider.PHPDOC_DEFAULT);
-    PreferenceConverter.setDefault(
-      store,
-      PHPDOC_TAG, 
-      PHPColorProvider.PHPDOC_TAG);
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHP_EDITOR_BACKGROUND,
+//      PHPColorProvider.BACKGROUND);
+//    PreferenceConverter.setDefault(
+//      store,
+//      LINKED_POSITION_COLOR,
+//      PHPColorProvider.LINKED_POSITION_COLOR);
+//    PreferenceConverter.setDefault(
+//      store,
+//      LINE_NUMBER_COLOR,
+//      PHPColorProvider.LINE_NUMBER_COLOR);
+
+//    // set default PHPDoc colors:
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_KEYWORD, 
+//      PHPColorProvider.PHPDOC_KEYWORD);
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_LINK, 
+//      PHPColorProvider.PHPDOC_LINK);      
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_DEFAULT, 
+//      PHPColorProvider.PHPDOC_DEFAULT);
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_TAG, 
+//      PHPColorProvider.PHPDOC_TAG);
       
-    store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
-    PreferenceConverter.setDefault(
-      store,
-      PREFERENCE_COLOR_BACKGROUND,
-      PHPColorProvider.BACKGROUND_COLOR);
+//    store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
+//    PreferenceConverter.setDefault(
+//      store,
+//      PREFERENCE_COLOR_BACKGROUND,
+//      PHPColorProvider.BACKGROUND_COLOR);
 
     //language stuff
     store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT);
@@ -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