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 495d57d..97def0e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -28,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;
@@ -171,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.
@@ -303,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 =
@@ -696,7 +695,8 @@ 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);
       Enumeration enum = resourceBundle.getKeys();
       String key;
@@ -704,44 +704,33 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
         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)) {
-        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(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");
@@ -842,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);
   }