staged, not released

Author: paulvi

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

@@ -28,7 +28,7 @@
  * Launching `jjs` from Java 8.<br>
  * see LaunchConfigurationDelegate in .debug and .phantomjs module for comparison.
  * 
- * @since 0.7
+ * @since 0.15
  * @author Paul Verest
  */
 public class LaunchConfigurationDelegate implements ILaunchConfigurationDelegate {
@@ -53,7 +53,7 @@ public void launch(ILaunchConfiguration configuration, String mode,
 //			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(AvatarjsConstants.PREFERENCES_PAGE,
-					"Java 8 Nashorn jjs location is not correctly configured.\n\n"
+					"Java 8 location is not correctly configured.\n\n"
 					+ "Please goto Window -> Preferences -> "+AvatarjsConstants.PREFERENCE_PAGE_NAME
 					+" and configure the correct location");
 			return;

org.nodeclipse.java.avatarjs/src/org/nodeclipse/java/avatarjs/preferences/AvatarjsPreferencePage.java

@@ -3,25 +3,26 @@
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.nodeclipse.ui.Activator;
-import org.nodeclipse.ui.preferences.PreferenceConstants;
+import org.nodeclipse.java.avatarjs.Activator;
 
 /**
  * @author Paul Verest
  * @since 0.11 moved from NodePreferencePage
  */
 public class AvatarjsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
-    private FileFieldEditor jjsPath;
-    private BooleanFieldEditor jjsJustJJS;
+    private FileFieldEditor javaPath;
+    private BooleanFieldEditor javaJustJava;
+    private StringFieldEditor javaOptions;
+    private StringFieldEditor javaOptionsToRunWithAvatarjs;
 
 	public AvatarjsPreferencePage(){
 	       super(GRID);
-	        // ! uses .ui
 	        setPreferenceStore(Activator.getDefault().getPreferenceStore());
-	        setDescription("Java 8 Nashorn jjs settings");
+	        setDescription("Java 8 Avatar.js settings");
 	}
 
 	@Override
@@ -30,13 +31,19 @@ public void init(IWorkbench workbench) {
 
 	@Override
 	protected void createFieldEditors() {
-	       jjsPath = new FileFieldEditor(PreferenceConstants.JJS_PATH, "`jjs` path:", getFieldEditorParent());
-	        addField(jjsPath);
-
-	        jjsJustJJS = new BooleanFieldEditor(PreferenceConstants.JJS_JUST_JJS, 
-	        		"just `jjs` (find `jjs` on PATH. Useful when there are 2 or more JDK 8 instances)", getFieldEditorParent());
-	        addField(jjsJustJJS);
-	        
+		javaPath = new FileFieldEditor(AvatarjsConstants.JAVA_PATH, "Java path:", getFieldEditorParent());
+	    addField(javaPath);
+	
+	    javaJustJava = new BooleanFieldEditor(AvatarjsConstants.JAVA_JUST_JAVA, 
+	    		"just `java` (find `java` on PATH. Useful when there are 2 or more JDK 8 instances)", getFieldEditorParent());
+	    addField(javaJustJava);
+	
+	    javaOptions = new StringFieldEditor(AvatarjsConstants.JAVA_OPTIONS, "`Java options:", getFieldEditorParent());
+        addField(javaOptions);
+    
+        javaOptionsToRunWithAvatarjs = new StringFieldEditor(AvatarjsConstants.JAVA_OPTIONS_TO_RUN_WITH_AVATARJS, 
+        		"`Java options to run with Avatar.js:", getFieldEditorParent());
+        addField(javaOptionsToRunWithAvatarjs);
 	}
 
 }