PhantomJS set working dir, use EnvironmentTab from .debug module;

Author: Paul Verest 伟保罗

…pse/debug/launch/NodeEnvironmentTab.java …h/LaunchConfigurationEnvironmentTab.javaorg.nodeclipse.debug/src/org/nodeclipse/debug/launch/NodeEnvironmentTab.java renamed to org.nodeclipse.debug/src/org/nodeclipse/debug/launch/LaunchConfigurationEnvironmentTab.java org.nodeclipse.debug/src/org/nodeclipse/debug/launch/NodeEnvironmentTab.java renamed to org.nodeclipse.debug/src/org/nodeclipse/debug/launch/LaunchConfigurationEnvironmentTab.java

@@ -73,7 +73,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.nodeclipse.debug.util.Constants;
 
-@SuppressWarnings("restriction")
 /**
  * Launch configuration tab for configuring the environment passed
  * into Runtime.exec(...) when a config is launched.
@@ -87,7 +86,8 @@
  * @since 3.0
  * @noextend This class is not intended to be subclassed by clients.
  */
-public class NodeEnvironmentTab extends AbstractLaunchConfigurationTab {
+@SuppressWarnings("restriction")
+public class LaunchConfigurationEnvironmentTab extends AbstractLaunchConfigurationTab {
 
 	protected TableViewer environmentTable;
 	protected String[] envTableColumnHeaders = {
@@ -185,7 +185,7 @@ public Image getColumnImage(Object element, int columnIndex) {
 	/**
 	 * Constructs a new tab with default context help.
 	 */
-	public NodeEnvironmentTab() {
+	public LaunchConfigurationEnvironmentTab() {
 		setHelpContextId(IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ENVIRONMENT_TAB);
 	}
 

org.nodeclipse.debug/src/org/nodeclipse/debug/launch/LaunchConfigurationTabGroup.java

@@ -17,7 +17,7 @@ public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
         ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { 
         		new LaunchConfigurationMainTab(),
         		new NodeArgumentsTab(),
-        		new NodeEnvironmentTab(),
+        		new LaunchConfigurationEnvironmentTab(),
         		new CommonTab() 
         };
         setTabs(tabs);

…declipse/phantomjs/launch/Constants.java …phantomjs/launch/ConstantsPhantomJS.javaorg.nodeclipse.phantomjs/src/org/nodeclipse/phantomjs/launch/Constants.java renamed to org.nodeclipse.phantomjs/src/org/nodeclipse/phantomjs/launch/ConstantsPhantomJS.java org.nodeclipse.phantomjs/src/org/nodeclipse/phantomjs/launch/Constants.java renamed to org.nodeclipse.phantomjs/src/org/nodeclipse/phantomjs/launch/ConstantsPhantomJS.java

@@ -1,6 +1,6 @@
 package org.nodeclipse.phantomjs.launch;
 
-public class Constants {
+public class ConstantsPhantomJS {
 
 	public static final String PROCESS_MESSAGE = "PhantomJS Process";
 

org.nodeclipse.phantomjs/src/org/nodeclipse/phantomjs/launch/LaunchConfigurationDelegate.java

@@ -2,7 +2,9 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -14,7 +16,9 @@
 import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 import org.eclipse.debug.core.model.RuntimeProcess;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.nodeclipse.debug.util.Constants;
 import org.nodeclipse.debug.util.NodeDebugUtil;
+import org.nodeclipse.debug.util.VariablesUtil;
 import org.nodeclipse.ui.Activator;
 import org.nodeclipse.ui.preferences.Dialogs;
 import org.nodeclipse.ui.preferences.PreferenceConstants;
@@ -36,6 +40,7 @@ public class LaunchConfigurationDelegate
 	//extends org.nodeclipse.debug.launch.LaunchConfigurationDelegate
 	implements ILaunchConfigurationDelegate {
 
+	//@SuppressWarnings("unchecked")
 	@Override
 	public void launch(ILaunchConfiguration configuration, String mode,
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
@@ -72,16 +77,37 @@ public void launch(ILaunchConfiguration configuration, String mode,
 		// path is relative, so cannot find it, unless get absolute path
 		cmdLine.add(filePath);
 
+		String workingDirectory = configuration.getAttribute(Constants.ATTR_WORKING_DIRECTORY, "");
+		File workingPath = null;
+		if(workingDirectory.length() == 0) {
+			workingPath = (new File(filePath)).getParentFile();
+		} else {
+			workingDirectory = VariablesUtil.resolveValue(workingDirectory);
+			if(workingDirectory == null) {
+				workingPath = (new File(filePath)).getParentFile();
+			} else {
+				workingPath = new File(workingDirectory);
+			}
+		}
+		
+		Map<String, String> envm = new HashMap<String, String>();
+		envm = configuration.getAttribute(Constants.ATTR_ENVIRONMENT_VARIABLES, envm);
+		String[] envp = new String[envm.size()];
+		int idx = 0;
+		for(String key : envm.keySet()) {
+			String value = envm.get(key);
+			envp[idx++] = key + "=" + value;
+		}
+		
 
 		for(String s : cmdLine) NodeclipseConsole.write(s+" ");
 		NodeclipseConsole.write("\n");
 
 		String[] cmds = {};
 		cmds = cmdLine.toArray(cmds);
-		// Launch a process to debug.eg,
-		//TODO Process p = DebugPlugin.exec(cmds, workingPath, envp);
-		Process p = DebugPlugin.exec(cmds, null, null);
-		RuntimeProcess process = (RuntimeProcess)DebugPlugin.newProcess(launch, p, Constants.PROCESS_MESSAGE);
+		// Launch a process to run or debug
+		Process p = DebugPlugin.exec(cmds, workingPath, envp);
+		RuntimeProcess process = (RuntimeProcess)DebugPlugin.newProcess(launch, p, ConstantsPhantomJS.PROCESS_MESSAGE);
 		if (isDebugMode) {
 			int phantomjsDebugPort = preferenceStore.getInt(PreferenceConstants.PHANTOMJS_DEBUG_PORT);
 			NodeDebugUtil.launch(mode, launch, monitor, phantomjsDebugPort);

org.nodeclipse.phantomjs/src/org/nodeclipse/phantomjs/launch/LaunchConfigurationTabGroup.java

@@ -4,6 +4,7 @@
 import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.nodeclipse.debug.launch.LaunchConfigurationEnvironmentTab;
 
 
 /**
@@ -18,7 +19,7 @@ public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
         ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { 
 //        		new LaunchConfigurationMainTab(),
 //        		new NodeArgumentsTab(),
-//        		new NodeEnvironmentTab(),
+        		new LaunchConfigurationEnvironmentTab(),
         		new CommonTab() 
         };
         setTabs(tabs);