misc

[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 c98d0dc..699801e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -560,13 +560,25 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     getDefault().getLog().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 void log(Throwable t) {
+         log(error(t));
+  }
+  
+  public static void log(String message, Throwable t) {
+    log(error(message, t)); 
   }
 
   public static void logErrorMessage(String message) {
     log(new Status(IStatus.ERROR, getPluginId(), IJavaStatusConstants.INTERNAL_ERROR, message, null));
   }
+  
+  public static IStatus error(Throwable t) {
+         return error("PHPeclipsePlugin.internalErrorOccurred", t); //$NON-NLS-1$
+  }
+  
+  public static IStatus error(String message, Throwable t) {
+         return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, t);
+  }
 
   //  private static void setJVM() {
   //    String osName = System.getProperty("os.name");
@@ -707,44 +719,44 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     } catch (Exception e) {
       // no default properties found
       if (operatingSystem.equals(Platform.OS_WIN32)) {
-        store.setDefault(PHP_RUN_PREF, "c:\\apache\\php\\php.exe");
-        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");
+//        store.setDefault(PHP_RUN_PREF, "c:\\apache\\php\\php.exe");
+//        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(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}\"\"");
-      store.setDefault(APACHE_STOP_PREF, "-k shutdown");
-      store.setDefault(APACHE_RESTART_PREF, "-k restart");
-      store.setDefault(MYSQL_START_BACKGROUND, "true");
-      store.setDefault(APACHE_START_BACKGROUND, "true");
-      store.setDefault(APACHE_STOP_BACKGROUND, "true");
-      store.setDefault(APACHE_RESTART_BACKGROUND, "true");
+//      store.setDefault(MYSQL_PREF, "--standalone");
+//      store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\"");
+//      store.setDefault(APACHE_STOP_PREF, "-k shutdown");
+//      store.setDefault(APACHE_RESTART_PREF, "-k restart");
+//      store.setDefault(MYSQL_START_BACKGROUND, "true");
+//      store.setDefault(APACHE_START_BACKGROUND, "true");
+//      store.setDefault(APACHE_STOP_BACKGROUND, "true");
+//      store.setDefault(APACHE_RESTART_BACKGROUND, "true");
     }
 
-    store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
-    store.setDefault(PHP_OBFUSCATOR_DEFAULT, "c:\\temp");
-    if (operatingSystem.equals(Platform.OS_WIN32)) {
+//    store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
+//    store.setDefault(PHP_OBFUSCATOR_DEFAULT, "c:\\temp");
+//    if (operatingSystem.equals(Platform.OS_WIN32)) {
       //    store.setDefault(EXTERNAL_BROWSER_PREF, "rundll32 url.dll,FileProtocolHandler {0}");
-    } else if (operatingSystem.equals(Platform.OS_MACOSX)) {
-      store.setDefault(PHP_OBFUSCATOR_DEFAULT, "/tmp");
+//    } else if (operatingSystem.equals(Platform.OS_MACOSX)) {
+//      store.setDefault(PHP_OBFUSCATOR_DEFAULT, "/tmp");
       // TODO How do we start Safari on Mac OS X ?
       //    store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
-    } else {
-      store.setDefault(PHP_OBFUSCATOR_DEFAULT, "/tmp");
+//    } else {
+//      store.setDefault(PHP_OBFUSCATOR_DEFAULT, "/tmp");
       //    store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
-    }
+//    }
 
     store.setDefault(PHP_EXTENSION_PREFS, "php,php3,php4,php5,phtml,inc,module,class");
     
@@ -763,6 +775,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     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_VARIABLE_DOLLAR, PHPColorProvider.VARIABLE);
     PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME, PHPColorProvider.FUNCTION_NAME);
     PreferenceConverter.setDefault(store, PHP_CONSTANT, PHPColorProvider.CONSTANT);
     PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);