some unused Plug-in Depnedencies removed

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / actions / PHPStartApacheAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
index 5883fbe..6e253c8 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
@@ -11,8 +11,6 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpeclipse.actions;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.text.MessageFormat;
 
 import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
@@ -29,12 +27,14 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
   protected IWorkbenchWindow activeWindow = null;
 
   public void run(IAction action) {
-    final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-    String documentRoot = store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
+    final IPreferenceStore store =
+      PHPeclipsePlugin.getDefault().getPreferenceStore();
+    String documentRoot = store.getString(PHPeclipsePlugin.PHP_DOCUMENTROOT_PREF);
     // replace backslash with slash in the DocumentRoot under Windows
     documentRoot = documentRoot.replace('\\', '/');
     String[] arguments = { documentRoot };
-    MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.APACHE_START_PREF));
+    MessageFormat form =
+      new MessageFormat(store.getString(PHPeclipsePlugin.APACHE_START_PREF));
     execute(
       "apache_start",
       store.getString(PHPeclipsePlugin.APACHE_RUN_PREF),
@@ -42,34 +42,6 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
       store.getBoolean(PHPeclipsePlugin.APACHE_START_BACKGROUND));
   }
 
-  //   public static void execute(String command, String consoleMessage) {
-  //           //              MessageDialog.openInformation(activeWindow.getShell(), "Exec command: ", command);
-  //           try {
-  //                   PHPConsole console = PHPConsole.getInstance();
-  //                   console.write(consoleMessage + command + "\n");
-  //                   Runtime runtime = Runtime.getRuntime(); 
-  //
-  //                   // runs the command
-  //                   Process p = runtime.exec(command);
-  //
-  //                   if (PHPeclipsePlugin.getDefault().getPreferenceStore().getBoolean(PHPeclipsePlugin.SHOW_OUTPUT_IN_CONSOLE) == true) {
-  //
-  //                                   OutputThread out = new OutputThread(p.getInputStream(), console);
-  //                                   OutputThread err = new OutputThread(p.getErrorStream(), console);
-  //                                   out.start();
-  //                                   err.start();
-  //        
-  //                   }
-  //
-  //           } catch (IOException e) {
-  //
-  //                   System.err.println("Problem");
-  //                   e.printStackTrace();
-  //
-  //           }
-  //
-  //   }
-
   /**
         * Executes an external progam and saves the LaunchConfiguration under external tools 
         * @param command external tools command name
@@ -77,80 +49,35 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
         * @param arguments arguments for this configuration
         * @param background run this configuration in background mode
         */
-  public static void execute(String command, String executable, String arguments, boolean background) {
+  public static void execute(
+    String command,
+    String executable,
+    String arguments,
+    boolean background) {
     PHPConsole console = PHPConsole.getInstance();
     String consoleMessage;
     if (background) {
-      consoleMessage = "run in background mode-" + command + ": " + executable + " " + arguments;
+      consoleMessage =
+        "run in background mode-"
+          + command
+          + ": "
+          + executable
+          + " "
+          + arguments;
     } else {
-      consoleMessage = "run in foreground mode-" + command + ": " + executable + " " + arguments;
+      consoleMessage =
+        "run in foreground mode-"
+          + command
+          + ": "
+          + executable
+          + " "
+          + arguments;
     }
     console.write(consoleMessage + "\n");
 
     ExternalToolsUtil.execute(command, executable, arguments, background);
-    //    MessageDialog.openInformation(activeWindow.getShell(), "Exec command: ", command);
-    //         try {
-    //                 PHPConsole console = PHPConsole.getInstance();
-    //                 console.write(consoleMessage + command + "\n");
-    //                 
-    //                 ExternalToolsUtil.execute()
-    //                 Runtime runtime = Runtime.getRuntime();
-    //
-    //                 // runs the command
-    //                 Process p = runtime.exec(command);
-    //
-    //                 // gets the input stream to have the post-compile-time information
-    //                 InputStream stream = p.getInputStream();
-    //
-    //                 // get the string from Stream
-    //                 String consoleOutput = PHPConsole.getStringFromStream(stream);
-    //
-    //                 // prints out the information
-    //                 console.write(consoleOutput);
-    //                 return consoleOutput;
-    //
-    //         } catch (IOException e) {
-    //
-    //                 System.err.println("Problem");
-    //                 e.printStackTrace();
-    //
-    //         }
-    //         return "";
   }
-  public static String getParserOutput(String command, String consoleMessage) {
-    //    MessageDialog.openInformation(activeWindow.getShell(), "Exec command: ", command);
-    try {
-      PHPConsole console = PHPConsole.getInstance();
-      if (console != null) {
-        console.write(consoleMessage + command + "\n");
-      }
-
-      Runtime runtime = Runtime.getRuntime();
-
-      // runs the command
-      Process p = runtime.exec(command);
-
-      // gets the input stream to have the post-compile-time information
-      InputStream stream = p.getInputStream();
-
-      // get the string from Stream
-      String consoleOutput = PHPConsole.getStringFromStream(stream);
-
-      // prints out the information
-      if (console != null) {
-        console.write(consoleOutput);
-      }
-      return consoleOutput;
-
-    } catch (IOException e) {
-
-      System.err.println("Problem");
-      e.printStackTrace();
-
-    }
-    return "";
-  }
-
+  
   public void selectionChanged(IAction action, ISelection selection) {
 
   }
@@ -163,34 +90,4 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
 
   }
 
-  //   static class OutputThread extends Thread {
-  //           InputStream fInputStream;
-  //           PHPConsole console;
-  //
-  //           OutputThread(InputStream inputStream, PHPConsole console) {
-  //                   this.fInputStream = inputStream;
-  //                   this.console = console;
-  //           }
-  //
-  //           public void run() {
-  //                   try {
-  //                           BufferedReader bin = new BufferedReader(new InputStreamReader(fInputStream));
-  //
-  //                           String bufferRow;
-  //                           while ((bufferRow = bin.readLine()) != null) {
-  //
-  //                                   // prints out the information
-  //                                   console.write( bufferRow );
-  //
-  //                           }
-  //                           bin.close();
-  //
-  //                   } catch (IOException e) {
-  //                           MessageDialog.openError(null, "Error in output", e.toString());
-  //                   } finally {
-  //
-  //                   }
-  //           }
-  //   }
-
 }