Index: topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityPersistenceServiceInterfaceGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityPersistenceServiceInterfaceGenerator.java:1.7 topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityPersistenceServiceInterfaceGenerator.java:1.8
--- topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityPersistenceServiceInterfaceGenerator.java:1.7	Tue Jun 22 19:01:06 2004
+++ topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityPersistenceServiceInterfaceGenerator.java	Wed Jun 30 13:40:36 2004
@@ -15,10 +15,7 @@
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelInterface;
-
-// Needed imports for processed file
 import org.codelutin.topia.generators.Util;
-import org.codelutin.topia.generators.DefaultObjectModelToJavaGenerator;
 
 /**
  * @author cedric
@@ -29,6 +26,11 @@
 public class ObjectModelToEntityPersistenceServiceInterfaceGenerator
     extends ObjectModelGenerator {
 
+	static {
+		// Force import in auto import tools as they are used by processed version of this file
+		Util util;
+	}
+	
     public String getFilenameForClass(ObjectModelClass clazz) {
         return (Util.getParentPackageName(clazz.getPackageName())+".services.").replace('.', File.separatorChar)+clazz.getName()+ "PersistenceService.java";
     }

Index: topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java:1.22 topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java:1.23
--- topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java:1.22	Tue Jun 22 19:01:06 2004
+++ topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java	Wed Jun 30 13:40:36 2004
@@ -11,15 +11,13 @@
 import java.io.Writer;
 import java.util.Iterator;
 
-import org.codelutin.generator.ObjectModelGenerator;
-import org.codelutin.topia.generators.Util;
-import org.codelutin.topia.generators.DefaultObjectModelToJavaGenerator;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelClassifier;
 import org.codelutin.generator.models.object.ObjectModelInterface;
 import org.codelutin.generator.models.object.ObjectModelOperation;
-import org.codelutin.generator.models.object.ObjectModelParameter;
+import org.codelutin.topia.generators.DefaultObjectModelToJavaGenerator;
+import org.codelutin.topia.generators.Util;
 
 public class ObjectModelToEntityTOClassGenerator
     extends DefaultObjectModelToJavaGenerator {

Index: topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityInterfaceGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityInterfaceGenerator.java:1.16 topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityInterfaceGenerator.java:1.17
--- topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityInterfaceGenerator.java:1.16	Tue Jun 22 19:01:06 2004
+++ topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityInterfaceGenerator.java	Wed Jun 30 13:40:36 2004
@@ -10,17 +10,20 @@
 import java.io.Writer;
 import java.util.Iterator;
 
-import org.codelutin.generator.ObjectModelGenerator;
-import org.codelutin.topia.generators.Util;
-import org.codelutin.topia.generators.DefaultObjectModelToJavaGenerator;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelInterface;
 import org.codelutin.generator.models.object.ObjectModelOperation;
-import org.codelutin.generator.models.object.ObjectModelParameter;
+import org.codelutin.topia.generators.DefaultObjectModelToJavaGenerator;
+import org.codelutin.topia.generators.Util;
 
 public class ObjectModelToEntityInterfaceGenerator
     extends DefaultObjectModelToJavaGenerator {
+
+	static {
+		// Force import in auto import tools as they are used by processed version of this file
+		Util util;
+	}
 
     public void generateClassDeclaration(Writer output, ObjectModelClass clazz)
         throws IOException {