vertx run rhino:path; use VERTX_HOME

Author: Paul Verest

org.nodeclipse.vertx/plugin.xml

@@ -122,14 +122,12 @@ Copyright (c) 2014 Enide, Paul Verest & other Nodeclipse authors. http://www.nod
 		</launchConfigurationTabGroup>
    </extension>
 
-	<!-- not used
   <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.nodeclipse.phantomjs.preferences.PhantomjsPreferenceInitializer">
+            class="org.nodeclipse.vertx.preferences.VertxPreferenceInitializer">
       </initializer>
    </extension>
-    -->
    <extension
          point="org.eclipse.ui.preferencePages">
       <page

org.nodeclipse.vertx/src/org/nodeclipse/vertx/VertxConstants.java

@@ -8,7 +8,8 @@ public class VertxConstants {
 
 	public static final String PROCESS_MESSAGE = "Vert.x Process";
 
-	public static final String VERTX_PATH = "vertx_path";
+	//public static final String VERTX_PATH = "vertx_path";
+	public static final String VERTX_HOME_TO_USE = "vertx_home_to_use";
 
 	public static final String ATTR_ENVIRONMENT_VARIABLES = "attr_environment_variables";	
 

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

@@ -9,6 +9,7 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
@@ -25,14 +26,17 @@
 import org.nodeclipse.vertx.VertxConstants;
 
 /**
- * Launching `jjs` from Java 8.<br>
+ * Launching `vertx run rhino:path` .<br>
  * see LaunchConfigurationDelegate in .debug and .phantomjs module for comparison.
  * 
- * @since 0.7
+ * @since 0.11
  * @author Paul Verest
  */
 public class LaunchConfigurationDelegate implements ILaunchConfigurationDelegate {
 
+	boolean isWindows = Platform.getOS().startsWith("win");
+	private boolean warned = false;
+	
 	@Override
 	public void launch(ILaunchConfiguration configuration, String mode,
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
@@ -43,15 +47,16 @@ public void launch(ILaunchConfiguration configuration, String mode,
 		// Using configuration to build command line	
 		List<String> cmdLine = new ArrayList<String>();
 
-		String executablePath= preferenceStore.getString(VertxConstants.VERTX_PATH);
-		// Check if the node location is correctly configured
+		String vertxHomeToUse= preferenceStore.getString(VertxConstants.VERTX_HOME_TO_USE);
+		String executablePath=  vertxHomeToUse + (isWindows?"\\bin\\vertx.bat":"/bin/vertx");
+		// Check if the vertx location is correctly configured
 		File executableFile = new File(executablePath);
-		if(!executableFile.exists()){
+		if( ("".equals(vertxHomeToUse)) || (!executableFile.exists()) ){
 			// If the location is not valid than show a dialog which prompts the user to goto the preferences page
 //			Dialogs.showPreferencesDialog("path to jjs util from Java 8 runtime is not correctly configured.\n\n"
 //					+ "Please goto Window -> Prefrences -> Nodeclipse and configure the correct location under 'JJS path:'");
 			CommonDialogs.showPreferencesDialog(VertxConstants.PREFERENCES_PAGE,
-					"Vert.x `vertx` location is not correctly configured.\n\n"
+					"Vert.x installation is not correctly configured.\n\n"
 					+ "Please goto Window -> Preferences -> "+VertxConstants.PREFERENCE_PAGE_NAME
 					+" and configure the correct location");
 			return;
@@ -63,7 +68,7 @@ public void launch(ILaunchConfiguration configuration, String mode,
 		String file = configuration.getAttribute(VertxConstants.KEY_FILE_PATH,	"");
 		String filePath = ResourcesPlugin.getWorkspace().getRoot().findMember(file).getLocation().toOSString();
 		// path is relative, so cannot find it, unless get absolute path
-		cmdLine.add(filePath);
+		cmdLine.add("rhino:"+filePath);
 
 		File workingPath = null;
 		String workingDirectory = configuration.getAttribute(Constants.ATTR_WORKING_DIRECTORY, "");
@@ -94,8 +99,6 @@ public void launch(ILaunchConfiguration configuration, String mode,
 
 	}
 
-	private boolean warned = false;
-
 	/** Get EnvironmentVariables from ILaunchConfiguration
 	 * and adds JAVA_HOME, GRADLE_HOME, PATH, TEMP, SystemDrive, HOME 
 	 * @param configuration ILaunchConfiguration

org.nodeclipse.vertx/src/org/nodeclipse/vertx/preferences/VertxPreferenceInitializer.java

@@ -0,0 +1,19 @@
+package org.nodeclipse.vertx.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.nodeclipse.vertx.Activator;
+import org.nodeclipse.vertx.VertxConstants;
+
+public class VertxPreferenceInitializer extends AbstractPreferenceInitializer {
+
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		String vertxHome = System.getenv("VERTX_HOME");
+		if (vertxHome!=null){
+			store.setDefault(VertxConstants.VERTX_HOME_TO_USE, vertxHome );
+		}
+	}
+
+}

org.nodeclipse.vertx/src/org/nodeclipse/vertx/preferences/VertxPreferencePage.java

@@ -1,12 +1,10 @@
 package org.nodeclipse.vertx.preferences;
 
+import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.FileFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.nodeclipse.vertx.Activator;
-//import org.nodeclipse.ui.Activator;
-//import org.nodeclipse.ui.preferences.PreferenceConstants;
 import org.nodeclipse.vertx.VertxConstants;
 
 /**
@@ -15,14 +13,14 @@
  */
 public class VertxPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
-    private FileFieldEditor vertxPath;
+    private DirectoryFieldEditor vertxHomeToUse;
 
 	public VertxPreferencePage(){
 	       super(GRID);
 	        setPreferenceStore(Activator.getDefault().getPreferenceStore());
 	        setDescription(VertxConstants.PREFERENCE_PAGE_DESCRIPTION+"\n"
 	        +"Vert.x requires JDK 1.7.0 or later. Make sure the JDK bin directory is on your `PATH`.\n"
-	        +"create VERTX_HOME pointing to folder where you extracted .zip, add %VERTX_HOME%\bin; to your `PATH`");
+	        +"create VERTX_HOME pointing to folder where you extracted .zip, add %VERTX_HOME%/bin; to your `PATH`");
 	}
 
 	@Override
@@ -31,7 +29,7 @@ public void init(IWorkbench workbench) {
 
 	@Override
 	protected void createFieldEditors() {
-	       vertxPath = new FileFieldEditor(VertxConstants.VERTX_PATH, "`vertx` path:", getFieldEditorParent());
-	        addField(vertxPath);
+	       vertxHomeToUse = new DirectoryFieldEditor(VertxConstants.VERTX_HOME_TO_USE, "VERTX_HOME to use:", getFieldEditorParent());
+	        addField(vertxHomeToUse);
 	}
 }