X-Git-Url: http://secure.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 d296c9b..1cbed97 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -13,6 +13,8 @@ package net.sourceforge.phpeclipse;
 
 import net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage;
 import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
+import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider;
 import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
@@ -65,11 +67,11 @@ public class PHPeclipsePlugin
   public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID + ".ui.CodingActionSet"; //$NON-NLS-1$
 
   public static final String PHPPARSER_NEW = "test.PHPParser";
-  public static final String PHPPARSER_ORIGINAL =
+  public static final String PHPPARSER_ORIGINAL = 
     "net.sourceforge.phpdt.internal.compiler.parser.Parser";
 
-  /** Change this if you want to switch PHP Parser) */
-  public static final String PHPPARSER = PHPPARSER_NEW;
+  /** Change this if you want to switch PHP Parser. */
+  public static final String PHPPARSER = PHPPARSER_ORIGINAL;
 
   //The shared instance.
   private static PHPeclipsePlugin plugin;
@@ -78,6 +80,9 @@ public class PHPeclipsePlugin
 
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
+  
+  private JavaTextTools fJavaTextTools;
+  
   /**
   * The Java virtual machine that we are running on.
   */
@@ -103,7 +108,7 @@ public class PHPeclipsePlugin
 
   /** JVM constant for any other platform */
   private static final int OTHER = -1;
-  
+
   /** General debug flag*/
   public static final boolean DEBUG = false;
   /**
@@ -130,12 +135,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");
 
@@ -187,9 +192,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();
   }
@@ -231,7 +242,7 @@ public class PHPeclipsePlugin
   public static void log(Throwable e) {
     log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$
   }
-  
+
   public static boolean isDebug() {
     return getDefault().isDebugging();
   }
@@ -239,7 +250,13 @@ public class PHPeclipsePlugin
   static IPath getInstallLocation() {
     return new Path(getDefault().getDescriptor().getInstallURL().getFile());
   }
-
+  
+  public synchronized JavaTextTools getJavaTextTools() {
+    if (fJavaTextTools == null)
+      fJavaTextTools= new JavaTextTools(getPreferenceStore());
+    return fJavaTextTools;
+  }
+  
   /**
    * Returns the string from the plugin's resource bundle,
    * or 'key' if not found.
@@ -264,6 +281,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");
 
@@ -288,7 +306,7 @@ public class PHPeclipsePlugin
       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}\"\"");
@@ -314,8 +332,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
@@ -339,7 +357,7 @@ public class PHPeclipsePlugin
     PreferenceConverter.setDefault(
       store,
       PHP_FUNCTIONNAME,
-      PHPColorProvider.FUNCTION_NAME);
+      PHPColorProvider.FUNCTION_NAME); 
     PreferenceConverter.setDefault(
       store,
       PHP_CONSTANT,
@@ -350,24 +368,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);
-
-    store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
-    PreferenceConverter.setDefault(
-      store,
-      PREFERENCE_COLOR_BACKGROUND,
-      PHPColorProvider.BACKGROUND_COLOR);
+//    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);
 
     //language stuff
     store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT);
@@ -385,6 +421,7 @@ public class PHPeclipsePlugin
     new PHPSyntaxRdr();
 
     PHPCore.initializeDefaultPluginPreferences();
+    PreferenceConstants.initializeDefaultValues(store);
   }
 
   public void startup() throws CoreException {