git://secure.phpeclipse.com / phpeclipse.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Created a separated 'externaltools' plugin
[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 8786e71..c98d0dc 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,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -27,7 +28,6 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.WorkingCopyOwner;
 import net.sourceforge.phpdt.externaltools.internal.model.ColorManager;
-import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
 import net.sourceforge.phpdt.internal.core.BatchOperation;
 import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.util.Util;
@@ -124,7 +124,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
    * The id of the PHP plugin (value <code>"net.sourceforge.phpeclipse"</code>).
    */
   public static final String PLUGIN_ID = "net.sourceforge.phpeclipse"; //$NON-NLS-1$
-
+  public static final String ID_PERSPECTIVE = "net.sourceforge.phpeclipse.PHPPerspective"; //$NON-NLS-1$
+       
   IWorkspace w;
 
   /**
@@ -169,7 +170,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
    */
   //   private static final String CODE_TEMPLATES_MIGRATION_KEY= "net.sourceforge.phpdt.ui.text.code_templates_migrated";
   // //$NON-NLS-1$
-  private static ExternalToolsPlugin externalTools;
+//  private static ExternalToolsPlugin externalTools;
 
   /**
    * The Java virtual machine that we are running on.
@@ -301,7 +302,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   public PHPeclipsePlugin(IPluginDescriptor descriptor) {
     super(descriptor);
     plugin = this;
-    externalTools = new ExternalToolsPlugin();
+//    externalTools = new ExternalToolsPlugin();
 
     //    try {
     //      resourceBundle =
@@ -613,7 +614,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     IPath path = iProject.getWorkingLocation(PHPeclipsePlugin.PLUGIN_ID);
     path = path.append("project.index");
     String indexFilename = path.toString();
-    //    System.out.println(indexFilename);
+//    try {
+//      IdentDB db = IdentDB.getInstance();
+//    } catch (ClassNotFoundException e) {
+//      e.printStackTrace();
+//    } catch (SQLException e) {
+//      e.printStackTrace();
+//    } 
     IdentifierIndexManager indexManager = (IdentifierIndexManager) fIndexManagerMap.get(indexFilename);
     if (indexManager == null) {
       indexManager = new IdentifierIndexManager(indexFilename);
@@ -688,22 +695,15 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     String operatingSystem = Platform.getOS();
     // maxosx, linux, solaris, win32,...
     try {
-      InputStream is = getDefault().openStream(new Path("prefs/default_" + operatingSystem + ".properties"));
+      InputStream is = getDefault().openStream(
+               new Path("prefs/default_" + operatingSystem + ".properties"));
       PropertyResourceBundle resourceBundle = new PropertyResourceBundle(is);
-      
-      store.setDefault(PHP_RUN_PREF, resourceBundle.getString(PHP_RUN_PREF));
-      store.setDefault(EXTERNAL_PARSER_PREF, resourceBundle.getString(EXTERNAL_PARSER_PREF));
-      store.setDefault(MYSQL_RUN_PREF, resourceBundle.getString(MYSQL_RUN_PREF));
-      store.setDefault(APACHE_RUN_PREF, resourceBundle.getString(APACHE_RUN_PREF));
-      
-      store.setDefault(MYSQL_PREF, resourceBundle.getString(MYSQL_PREF));
-      store.setDefault(APACHE_START_PREF, resourceBundle.getString(APACHE_START_PREF));
-      store.setDefault(APACHE_STOP_PREF, resourceBundle.getString(APACHE_STOP_PREF));
-      store.setDefault(APACHE_RESTART_PREF, resourceBundle.getString(APACHE_RESTART_PREF));
-      store.setDefault(MYSQL_START_BACKGROUND, resourceBundle.getString(MYSQL_START_BACKGROUND));
-      store.setDefault(APACHE_START_BACKGROUND, resourceBundle.getString(APACHE_START_BACKGROUND));
-      store.setDefault(APACHE_STOP_BACKGROUND, resourceBundle.getString(APACHE_STOP_BACKGROUND));
-      store.setDefault(APACHE_RESTART_BACKGROUND, resourceBundle.getString(APACHE_RESTART_BACKGROUND));
+      Enumeration enum = resourceBundle.getKeys();
+      String key;
+      while (enum.hasMoreElements()) {
+        key = (String)enum.nextElement();
+        store.setDefault(key, resourceBundle.getString( key ));
+      }
     } catch (Exception e) {
       // no default properties found
       if (operatingSystem.equals(Platform.OS_WIN32)) {
@@ -711,11 +711,17 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
         store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}");
         store.setDefault(MYSQL_RUN_PREF, "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
         store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
+        store.setDefault(XAMPP_START_PREF, "c:\\xampp\\xampp_start.exe");
+        store.setDefault(XAMPP_STOP_PREF, "c:\\xampp\\xampp_stop.exe");
+        store.setDefault(
+               ETC_HOSTS_PATH_PREF, "c:\\windows\\system32\\drivers\\etc\\hosts");
       } else {
         store.setDefault(PHP_RUN_PREF, "/apache/php/php");
         store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
         store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
         store.setDefault(APACHE_RUN_PREF, "/apache/apache");
+        store.setDefault(XAMPP_START_PREF, "xamp/xampp_start");
+        store.setDefault(XAMPP_STOP_PREF, "xampp/xampp_stop");
       }
       store.setDefault(MYSQL_PREF, "--standalone");
       store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\"");
@@ -752,15 +758,17 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     // 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_MULTILINE_COMMENT, PHPColorProvider.MULTI_LINE_COMMENT);
+//    PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT, PHPColorProvider.SINGLE_LINE_COMMENT);
     PreferenceConverter.setDefault(store, PHP_TAG, PHPColorProvider.TAG);
     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_CONSTANT, PHPColorProvider.CONSTANT);
     PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);
-    PreferenceConverter.setDefault(store, PHP_STRING, PHPColorProvider.STRING);
+//    PreferenceConverter.setDefault(store, PHP_STRING_DQ, PHPColorProvider.STRING_DQ);
+//    store.setDefault(PHP_STRING_BOLD_DQ, true); 
+//    PreferenceConverter.setDefault(store, PHP_STRING_SQ, PHPColorProvider.STRING_SQ); 
     PreferenceConverter.setDefault(store, PHP_DEFAULT, PHPColorProvider.DEFAULT);
     PreferenceConverter.setDefault(store, PHPDOC_KEYWORD, PHPColorProvider.PHPDOC_KEYWORD);
     PreferenceConverter.setDefault(store, PHPDOC_TAG, PHPColorProvider.PHPDOC_TAG);
@@ -823,7 +831,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     new PHPSyntaxRdr();
     JavaCore.initializeDefaultPluginPreferences();
     PreferenceConstants.initializeDefaultValues(store);
-    externalTools.initializeDefaultPreferences(store);
+//    externalTools.initializeDefaultPreferences(store);
     MarkerAnnotationPreferences.initializeDefaultValues(store);
   }
 
PHPEclipse IDE project