bug fix 1403993, scanner wrongly detected XML comment end, when closing > was still...

[phpeclipse.git] / net.sourceforge.phpeclipse.externaltools / src / net / sourceforge / phpdt / externaltools / preferences / PHPExternalToolsPreferencePage.java

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java
index fbc578a..91d3c15 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java
@@ -39,6 +39,10 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements IW
 
   FileFieldEditor phpRunFFE;
 
+  FileFieldEditor httpdConfFFE;
+  
+  FileFieldEditor etcHostsFFE;
+
   BooleanFieldEditor apacheStartBFE;
 
   BooleanFieldEditor apacheStopBFE;
@@ -67,6 +71,8 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements IW
     externalParserSFE.loadDefault();
     phpRunFFE.loadDefault();
     apacheRunFFE.loadDefault();
+    httpdConfFFE.loadDefault();
+    etcHostsFFE.loadDefault();
     mysqlRunFFE.loadDefault();
     apacheStartBFE.loadDefault();
     apacheStopBFE.loadDefault();
@@ -87,6 +93,8 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements IW
     externalParserSFE.store();
     phpRunFFE.store();
     apacheRunFFE.store();
+    httpdConfFFE.store();
+    etcHostsFFE.store();
     mysqlRunFFE.store();
 
     apacheStartBFE.store();
@@ -103,16 +111,6 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements IW
     composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
     composite.setLayout(new GridLayout());
 
-    // allowed PHP file extensions for parsing
-    Composite phpParserExtensionsComposite = new Composite(composite, SWT.NULL);
-    phpParserExtensionsComposite.setLayout(new GridLayout());
-    phpParserExtensionsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); 
-//    phpParserExtensionsSFE = new StringFieldEditor(IPreferenceConstants.PHP_EXTENSION_PREFS, PHPPreferencesMessages
-//        .getString("PHPBasePreferencePage.phpExtensionPrefs"), phpParserExtensionsComposite);
-//    phpParserExtensionsSFE.setPreferencePage(this);
-//    phpParserExtensionsSFE.setPreferenceStore(getPreferenceStore());
-//    phpParserExtensionsSFE.load();
-    
     //Create apache
     Composite apacheSettingsComposite = new Composite(composite, SWT.NULL);
     apacheSettingsComposite.setLayout(new GridLayout());
@@ -186,6 +184,18 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements IW
     apacheRunFFE.setPreferenceStore(getPreferenceStore());
     apacheRunFFE.load();
 
+    httpdConfFFE = new FileFieldEditor(ExternalToolsPlugin.HTTPD_CONF_PATH_PREF, 
+               "Path to httpd.conf:", apacheSettingsGroup);
+    httpdConfFFE.setPreferencePage(this);
+    httpdConfFFE.setPreferenceStore(getPreferenceStore());
+    httpdConfFFE.load();
+
+    etcHostsFFE = new FileFieldEditor(ExternalToolsPlugin.ETC_HOSTS_PATH_PREF, 
+               "Path to etc/hosts:", apacheSettingsGroup);
+    etcHostsFFE.setPreferencePage(this);
+    etcHostsFFE.setPreferenceStore(getPreferenceStore());
+    etcHostsFFE.load();
+
     phpRunFFE = new FileFieldEditor(ExternalToolsPlugin.PHP_RUN_PREF, PHPPreferencesMessages
         .getString("PHPBasePreferencePage.console.php"), apacheSettingsGroup);
     phpRunFFE.setPreferencePage(this);