jjs options

paulvi · paulvi · commit acec3a549c3c · 2014-12-10T16:34:57.000+08:00
diff --git a/org.nodeclipse.jjs/src/org/nodeclipse/jjs/launch/LaunchConfigurationDelegate.java b/org.nodeclipse.jjs/src/org/nodeclipse/jjs/launch/LaunchConfigurationDelegate.java
@@ -60,6 +60,14 @@ public void launch(ILaunchConfiguration configuration, String mode,
 		}			
 		cmdLine.add(jjsPath);
 		
+		String jjsOptions= preferenceStore.getString(PreferenceConstants.JJS_OPTIONS);
+		if(!jjsOptions.equals("")) {
+			String[] sa = jjsOptions.split(" ");
+			for(String s : sa) {
+				cmdLine.add(s);
+			}			
+		}		
+		
 		if (isDebugMode) {
 			//TODO research how to debug
 		}
diff --git a/org.nodeclipse.jjs/src/org/nodeclipse/jjs/preferences/JJSPreferencePage.java b/org.nodeclipse.jjs/src/org/nodeclipse/jjs/preferences/JJSPreferencePage.java
@@ -3,6 +3,7 @@
 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.preferences.PreferenceConstants;
@@ -15,6 +16,7 @@ public class JJSPreferencePage extends FieldEditorPreferencePage implements IWor
 
     private FileFieldEditor jjsPath;
     private BooleanFieldEditor jjsJustJJS;
+	private StringFieldEditor jjsOptions;
     
 	public JJSPreferencePage(){
 	       super(GRID);
@@ -29,12 +31,15 @@ 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);
 
-	        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);
+       jjsPath = new FileFieldEditor(PreferenceConstants.JJS_PATH, "`jjs` path:", getFieldEditorParent());
+       addField(jjsPath);
+
+       jjsOptions = new StringFieldEditor(PreferenceConstants.JJS_OPTIONS, "jjs options (jjs -h):", getFieldEditorParent());
+       addField(jjsOptions);
 	        
 	}
 
diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/preferences/PreferenceConstants.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/preferences/PreferenceConstants.java
@@ -39,6 +39,7 @@ public class PreferenceConstants {
 	public static final String PHANTOMJS_DEBUG_AUTORUN = "phantomjs_debug_autorun";
 	public static final String JJS_PATH = "jjs_path";
 	public static final String JJS_JUST_JJS = "jjs_just_jjs";
+	public static final String JJS_OPTIONS = "jjs_options";
 	public static final String MONGODB_SHELL_PATH = "mongodb_shell_path";
 	public static final String MONGODB_SHELL_OPTIONS = "mongodb_shell_options";
 	

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,14 @@ public void launch(ILaunchConfiguration configuration, String mode,`
`60`	`60`	`}`
`61`	`61`	`cmdLine.add(jjsPath);`
`62`	`62`
	`63`	`+ String jjsOptions= preferenceStore.getString(PreferenceConstants.JJS_OPTIONS);`
	`64`	`+ if(!jjsOptions.equals("")) {`
	`65`	`+ String[] sa = jjsOptions.split(" ");`
	`66`	`+ for(String s : sa) {`
	`67`	`+ cmdLine.add(s);`
	`68`	`+ }`
	`69`	`+ }`
	`70`	`+`
`63`	`71`	`if (isDebugMode) {`
`64`	`72`	`//TODO research how to debug`
`65`	`73`	`}`