March 2012 - Eugene-commits - mailman.cloud.codelutin.com

r1141 - trunk
by tchemit＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: tchemit Date: 2012-03-29 11:46:06 +0200 (Thu, 29 Mar 2012) New Revision: 1141 Url: http://nuiton.org/repositories/revision/eugene/1141 Log: updates to mavenpom 3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-03 11:20:07 UTC (rev 1140) +++ trunk/pom.xml 2012-03-29 09:46:06 UTC (rev 1141) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <artifactId>eugene</artifactId>

1 0

r1140 - in trunk/eugene/src: main/java/org/nuiton/eugene/models/object/xml test/java/org/nuiton/eugene/models/object
by bpoussin＠users.nuiton.org 03 Mar '12

03 Mar '12

Author: bpoussin Date: 2012-03-03 12:20:07 +0100 (Sat, 03 Mar 2012) New Revision: 1140 Url: http://nuiton.org/repositories/revision/eugene/1140 Log: On revient en arriere en fait unique peut tres bien etre toujours true, il faut juste faire attention que cela n'impacte que les collections Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-03-03 10:45:35 UTC (rev 1139) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-03-03 11:20:07 UTC (rev 1140) @@ -46,9 +46,12 @@ // protected String ordering = "unspecified"; /** - * default value is false since version 2.4.3 + * Unique n'est utile que pour les collections pour indiquer que la + * collection ne peut prendre qu'une valeur identique (Set) si unique + * est false la collection peut prendre plusieurs fois la meme valeur + * (List) */ - protected boolean unique = false; + protected boolean unique = true; protected boolean ordered; protected String defaultValue; Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 10:45:35 UTC (rev 1139) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 11:20:07 UTC (rev 1140) @@ -342,7 +342,7 @@ assertEquals("String", strings.getType()); assertEquals(1, strings.getMinMultiplicity()); assertEquals(-1, strings.getMaxMultiplicity()); - assertFalse(strings.isUnique()); + assertTrue(strings.isUnique()); assertFalse(strings.isOrdered()); // doubles @@ -351,7 +351,7 @@ assertEquals("org.nuiton.eugene.test21.double", doubles.getType()); assertEquals(1, doubles.getMinMultiplicity()); assertEquals(5, doubles.getMaxMultiplicity()); - assertFalse(doubles.isUnique()); + assertTrue(doubles.isUnique()); assertTrue(doubles.isOrdered()); // dataTypes @@ -371,7 +371,7 @@ assertEquals("String", op.getReturnParameter().getType()); assertEquals(1, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertFalse(op.getReturnParameter().isUnique()); + assertTrue(op.getReturnParameter().isUnique()); assertTrue(op.getReturnParameter().isOrdered()); @@ -394,7 +394,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(0, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertFalse(op.getReturnParameter().isUnique()); + assertTrue(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // addAndGetAll @@ -405,7 +405,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(3, op.getReturnParameter().getMinMultiplicity()); assertEquals(19, op.getReturnParameter().getMaxMultiplicity()); - assertFalse(op.getReturnParameter().isUnique()); + assertTrue(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // param strings @@ -414,7 +414,7 @@ assertEquals("String", param.getType()); assertEquals(1, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertFalse(param.isUnique()); + assertTrue(param.isUnique()); assertFalse(param.isOrdered()); // param doubles @@ -423,7 +423,7 @@ assertEquals("org.nuiton.eugene.test21.double", param.getType()); assertEquals(5, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertFalse(param.isUnique()); + assertTrue(param.isUnique()); assertTrue(param.isOrdered()); // param dataTypes

1 0

r1139 - trunk/eugene/src/test/java/org/nuiton/eugene/models/object
by bpoussin＠users.nuiton.org 03 Mar '12

03 Mar '12

Author: bpoussin Date: 2012-03-03 11:45:35 +0100 (Sat, 03 Mar 2012) New Revision: 1139 Url: http://nuiton.org/repositories/revision/eugene/1139 Log: Change test after change default value of unique Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 10:37:30 UTC (rev 1138) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 10:45:35 UTC (rev 1139) @@ -342,7 +342,7 @@ assertEquals("String", strings.getType()); assertEquals(1, strings.getMinMultiplicity()); assertEquals(-1, strings.getMaxMultiplicity()); - assertTrue(strings.isUnique()); + assertFalse(strings.isUnique()); assertFalse(strings.isOrdered()); // doubles @@ -351,7 +351,7 @@ assertEquals("org.nuiton.eugene.test21.double", doubles.getType()); assertEquals(1, doubles.getMinMultiplicity()); assertEquals(5, doubles.getMaxMultiplicity()); - assertTrue(doubles.isUnique()); + assertFalse(doubles.isUnique()); assertTrue(doubles.isOrdered()); // dataTypes @@ -371,7 +371,7 @@ assertEquals("String", op.getReturnParameter().getType()); assertEquals(1, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertTrue(op.getReturnParameter().isUnique()); + assertFalse(op.getReturnParameter().isUnique()); assertTrue(op.getReturnParameter().isOrdered()); @@ -394,7 +394,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(0, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertTrue(op.getReturnParameter().isUnique()); + assertFalse(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // addAndGetAll @@ -405,7 +405,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(3, op.getReturnParameter().getMinMultiplicity()); assertEquals(19, op.getReturnParameter().getMaxMultiplicity()); - assertTrue(op.getReturnParameter().isUnique()); + assertFalse(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // param strings @@ -414,7 +414,7 @@ assertEquals("String", param.getType()); assertEquals(1, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertTrue(param.isUnique()); + assertFalse(param.isUnique()); assertFalse(param.isOrdered()); // param doubles @@ -423,7 +423,7 @@ assertEquals("org.nuiton.eugene.test21.double", param.getType()); assertEquals(5, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertTrue(param.isUnique()); + assertFalse(param.isUnique()); assertTrue(param.isOrdered()); // param dataTypes

1 0

r1138 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml
by bpoussin＠users.nuiton.org 03 Mar '12

03 Mar '12

Author: bpoussin Date: 2012-03-03 11:37:30 +0100 (Sat, 03 Mar 2012) New Revision: 1138 Url: http://nuiton.org/repositories/revision/eugene/1138 Log: change unique default value to false ATTENTION check that modification don't change anything in your project generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-02-29 13:01:57 UTC (rev 1137) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-03-03 10:37:30 UTC (rev 1138) @@ -46,9 +46,9 @@ // protected String ordering = "unspecified"; /** - * FIXME tchemit 2010-11-28 Why the default value is true ? + * default value is false since version 2.4.3 */ - protected boolean unique = true; + protected boolean unique = false; protected boolean ordered; protected String defaultValue;

1 0