From f67875134e7043e4819acf6f9d7d3c591b4b4eca Mon Sep 17 00:00:00 2001
From: axelcl <axelcl>
Date: Tue, 14 Jun 2005 05:05:44 +0000
Subject: [PATCH] Created a separated 'externaltools' plugin
---
net.sourceforge.phpeclipse.debug.ui/plugin.xml | 2 +-
.../phpeclipse/ui/text/rules/ViewNode.java | 4 +-
.../prefs/default_win32.properties | 14 -----
.../phpeclipse/IPreferenceConstants.java | 54 ++++++++++----------
.../sourceforge/phpeclipse/PHPeclipsePlugin.java | 40 +++++++-------
5 files changed, 50 insertions(+), 64 deletions(-)
diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index 981002c..4e62e25 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -34,7 +34,7 @@
point="org.eclipse.ui.preferencePages">
<page
name="%PreferencePage.PHPInterpreter.name"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.debug.ui.preferences.PHPInterpreterPreferencePage"
id="net.sourceforge.phpdt.debug.ui.preferences.PreferencePagePHPInterpreter">
</page>
diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/text/rules/ViewNode.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/text/rules/ViewNode.java
index ef5ab0e..2b37763 100644
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/text/rules/ViewNode.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/text/rules/ViewNode.java
@@ -8,13 +8,13 @@
* Contributors:
* Igor Malinin - initial contribution
*
- * $Id: ViewNode.java,v 1.1 2004-09-02 18:26:29 jsurfer Exp $
+ * $Id: ViewNode.java,v 1.2 2005-06-14 05:04:09 axelcl Exp $
*/
package net.sourceforge.phpeclipse.ui.text.rules;
/**
- * @author Igor Malinin
+ * @author Igor Malinin
*/
public class ViewNode extends FlatNode {
diff --git a/net.sourceforge.phpeclipse/prefs/default_win32.properties b/net.sourceforge.phpeclipse/prefs/default_win32.properties
index 8ee625d..d9ce7c7 100644
--- a/net.sourceforge.phpeclipse/prefs/default_win32.properties
+++ b/net.sourceforge.phpeclipse/prefs/default_win32.properties
@@ -1,16 +1,2 @@
-_php_run_pref=c:\\xampp\\php\\php.exe
-_external_parser=c:\\xampp\\php\\php.exe -l -f {0}
-_mysql_run_pref=c:\\xampp\\mysql\\bin\\mysqld-nt.exe
-_apache_run_pref=c:\\xampp\\apache\\bin\\apache.exe
-_xampp_start_pref=c:\\xampp\\xampp_start.exe
-_xampp_stop_pref=c:\\xampp\\xampp_stop.exe
-__mysql_start=--standalone
-__apache_start=-c \"DocumentRoot \"{0}\"\"
-__apache_stop=-k shutdown
-__apache_restart=-k restart
-_mysql_start_background=true
-_apache_start_background=true
-_apache_stop_background=true
-_apache_restart_background=true
__httpd_conf_path=c:\\xampp\\apache\\conf\\httpd.conf
__etc_hosts_path=c:\\windows\\system32\\drivers\\etc\\hosts
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
index 2f85249..793bec6 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
@@ -32,29 +32,29 @@ public interface IPreferenceConstants {
// public static final String LOCALHOST_PREF = "_localhost";
// public static final String DOCUMENTROOT_PREF = "_documentroot";
- public static final String XAMPP_START_PREF = "_xampp_start_pref";
-
- public static final String XAMPP_STOP_PREF = "_xampp_stop_pref";
-
- public static final String MYSQL_RUN_PREF = "_mysql_run_pref";
-
- public static final String MYSQL_START_BACKGROUND = "_mysql_start_background";
-
- public static final String MYSQL_PREF = "__mysql_start";
-
- public static final String APACHE_RUN_PREF = "_apache_run_pref";
-
- public static final String APACHE_START_BACKGROUND = "_apache_start_background";
-
- public static final String APACHE_START_PREF = "__apache_start";
-
- public static final String APACHE_STOP_BACKGROUND = "_apache_stop_background";
-
- public static final String APACHE_STOP_PREF = "__apache_stop";
-
- public static final String APACHE_RESTART_BACKGROUND = "_apache_restart_background";
-
- public static final String APACHE_RESTART_PREF = "__apache_restart";
+// public static final String XAMPP_START_PREF = "_xampp_start_pref";
+//
+// public static final String XAMPP_STOP_PREF = "_xampp_stop_pref";
+//
+// public static final String MYSQL_RUN_PREF = "_mysql_run_pref";
+//
+// public static final String MYSQL_START_BACKGROUND = "_mysql_start_background";
+//
+// public static final String MYSQL_PREF = "__mysql_start";
+//
+// public static final String APACHE_RUN_PREF = "_apache_run_pref";
+//
+// public static final String APACHE_START_BACKGROUND = "_apache_start_background";
+//
+// public static final String APACHE_START_PREF = "__apache_start";
+//
+// public static final String APACHE_STOP_BACKGROUND = "_apache_stop_background";
+//
+// public static final String APACHE_STOP_PREF = "__apache_stop";
+//
+// public static final String APACHE_RESTART_BACKGROUND = "_apache_restart_background";
+//
+// public static final String APACHE_RESTART_PREF = "__apache_restart";
public static final String HTTPD_CONF_PATH_PREF = "__httpd_conf_path";
@@ -62,13 +62,13 @@ public interface IPreferenceConstants {
public static final String SHOW_OUTPUT_IN_CONSOLE = "_show_output_in_console";
- public static final String PHP_RUN_PREF = "_php_run_pref";
-
- public static final String EXTERNAL_PARSER_PREF = "_external_parser";
+// public static final String PHP_RUN_PREF = "_php_run_pref";
+//
+// public static final String EXTERNAL_PARSER_PREF = "_external_parser";
public static final String PHP_EXTENSION_PREFS = "_php_parser_extensions";
- public static final String PHP_PARSER_DEFAULT = "_php_parser_default";
+// public static final String PHP_PARSER_DEFAULT = "_php_parser_default";
// public static final String PHP_INTERNAL_PARSER = "_php_internal_parser";
// public static final String PHP_EXTERNAL_PARSER = "_php_external_parser";
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index c98d0dc..97def0e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -707,30 +707,30 @@ 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(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");
--
1.7.1