changed to version 1.1.5 for js.core

[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 6bf2da9..495d57d 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -125,7 +125,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;
 
   /**
@@ -614,7 +615,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);
@@ -717,11 +724,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}\"\"");
@@ -758,15 +769,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);