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 f3a86d2..15c4c7a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -14,14 +14,24 @@ 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;
+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;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IPluginDescriptor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.swt.widgets.Shell;
@@ -47,13 +57,16 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   /**
    * The id of the PHP plugin (value <code>"net.sourceforge.phpeclipse"</code>).
    */
-  public static final String ID_PLUGIN = "net.sourceforge.phpeclipse"; //$NON-NLS-1$
-
+  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.
-  private ResourceBundle resourceBundle;
+  //private ResourceBundle resourceBundle;
 
+  private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
   /**
   * The Java virtual machine that we are running on.  
@@ -87,13 +100,22 @@ 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() {
+    return getDefault().internalGetImageDescriptorRegistry();
   }
 
+  private ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
+    if (fImageDescriptorRegistry == null)
+      fImageDescriptorRegistry= new ImageDescriptorRegistry();
+    return fImageDescriptorRegistry;
+  }
   // @TODO: refactor this into a better method name !
   public PHPDocumentProvider getCompilationUnitDocumentProvider() {
     if (fCompilationUnitDocumentProvider == null)
@@ -188,7 +210,13 @@ 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) ;
+  }
+  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();
   }
@@ -201,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:
@@ -230,16 +258,17 @@ 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
     if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
       store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}");
-      store.setDefault(DOCUMENTROOT_PREF, "c:\\eclipse\\workspace");
       store.setDefault(MYSQL_PREF, "c:\\apache\\mysql\\bin\\mysqld.exe --standalone");
       store.setDefault(APACHE_START_PREF, "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\"");
       store.setDefault(APACHE_STOP_PREF, "c:\\apache\\apache.exe -k shutdown");
       store.setDefault(APACHE_RESTART_PREF, "c:\\apache\\apache.exe -k restart");
     } else {
       store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
-      store.setDefault(DOCUMENTROOT_PREF, "/eclipse/workspace");
       store.setDefault(MYSQL_PREF, "/apache/mysql/bin/mysqld --standalone");
       store.setDefault(APACHE_START_PREF, "/apache/apache -c \"DocumentRoot \"{0}\"\"");
       store.setDefault(APACHE_STOP_PREF, "/apache/apache.exe -k shutdown");
@@ -247,19 +276,37 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
  
     }
 
-    store.setDefault(PHP_PARSER_DEFAULT, "true");
-    store.setDefault(PHP_INTERNAL_PARSER, "true");
-    store.setDefault(PHP_EXTERNAL_PARSER, "false");
+    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
     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_STRING, PHPColorProvider.STRING); 
     PreferenceConverter.setDefault(store, PHP_DEFAULT, PHPColorProvider.DEFAULT);
+    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);
+  
+    TemplatePreferencePage.initDefaults(store); 
+  }
+  
+    public void startup() throws CoreException {
+    super.startup();
+    IAdapterManager manager= Platform.getAdapterManager();
+    manager.registerAdapters(new PHPElementAdapterFactory(), PHPElement.class);
+    manager.registerAdapters(new ResourceAdapterFactory(), IResource.class);
   }
 }
\ No newline at end of file