From 28113f349a74f17322cc9e484ccd80153cdbeb4f Mon Sep 17 00:00:00 2001 From: khartlage Date: Sun, 9 Mar 2003 11:24:47 +0000 Subject: [PATCH] determine windowsSystem with eclips Bootloader class --- .../sourceforge/phpeclipse/PHPeclipsePlugin.java | 108 +++++++++++++++----- 1 files changed, 82 insertions(+), 26 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java index 480c47a..1b89cad 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java @@ -20,6 +20,7 @@ import net.sourceforge.phpeclipse.resourcesview.PHPElement; import net.sourceforge.phpeclipse.resourcesview.PHPElementAdapterFactory; import net.sourceforge.phpeclipse.resourcesview.ResourceAdapterFactory; +import org.eclipse.core.boot.BootLoader; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -41,7 +42,9 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; /** * The main plugin class to be used in the desktop. */ -public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceConstants { +public class PHPeclipsePlugin + extends AbstractUIPlugin + implements IPreferenceConstants { // public static final String LOCALHOST_PREF = "_localhost"; // public static final String DOCUMENTROOT_PREF = "_documentroot"; // public static final String USE_EXTERNAL_BROWSER_PREF = "_use_external_browser"; @@ -58,14 +61,15 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon */ public static final String PLUGIN_ID = "net.sourceforge.phpeclipse"; //$NON-NLS-1$ public final static String PHP_NATURE_ID = PLUGIN_ID + ".phpnature"; - // public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID + ".resourcesview.ViewPHPResources"; //$NON-NLS-1$ + // public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID + ".resourcesview.ViewPHPResources"; //$NON-NLS-1$ public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID + ".ui.CodingActionSet"; //$NON-NLS-1$ public static final String PHPPARSER_NEW = "test.PHPParser"; - public static final String PHPPARSER_ORIGINAL = "net.sourceforge.phpdt.internal.compiler.parser.Parser"; + public static final String PHPPARSER_ORIGINAL = + "net.sourceforge.phpdt.internal.compiler.parser.Parser"; /** Change this if you want to switch PHP Parser) */ - public static final String PHPPARSER = PHPPARSER_ORIGINAL; + public static final String PHPPARSER = PHPPARSER_ORIGINAL; //The shared instance. private static PHPeclipsePlugin plugin; @@ -129,7 +133,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon return fCompilationUnitDocumentProvider; } - public static void setJVM() { + private static void setJVM() { String osName = System.getProperty("os.name"); if (osName.startsWith("Mac OS")) { @@ -258,24 +262,42 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false"); store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true"); + + String windowsSystem = BootLoader.getWS(); + if (jvm == WINDOWS_9x) { - store.setDefault(EXTERNAL_BROWSER_PREF, "command.com /c start iexplore {0}"); - } else if (jvm == WINDOWS_NT) { - store.setDefault(EXTERNAL_BROWSER_PREF, "rundll32 url.dll,FileProtocolHandler {0}"); + store.setDefault( + EXTERNAL_BROWSER_PREF, + "command.com /c start iexplore {0}"); + } else if (windowsSystem.equals(BootLoader.WS_WIN32)) { + store.setDefault( + EXTERNAL_BROWSER_PREF, + "rundll32 url.dll,FileProtocolHandler {0}"); } else { store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}"); } - store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString()); - if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) { + store.setDefault( + DOCUMENTROOT_PREF, + getWorkspace().getRoot().getLocation().toString()); + // if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) { + if (windowsSystem.equals(BootLoader.WS_WIN32)) { store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}"); - store.setDefault(MYSQL_PREF, "c:\\apache\\mysql\\bin\\mysqld.exe --standalone"); - store.setDefault(APACHE_START_PREF, "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\""); + store.setDefault( + MYSQL_PREF, + "c:\\apache\\mysql\\bin\\mysqld.exe --standalone"); + store.setDefault( + APACHE_START_PREF, + "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\""); store.setDefault(APACHE_STOP_PREF, "c:\\apache\\apache.exe -k shutdown"); - store.setDefault(APACHE_RESTART_PREF, "c:\\apache\\apache.exe -k restart"); + store.setDefault( + APACHE_RESTART_PREF, + "c:\\apache\\apache.exe -k restart"); } else { store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}"); store.setDefault(MYSQL_PREF, "/apache/mysql/bin/mysqld --standalone"); - store.setDefault(APACHE_START_PREF, "/apache/apache -c \"DocumentRoot \"{0}\"\""); + store.setDefault( + APACHE_START_PREF, + "/apache/apache -c \"DocumentRoot \"{0}\"\""); store.setDefault(APACHE_STOP_PREF, "/apache/apache.exe -k shutdown"); store.setDefault(APACHE_RESTART_PREF, "/apache/apache -k restart"); @@ -294,21 +316,54 @@ 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_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_MULTILINE_COMMENT, + PHPColorProvider.MULTI_LINE_COMMENT); + PreferenceConverter.setDefault( + store, + PHP_SINGLELINE_COMMENT, + PHPColorProvider.SINGLE_LINE_COMMENT); + 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_DEFAULT, PHPColorProvider.DEFAULT); - PreferenceConverter.setDefault(store, PHP_EDITOR_BACKGROUND, PHPColorProvider.BACKGROUND); - PreferenceConverter.setDefault(store, LINKED_POSITION_COLOR, PHPColorProvider.LINKED_POSITION_COLOR); - PreferenceConverter.setDefault(store, LINE_NUMBER_COLOR, PHPColorProvider.LINE_NUMBER_COLOR); + PreferenceConverter.setDefault( + store, + PHP_DEFAULT, + PHPColorProvider.DEFAULT); + PreferenceConverter.setDefault( + store, + PHP_EDITOR_BACKGROUND, + PHPColorProvider.BACKGROUND); + PreferenceConverter.setDefault( + store, + LINKED_POSITION_COLOR, + PHPColorProvider.LINKED_POSITION_COLOR); + PreferenceConverter.setDefault( + store, + LINE_NUMBER_COLOR, + PHPColorProvider.LINE_NUMBER_COLOR); store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true"); - PreferenceConverter.setDefault(store, PREFERENCE_COLOR_BACKGROUND, PHPColorProvider.BACKGROUND_COLOR); + PreferenceConverter.setDefault( + store, + PREFERENCE_COLOR_BACKGROUND, + PHPColorProvider.BACKGROUND_COLOR); //language stuff store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT); @@ -322,7 +377,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon store.setDefault(PHP_OUTLINE_VAR, "true"); //$NON-NLS-1$ TemplatePreferencePage.initDefaults(store); - new PHPSyntaxRdr(); //this will initialize the static fields in the syntaxrdr class + new PHPSyntaxRdr(); + //this will initialize the static fields in the syntaxrdr class } public void startup() throws CoreException { -- 1.7.1