options in Preferences for maven & gradle

Author: paulvi

org.nodeclipse.enide.gradle/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: `build.gradle` Run As Gradle GUI
+Bundle-Name: `build.gradle` Run As Gradle GUI or gradle build
 Bundle-SymbolicName: org.nodeclipse.enide.gradle;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.nodeclipse.enide.gradle.Activator

org.nodeclipse.enide.gradle/src/org/nodeclipse/enide/gradle/launch/LaunchConfigurationDelegate.java

@@ -16,6 +16,8 @@
 import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 import org.eclipse.debug.core.model.RuntimeProcess;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.nodeclipse.enide.gradle.Activator;
+import org.nodeclipse.enide.gradle.preferences.Dialogs;
 //import org.eclipse.jface.preference.IPreferenceStore;
 //import org.nodeclipse.debug.util.Constants;
 //import org.nodeclipse.debug.util.VariablesUtil;
@@ -25,8 +27,6 @@
 //import org.nodeclipse.ui.util.NodeclipseConsole;
 import org.nodeclipse.enide.gradle.preferences.GradleConstants;
 import org.nodeclipse.enide.gradle.util.VariablesUtil;
-import org.nodeclipse.enide.gradle.Activator;
-import org.nodeclipse.enide.gradle.preferences.Dialogs;
 
 /**
  * `build.gradle` Run As gradle build<br>
@@ -60,6 +60,22 @@ public void launch(ILaunchConfiguration configuration, String mode,
 		}			
 		cmdLine.add(gradlePath);
 
+		String nodeOptions= preferenceStore.getString(GradleConstants.GRADLE_OPTIONS);
+		if(!nodeOptions.equals("")) {
+			String[] sa = nodeOptions.split(" ");
+			for(String s : sa) {
+				cmdLine.add(s);
+			}			
+		}
+		
+//		String nodeArgs = configuration.getAttribute(GradleConstants.ATTR_GRADLE_ARGUMENTS, "");
+//		if(!nodeArgs.equals("")) {
+//			String[] sa = nodeArgs.split(" ");
+//			for(String s : sa) {
+//				cmdLine.add(s);
+//			}
+//		}
+		
 		String file = configuration.getAttribute(GradleConstants.KEY_FILE_PATH,	"");
 		String filePath = ResourcesPlugin.getWorkspace().getRoot().findMember(file).getLocation().toOSString();
 		// path is relative, so cannot find it, unless get absolute path

org.nodeclipse.enide.gradle/src/org/nodeclipse/enide/gradle/preferences/GradleConstants.java

@@ -18,6 +18,7 @@ public class GradleConstants {
 	public static final String ATTR_APPEND_ENVIRONMENT_VARIABLES = "attr_append_environment_variables";	
 
 	public static final String GRADLE_PATH = "gradle_path";	
+	public static final String GRADLE_OPTIONS = "gradle_options";	
 
 	public static final String PREFERENCES_PAGE = "org.nodeclipse.enide.gradle.preferences.GradlePreferencePage";
 	public static final String PREFERENCE_PAGE_NAME ="Gradle(Nodeclipse)"; // the same as in plugin.xml	

org.nodeclipse.enide.gradle/src/org/nodeclipse/enide/gradle/preferences/GradlePreferencePage.java

@@ -2,6 +2,7 @@
 
 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.enide.gradle.Activator;
@@ -12,6 +13,7 @@
 public class GradlePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
     private FileFieldEditor gradlePath;
+    private StringFieldEditor gradleOptions;
 
     public GradlePreferencePage() {
         super(GRID);
@@ -27,8 +29,10 @@ public void init(IWorkbench workbench) {
 
 	@Override
 	protected void createFieldEditors() {
-	      gradlePath = new FileFieldEditor(GradleConstants.GRADLE_PATH, "Gradle path:", getFieldEditorParent());
-	        addField(gradlePath);		
+      gradlePath = new FileFieldEditor(GradleConstants.GRADLE_PATH, "Gradle path:", getFieldEditorParent());
+        addField(gradlePath);		
+      gradleOptions = new StringFieldEditor(GradleConstants.GRADLE_OPTIONS, "Gradle options (gradle -h):", getFieldEditorParent());
+        addField(gradleOptions);
 	}
 
 

org.nodeclipse.enide.maven/src/org/nodeclipse/enide/maven/launch/LaunchConfigurationDelegate.java

@@ -58,6 +58,23 @@ public void launch(ILaunchConfiguration configuration, String mode,
 			return;
 		}			
 		cmdLine.add(mavenPath);
+		
+		String nodeOptions= preferenceStore.getString(MavenConstants.MAVEN_OPTIONS);
+		if(!nodeOptions.equals("")) {
+			String[] sa = nodeOptions.split(" ");
+			for(String s : sa) {
+				cmdLine.add(s);
+			}			
+		}
+		
+//		String nodeArgs = configuration.getAttribute(GradleConstants.ATTR_GRADLE_ARGUMENTS, "");
+//		if(!nodeArgs.equals("")) {
+//			String[] sa = nodeArgs.split(" ");
+//			for(String s : sa) {
+//				cmdLine.add(s);
+//			}
+//		}
+		
 
 		String file = configuration.getAttribute("KEY_FILE_PATH",	"");
 		String filePath = ResourcesPlugin.getWorkspace().getRoot().findMember(file).getLocation().toOSString();

org.nodeclipse.enide.maven/src/org/nodeclipse/enide/maven/preferences/MavenConstants.java

@@ -16,6 +16,7 @@ public class MavenConstants {
 	public static final String ATTR_APPEND_ENVIRONMENT_VARIABLES = "attr_append_environment_variables";
 
 	public static final String MAVEN_PATH = "maven_path";	
+	public static final String MAVEN_OPTIONS = "maven_options";
 
 	public static final String PREFERENCES_PAGE = "org.nodeclipse.enide.maven.preferences.MavenPreferencePage";
 	public static final String PREFERENCE_PAGE_NAME ="Maven(Nodeclipse)"; // the same as in plugin.xml	

org.nodeclipse.enide.maven/src/org/nodeclipse/enide/maven/preferences/MavenPreferencePage.java

@@ -2,6 +2,7 @@
 
 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.enide.maven.Activator;
@@ -12,6 +13,7 @@
 public class MavenPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
     private FileFieldEditor mavenPath;
+    private StringFieldEditor mavenOptions;
 
     public MavenPreferencePage() {
         super(GRID);
@@ -27,8 +29,10 @@ public void init(IWorkbench workbench) {
 
 	@Override
 	protected void createFieldEditors() {
-	      mavenPath = new FileFieldEditor(MavenConstants.MAVEN_PATH, "Maven path:", getFieldEditorParent());
-	        addField(mavenPath);		
+      mavenPath = new FileFieldEditor(MavenConstants.MAVEN_PATH, "Maven path:", getFieldEditorParent());
+        addField(mavenPath);		
+      mavenOptions = new StringFieldEditor(MavenConstants.MAVEN_OPTIONS, "Maven options (mvn -h):", getFieldEditorParent());
+        addField(mavenOptions);
 	}