Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.9 topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.10 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.9 Wed Jun 15 15:14:54 2005 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java Tue Jun 21 17:00:43 2005 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ * - * Mise a jour: $Date: 2005/06/15 15:14:54 $ + * Mise a jour: $Date: 2005/06/21 17:00:43 $ * par : $Author: thimel $ */ @@ -61,7 +61,7 @@ context.class=<%=getProperty("defaultPackage")%>.<%=model.getName()%>Context org.codelutin.topia.persistence.serialization.SerializablePersistenceHelper context.helper.persistence=org.codelutin.topia.persistence.serialization.SerializablePersistenceHelper -#context.helper.persistence.properties.file=<%=model.getName()%>SerializablePersistenceHelper.properties +context.helper.persistence.properties.file=<%=model.getName()%>SerializablePersistenceHelper.properties #context.helper.persistence=org.codelutin.topia.persistence.jdo.JDOPersistenceHelper #context.helper.persistence.properties.file=<%=model.getName()%>JDOPersistenceHelper.properties context.helper.distribution=org.codelutin.topia.distribution.LocalDistributionHelper Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.16 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.17 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.16 Wed Jun 15 15:14:54 2005 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java Tue Jun 21 17:00:43 2005 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.16 $ + * @version $Revision: 1.17 $ * - * Mise a jour: $Date: 2005/06/15 15:14:54 $ + * Mise a jour: $Date: 2005/06/21 17:00:43 $ * par : $Author: thimel $ */ @@ -35,6 +35,7 @@ import java.io.IOException; import java.io.Writer; import java.util.Collections; +import java.util.Enumeration; import java.util.Iterator; import org.codelutin.generator.Generator; @@ -99,7 +100,10 @@ }*/ currentHashCode += Math.abs(attribute.getType().hashCode()); currentHashCode += Math.abs(attribute.getName().hashCode()); - if (attribute.hasAssociationClass() && !Util.isNMultiplicity(attribute)) { + if (Util.isAttributeEntity(attribute)) { +/*{ //On ne génère pas de méthode d'accès, on utilisera le TopiaAssociationManager +}*/ + }/* else*/ if (attribute.hasAssociationClass() && !Util.isNMultiplicity(attribute)) { //On remplace le type de l'élément par la classe d'association. /*{ private <%=attribute.getAssociationClass().getQualifiedName()%> <%=attribute.getName()%> = <%=Util.getInitValue(attribute)%>; @@ -161,7 +165,10 @@ /*{ TopiaAccessController.checkPermission(this, "read"); }*/ } - if (attribute.hasAssociationClass()) { + //if (Util.isAttributeEntity(attribute)) { //TODO Arno !!! +/*{ //return (<%=attribute.getType()%>)TopiaAssociationsManager.getFirstOppositeObjectForPosition(nameFor<%=Util.capitalize(attribute.getName())%>, this, index<%=Util.capitalize(attribute.getName())%>); +}*/ + /*} else*/ if (attribute.hasAssociationClass()) { /*{ return (<%=attribute.getName()%> == null) ? null : <%=attribute.getName()%>.get<%=Util.capitalize(attribute.getName())%>(); }*/ } else { Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java:1.3 topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java:1.4 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java:1.3 Fri Aug 6 17:48:52 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java Tue Jun 21 17:00:43 2005 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * - * Mise a jour: $Date: 2004/08/06 17:48:52 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2005/06/21 17:00:43 $ + * par : $Author: thimel $ */ package org.codelutin.topia.generators; @@ -36,6 +36,7 @@ import org.codelutin.generator.models.object.ObjectModel; import java.io.IOException; import java.io.File; +import java.util.Enumeration; import java.util.logging.Logger; import java.util.logging.Level; @@ -56,7 +57,7 @@ public void generate(ObjectModel model, File destDir) throws IOException { ObjectModelGenerator gen = null; - + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToApplicationContextGenerator"); gen = new ObjectModelToApplicationContextGenerator(this); gen.generate(model, destDir); Index: topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.7 topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.8 --- topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.7 Tue Jun 14 17:03:10 2005 +++ topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java Tue Jun 21 17:00:43 2005 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2005/06/14 17:03:10 $ + * Mise a jour: $Date: 2005/06/21 17:00:43 $ * par : $Author: thimel $ */ @@ -197,6 +197,7 @@ import org.codelutin.topia.TopiaPersistenceService; import org.codelutin.topia.TopiaQuery; import org.codelutin.topia.TopiaArgument; +import org.codelutin.topia.TopiaAssociationsManager; import org.codelutin.topia.security.TopiaAccessController; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.generator.models.object.ObjectModelInterface; Index: topia/src/java/org/codelutin/topia/generators/Util.java diff -u topia/src/java/org/codelutin/topia/generators/Util.java:1.5 topia/src/java/org/codelutin/topia/generators/Util.java:1.6 --- topia/src/java/org/codelutin/topia/generators/Util.java:1.5 Mon Aug 2 17:57:19 2004 +++ topia/src/java/org/codelutin/topia/generators/Util.java Tue Jun 21 17:00:43 2005 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * - * Mise a jour: $Date: 2004/08/02 17:57:19 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2005/06/21 17:00:43 $ + * par : $Author: thimel $ */ package org.codelutin.topia.generators; @@ -74,7 +74,7 @@ public static boolean isEntity(ObjectModelClassifier classifier) { return classifier.hasStereotype("entity"); } - + /** * Returns whether this classifier is a service or not. * @@ -278,6 +278,17 @@ result = attribute.getType(); } return result; + } + + /** + * Return wether the given attribute is an application Entity + * + * @return a boolean indicationg if the given attribute is an Entity + */ + public static boolean isAttributeEntity(ObjectModelAttribute attribute) { + if (!(attribute.getClassifier() instanceof ObjectModelClassifier)) + return false; + return isEntity((ObjectModelClassifier)attribute.getClassifier()); } } // Util