misc

[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 51a215a..6dad304 100644 (file)
--- 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;
@@ -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.
   */
@@ -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");
 
@@ -239,7 +244,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.
@@ -314,8 +325,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
@@ -350,42 +361,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);
@@ -403,6 +414,7 @@ public class PHPeclipsePlugin
     new PHPSyntaxRdr();
 
     PHPCore.initializeDefaultPluginPreferences();
+    PreferenceConstants.initializeDefaultValues(store);
   }
 
   public void startup() throws CoreException {