*** empty log message ***

[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..0e23c77 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -11,8 +11,10 @@ package net.sourceforge.phpeclipse;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -124,7 +126,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;
 
   /**
@@ -613,7 +616,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);
@@ -690,20 +699,25 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     try {
       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 ));
+      }
+//      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));
     } catch (Exception e) {
       // no default properties found
       if (operatingSystem.equals(Platform.OS_WIN32)) {
@@ -711,11 +725,15 @@ 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");
       } 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}\"\"");