@@ -2,7 +2,7 @@
 <feature
       id="nnn.code2code"
       label="code2code Feature"
-      version="0.10.6"
+      version="0.10.6.1"
       provider-name="3Zen (original = Samuel Rizzo)">
 
    <description url="http://nnn-dev.github.com/code2code">
 
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: code2code Plug-in modified by 3Zen
 Bundle-SymbolicName: nnn.code2code;singleton:=true
-Bundle-Version: 0.10.6
+Bundle-Version: 0.10.6.1
 Bundle-Vendor: 3Zen (original = Samuel Rizzo)
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui,
 
@@ -116,7 +116,11 @@ public Map<String, String> calculateRequiredParams() {
 	}
 
 	public Map<String, String> calculateContext() throws Exception {
-		return userParams.translated();
+		//3Zen
+		Map<String,String> result = new HashMap<String,String>();
+		result.putAll(calculateEclipseParams());
+		result.putAll(userParams.translated());
+		return result; //userParams.translated();
 	}
 
 	public void setUserConfiguredParams(Map<String, String> userConfiguredParams) {
 
@@ -62,7 +62,7 @@ public Map<String, String> calculateGeneratorRequiredParams() {
 			allRequiredParams.putAll(nestedGenerator.calculateRequiredParams());
 		}
 
-		allRequiredParams.putAll(generator.calculateEclipseParams());
+		//allRequiredParams.putAll(generator.calculateEclipseParams());
 
 		for (String key : paramsConfig.getParams().keySet()) {
 			allRequiredParams.remove(key);
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,11 @@ public Map<String, String> calculateRequiredParams() {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`public Map<String, String> calculateContext() throws Exception {`
`119`		`- return userParams.translated();`
	`119`	`+ //3Zen`
	`120`	`+ Map<String,String> result = new HashMap<String,String>();`
	`121`	`+ result.putAll(calculateEclipseParams());`
	`122`	`+ result.putAll(userParams.translated());`
	`123`	`+ return result; //userParams.translated();`
`120`	`124`	`}`
`121`	`125`
`122`	`126`	`public void setUserConfiguredParams(Map<String, String> userConfiguredParams) {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public Map<String, String> calculateGeneratorRequiredParams() {`
`62`	`62`	`allRequiredParams.putAll(nestedGenerator.calculateRequiredParams());`
`63`	`63`	`}`
`64`	`64`
`65`		`- allRequiredParams.putAll(generator.calculateEclipseParams());`
	`65`	`+ //allRequiredParams.putAll(generator.calculateEclipseParams());`
`66`	`66`
`67`	`67`	`for (String key : paramsConfig.getParams().keySet()) {`
`68`	`68`	`allRequiredParams.remove(key);`