Code Generator for Eclipse Code

--- a/ch.sahits.codegen.java.gui/jet_templates/swtgui.javajet
+++ b/ch.sahits.codegen.java.gui/jet_templates/swtgui.javajet
@@ -1,5 +1,14 @@
 <%@ jet 
-imports="java.util.* ch.sahits.model.* ch.sahits.model.db.* ch.sahits.model.java.* ch.sahits.model.java.db.* ch.sahits.codegen.java.model.util.* ch.sahits.model.gui.* ch.sahits.model.java.gui ch.sahits.codegen.java.gui.util.*" package="PAGAGE_NAME" class="CLASS_NAME" %>
+imports="java.util.* 
+         ch.sahits.model.* 
+         ch.sahits.model.db.* 
+         ch.sahits.model.java.* 
+         ch.sahits.model.java.db.* 
+         ch.sahits.codegen.java.model.util.* 
+         ch.sahits.model.gui.* 
+         ch.sahits.model.java.gui.* 
+         ch.sahits.codegen.java.gui.util.*" 
+ package="PAGAGE_NAME" class="CLASS_NAME" %>
 <% IJavaForm genClass = (IJavaForm) argument; %>
 <%=ConvenientCodegen.toPackageDefinition(genClass.getPackageName()) 
 %><% if (!genClass.superclasses().get(0).equals("") && !ConvenientCodegen.isPrimitiveClass(genClass.superclasses().get(0))){
@@ -48,7 +57,7 @@
 	 private Shell shell = new Shell(display);
 	 <% if (guiHelper.hasHiddenFields()){ 
 	 	List<IFormHidden> l = guiHelper.getHiddenFields();
-	 	for (Iterator<IFormHidden> iterator = form.elements().iterator(); iterator.hasNext();) {
+	 	for (Iterator<IFormHidden> iterator = l.iterator(); iterator.hasNext();) {
 	 		IFormHidden elem = (IFormHidden) iterator.next(); %>
 	 		private <%=elem.getName() %>="<%=elem.getDefaultValue() %>";
 	 		<%
@@ -58,7 +67,7 @@
 	 		IFormElement elem = (IFormElement) iterator.next(); 
 	 		if (elem instanceof IFormFileUpload) {%>
 	 			%>private final <%=guiHelper.getSWTClass(elem) %> <%=guiHelper.toName(elem) %>= new Text(shell,SWT.BORDER | SWT.SINGLE);
-	 			private Button <%=guiHelper.getBrowseButtonName(elem) %>;
+	 			private Button <%=guiHelper.getBrowseButtonName((IFormFileUpload)elem) %>;
 	 		<% } else {
 	 			%>private <%=guiHelper.getSWTClass(elem) %> <%=guiHelper.toName(elem) %>;
 	 		<% } 
@@ -90,7 +99,7 @@
 		layout.numColumns = nColumns;
 		layout.verticalSpacing = 9;
 		// Create the different elements
-		<% for (Iterator<IFormElement> iterator = form.elements().iterator(); iterator.hasNext();) {
+		<% for (Iterator<IFormElement> iterator = genClass.elements().iterator(); iterator.hasNext();) {
 	 		IFormElement elem = (IFormElement) iterator.next(); 
 	 		if (elem instanceof IFormGroup){ 
 	 			IFormGroup group = (IFormGroup)elem;