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 41eae55..0eb25a6 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -11,16 +11,15 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpeclipse;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
 import net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage;
 import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry;
 import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider;
+import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 import net.sourceforge.phpeclipse.resourcesview.PHPElement;
 import net.sourceforge.phpeclipse.resourcesview.PHPElementAdapterFactory;
 import net.sourceforge.phpeclipse.resourcesview.ResourceAdapterFactory;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -60,7 +59,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   public static final String PLUGIN_ID = "net.sourceforge.phpeclipse"; //$NON-NLS-1$
   public final static String PHP_NATURE_ID = PLUGIN_ID + ".phpnature";
   public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID + ".resourcesview.ViewPHPResources"; //$NON-NLS-1$
- 
+
   //The shared instance.
   private static PHPeclipsePlugin plugin;
   //Resource bundle.
@@ -100,11 +99,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     super(descriptor);
     plugin = this;
     setJVM();
-//    try {
-//      resourceBundle = ResourceBundle.getBundle("net.sourceforge.PHPeclipsePluginResources");
-//    } catch (MissingResourceException x) {
-//      resourceBundle = null;
-//    }
+    //    try {
+    //      resourceBundle = ResourceBundle.getBundle("net.sourceforge.PHPeclipsePluginResources");
+    //    } catch (MissingResourceException x) {
+    //      resourceBundle = null;
+    //    }
   }
 
   public static ImageDescriptorRegistry getImageDescriptorRegistry() {
@@ -113,7 +112,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
 
   private ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
     if (fImageDescriptorRegistry == null)
-      fImageDescriptorRegistry= new ImageDescriptorRegistry();
+      fImageDescriptorRegistry = new ImageDescriptorRegistry();
     return fImageDescriptorRegistry;
   }
   // @TODO: refactor this into a better method name !
@@ -174,7 +173,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   }
 
   public static IWorkbenchPage getActivePage() {
-    return getDefault().getActivePage();
+    return PHPeclipsePlugin.getActivePage();
   }
 
   public static IWorkbenchWindow getActiveWorkbenchWindow() {
@@ -210,9 +209,10 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   //  public static void log(Throwable e) {
   //    log(new Status(IStatus.ERROR, getPluginId(), JavaStatusConstants.INTERNAL_ERROR, JavaUIMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
   //  }
+
   public static void log(int severity, String message) {
-    Status status = new Status(severity, PLUGIN_ID, IStatus.OK, message, null) ;
-    log(status) ;
+    Status status = new Status(severity, PLUGIN_ID, IStatus.OK, message, null);
+    log(status);
   }
   public static void log(Throwable e) {
     log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$
@@ -229,21 +229,21 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
    * Returns the string from the plugin's resource bundle,
    * or 'key' if not found.
    */
-//  public static String getResourceString(String key) {
-//    ResourceBundle bundle = PHPeclipsePlugin.getDefault().getResourceBundle();
-//    try {
-//      return bundle.getString(key);
-//    } catch (MissingResourceException e) {
-//      return key;
-//    }
-//  }
+  //  public static String getResourceString(String key) {
+  //    ResourceBundle bundle = PHPeclipsePlugin.getDefault().getResourceBundle();
+  //    try {
+  //      return bundle.getString(key);
+  //    } catch (MissingResourceException e) {
+  //      return key;
+  //    }
+  //  }
 
   /**
    * Returns the plugin's resource bundle,
    */
-//  public ResourceBundle getResourceBundle() {
-//    return resourceBundle;
-//  }
+  //  public ResourceBundle getResourceBundle() {
+  //    return resourceBundle;
+  //  }
 
   protected void initializeDefaultPreferences(IPreferenceStore store) {
     // windows preferences:
@@ -258,9 +258,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     } else {
       store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     }
-    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString() );
-    // store.setDefault(DOCUMENTROOT_PREF, "c:\\eclipse\\workspace");  // WIN_32
-    // store.setDefault(DOCUMENTROOT_PREF, "/eclipse/workspace");      // UNIX
+    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString());
     if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
       store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}");
       store.setDefault(MYSQL_PREF, "c:\\apache\\mysql\\bin\\mysqld.exe --standalone");
@@ -273,43 +271,55 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       store.setDefault(APACHE_START_PREF, "/apache/apache -c \"DocumentRoot \"{0}\"\"");
       store.setDefault(APACHE_STOP_PREF, "/apache/apache.exe -k shutdown");
       store.setDefault(APACHE_RESTART_PREF, "/apache/apache -k restart");
- 
+
     }
 
     store.setDefault(PHP_PARSER_DEFAULT, PHP_EXTERNAL_PARSER);
     store.setDefault(PHP_INTERNAL_PARSER, "false");
     store.setDefault(PHP_EXTERNAL_PARSER, "true");
-    
+
     store.setDefault(PHP_PARSE_ON_SAVE, "true");
-    
+
     // show line numbers:
     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
+
     PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT, PHPColorProvider.MULTI_LINE_COMMENT);
     PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT, PHPColorProvider.SINGLE_LINE_COMMENT);
     PreferenceConverter.setDefault(store, PHP_KEYWORD, PHPColorProvider.KEYWORD);
     PreferenceConverter.setDefault(store, PHP_VARIABLE, PHPColorProvider.VARIABLE);
     PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME, PHPColorProvider.FUNCTION_NAME);
-    PreferenceConverter.setDefault(store, PHP_STRING, PHPColorProvider.STRING); 
+    PreferenceConverter.setDefault(store, PHP_CONSTANT, PHPColorProvider.CONSTANT);
+    PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);
+    PreferenceConverter.setDefault(store, PHP_STRING, PHPColorProvider.STRING);
     PreferenceConverter.setDefault(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"); //$NON-NLS-1$
+    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);
+    store.setDefault(RESOURCE_BUNDLE_EN_GB, "true");
+    store.setDefault(RESOURCE_BUNDLE_DE, "false");
+    store.setDefault(RESOURCE_BUNDLE_FR, "false");
+
     store.setDefault(PHP_OUTLINE_CLASS, "true"); //$NON-NLS-1$
     store.setDefault(PHP_OUTLINE_FUNC, "true"); //$NON-NLS-1$
     store.setDefault(PHP_OUTLINE_VAR, "true"); //$NON-NLS-1$ 
-  
-    TemplatePreferencePage.initDefaults(store); 
+
+    TemplatePreferencePage.initDefaults(store);
+    new PHPSyntaxRdr(); //this will initialize the static fields in the syntaxrdr class
   }
-  
-    public void startup() throws CoreException {
+
+  public void startup() throws CoreException {
     super.startup();
-    IAdapterManager manager= Platform.getAdapterManager();
+    IAdapterManager manager = Platform.getAdapterManager();
     manager.registerAdapters(new PHPElementAdapterFactory(), PHPElement.class);
     manager.registerAdapters(new ResourceAdapterFactory(), IResource.class);
   }