Index: lutingenerator/src/java/org/codelutin/generator/Util.java diff -u lutingenerator/src/java/org/codelutin/generator/Util.java:1.20 lutingenerator/src/java/org/codelutin/generator/Util.java:1.21 --- lutingenerator/src/java/org/codelutin/generator/Util.java:1.20 Fri Nov 18 16:59:28 2005 +++ lutingenerator/src/java/org/codelutin/generator/Util.java Sat Nov 26 08:48:29 2005 @@ -17,8 +17,8 @@ *@author Benjamin Poussin * * Copyright Code Lutin - *@version $Revision: 1.20 $ Mise a jour: $Date: 2005/11/18 16:59:28 $ par : - * $Author: pineau $ + *@version $Revision: 1.21 $ Mise a jour: $Date: 2005/11/26 08:48:29 $ par : + * $Author: thimel $ */ package org.codelutin.generator; @@ -106,24 +106,13 @@ String result; if (attribute instanceof ObjectModelAttribute && isNMultiplicity((ObjectModelAttribute)attribute)) { - result = "java.util.List"; + result = "java.util.Collection"; } else { result = attribute.getType(); } return result; } -// public static String getAttributeType(ObjectModelParameter attribute) { -// String result; -// if (attribute instanceof ObjectModelAttribute -// && isNMultiplicity((ObjectModelAttribute)attribute)){ -// result = "java.util.Collection"; -// }else{ -// result = attribute.getType(); -// } -// return result; -// } - /** * Indicates if the specified attribute has a primitive type (byte, boolean, ...) * @return true if the atribute has a primitive type @@ -137,18 +126,6 @@ "float".equals(type) || "double".equals(type) || "char".equals(type) || "boolean".equals(type)); } - -// /** -// * return an init value for the specified attribute -// * @return a String with the corresponding attribute init value -// */ -// public static String getInitValue(ObjectModelAttribute attribute) { -// if (isNMultiplicity(attribute)) -// return "new org.codelutin.util.BoundedList(" + -// attribute.getMinMultiplicity() + ", " + -// attribute.getMaxMultiplicity() + ")"; -// return getInitValue(attribute.getType()); -// } /** * return an init value for the specified attribute