Merged "Open PHP Declaration" and "Open Include File" into one action "Open Declarati...

[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 f6ab554..5d47f96 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPStartApacheAction.java
@@ -7,16 +7,15 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
                IBM Corporation - Initial implementation
-               Klaus Hartlage - www.eclipseproject.de
+               www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpeclipse.actions;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.text.MessageFormat;
 
 import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.ui.WebUI;
 import net.sourceforge.phpeclipse.views.PHPConsole;
 
 import org.eclipse.jface.action.IAction;
@@ -31,7 +30,7 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
   public void run(IAction action) {
     final IPreferenceStore store =
       PHPeclipsePlugin.getDefault().getPreferenceStore();
-    String documentRoot = store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
+    String documentRoot = store.getString(WebUI.PHP_DOCUMENTROOT_PREF);
     // replace backslash with slash in the DocumentRoot under Windows
     documentRoot = documentRoot.replace('\\', '/');
     String[] arguments = { documentRoot };
@@ -44,34 +43,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
@@ -106,74 +77,8 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
     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 = null;
-      try {
-        console = PHPConsole.getInstance();
-        if (console != null) {
-          console.write(consoleMessage + command + "\n");
-        }
-      } catch (Throwable th) {
-
-      }
-
-      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) {
 
   }
@@ -186,34 +91,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 {
-  //
-  //                   }
-  //           }
-  //   }
-
 }