new version 1.0.4

[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 926ece6..15c4c7a 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -14,6 +14,7 @@ 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.util.PHPColorProvider;
@@ -63,7 +64,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   //The shared instance.
   private static PHPeclipsePlugin plugin;
   //Resource bundle.
-  private ResourceBundle resourceBundle;
+  //private ResourceBundle resourceBundle;
 
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
@@ -99,11 +100,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() {
@@ -228,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:
@@ -283,6 +284,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     
     // show line numbers:
     store.setDefault(LINE_NUMBER_RULER, "false");
+    store.setDefault(FORMATTER_TAB_SIZE, "4");
     
     // php syntax highlighting
     PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT, PHPColorProvider.MULTI_LINE_COMMENT);
@@ -297,6 +299,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
 
     store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
     PreferenceConverter.setDefault(store, PREFERENCE_COLOR_BACKGROUND, PHPColorProvider.BACKGROUND_COLOR);
+  
+    TemplatePreferencePage.initDefaults(store); 
   }
   
     public void startup() throws CoreException {