Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.4 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.5
--- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.4	Sat Feb  5 10:47:09 2005
+++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java	Wed Apr 27 14:39:50 2005
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *
- * Mise a jour: $Date: 2005/02/05 10:47:09 $
- * par : $Author: pineau $
+ * Mise a jour: $Date: 2005/04/27 14:39:50 $
+ * par : $Author: thimel $
  */
 
 package org.codelutin.topia.generators;
@@ -58,7 +58,7 @@
     }
 
     public boolean accept(ObjectModelClassifier clazz){
-        return true;
+        return Util.isEntity(clazz);
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -74,7 +74,11 @@
 public interface <%=clazz.getName()%> extends TopiaEntity}*/
         for (Iterator i = clazz.getInterfaces().iterator(); i.hasNext();) {
             ObjectModelInterface interfacezz = (ObjectModelInterface) i.next();
-/*{, <%=interfacezz.getName()%> }*/
+/*{, }*/            
+            if (!Util.isEntity(interfacezz)) {
+/*{<%=interfacezz.getPackageName() + "."%>}*/
+            }
+/*{<%=interfacezz.getName()%> }*/
         }
         if(clazz instanceof ObjectModelClass){
             for (Iterator i=((ObjectModelClass)clazz).getSuperclasses().iterator(); i.hasNext();) {

Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java:1.3
--- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java:1.2	Fri Aug  6 17:48:52 2004
+++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java	Wed Apr 27 14:39:50 2005
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
- * Mise a jour: $Date: 2004/08/06 17:48:52 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2005/04/27 14:39:50 $
+ * par : $Author: thimel $
  */
 
 package org.codelutin.topia.generators;
@@ -75,7 +75,9 @@
 public interface <%=clazz.getName() + "Operation"%> extends TopiaEntityOperation}*/
         for (Iterator i = clazz.getInterfaces().iterator(); i.hasNext();) {
             ObjectModelInterface interfacezz = (ObjectModelInterface) i.next();
+            if (Util.isEntity(interfacezz)) {
 /*{, <%=interfacezz.getName()%>Operation }*/
+            }
         }
         if(clazz instanceof ObjectModelClass){
             for (Iterator i=((ObjectModelClass)clazz).getSuperclasses().iterator(); i.hasNext();) {
@@ -94,7 +96,7 @@
 /*{
     /**
     <%=operation.getDocumentation()%>
-     *)
+    *)
     <%=operation.getVisibility()%> <%=operation.getReturnType()%> <%=operation.getName()%> (<%=operation.getDeclaringElement().getName()%> _self_<%=(args.equals("")?"":", ")%><%=args%>) throws TopiaException}*/
     }
 

Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java:1.5 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java:1.6
--- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java:1.5	Sat Feb  5 10:47:09 2005
+++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java	Wed Apr 27 14:39:50 2005
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *
- * Mise a jour: $Date: 2005/02/05 10:47:09 $
- * par : $Author: pineau $
+ * Mise a jour: $Date: 2005/04/27 14:39:50 $
+ * par : $Author: thimel $
  */
 
 package org.codelutin.topia.generators;
@@ -75,12 +75,14 @@
 public interface <%=clazz.getName()%>PersistenceService extends TopiaPersistenceService}*/
         for (Iterator i = clazz.getInterfaces().iterator(); i.hasNext();) {
             ObjectModelInterface interfacezz = (ObjectModelInterface) i.next();
+            if (Util.isEntity(interfacezz)) {
 /*{, <%=interfacezz.getName()%>PersistenceService }*/
+            }
         }
         if(clazz instanceof ObjectModelClass){
             for (Iterator i=((ObjectModelClass)clazz).getSuperclasses().iterator(); i.hasNext();) {
                 ObjectModelClass superclass = (ObjectModelClass) i.next();
-                /*{, <%=superclass.getName()%>PersistenceService}*/
+/*{, <%=superclass.getName()%>PersistenceService}*/
             }
         }
     }