[Eugene-commits] r1270 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml

10 Jun 2013

Author: agiraudet
Date: 2013-06-10 16:09:12 +0200 (Mon, 10 Jun 2013)
New Revision: 1270

Url: http://nuiton.org/projects/eugene/repository/revisions/1270

Log:
corrections de quelques bogues : syntaxe yaml user friendly fonctionnelle

Modified:
   trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/Parser.java
   trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/TestLoadObjectModel.java

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/Parser.java
===================================================================

--- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/Parser.java	2013-06-09 22:07:36 UTC (rev 1269)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/Parser.java	2013-06-10 14:09:12 UTC (rev 1270)
@@ -592,11 +592,6 @@
             attributeYAMLO.addStringToMap(FINAL,String.valueOf(true));
             attributePARSE.remove(attributePARSE.indexOf(FINAL));
         }
-        if(attributePARSE.contains(ORDERED))
-        {
-            attributeYAMLO.addStringToMap(ORDERED,String.valueOf(true));
-            attributePARSE.remove(attributePARSE.indexOf(ORDERED));
-        }
         if(attributePARSE.contains(UNIQUE))
         {
             attributeYAMLO.addStringToMap(UNIQUE,String.valueOf(true));
@@ -1121,10 +1116,19 @@
                                             {
                                                 reverseAttribute.addStringToMap(REVERSE_ATTRIBUTE_NAME,attribute.getFirstMapStringListString(NAME));
                                             }
+                                            //test
                                             if(attribute.containsKeyMapStringListString(ORDERING))
                                             {
-                                                reverseAttribute.addStringToMap(ORDERING,attribute.getFirstMapStringListString(ORDERING));
+                                                if(attribute.getFirstMapStringListString(ORDERING).equals(ORDERED))
+                                                {
+                                                    reverseAttribute.addStringToMap(ORDERING,UNORDERED);
+                                                }
+                                                else if(attribute.getFirstMapStringListString(ORDERING).equals(UNORDERED))
+                                                {
+                                                    reverseAttribute.addStringToMap(ORDERING,ORDERED);
+                                                }
                                             }
+                                            //test
                                             reverseObject.addYamlObjectToMap(ATTRIBUTE,reverseAttribute);
 
                                             attribute.addStringToMap(NAVIGABLE,String.valueOf(true));

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/TestLoadObjectModel.java
===================================================================
--- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/TestLoadObjectModel.java	2013-06-09 22:07:36 UTC (rev 1269)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/TestLoadObjectModel.java	2013-06-10 14:09:12 UTC (rev 1270)
@@ -519,7 +519,9 @@
         String reverseMaxMultiplicityYAMLO = attributeYAMLO.getFirstMapStringListString(REVERSE_MAX_MULTIPLICITY);
         if(reverseMaxMultiplicityYAMLO == null)
         {
-            ;//valeur par defaut
+            //test
+            attributeOM.setReverseMaxMultiplicity(1);//valeur par defaut
+            //test
         }
         else
         {

    

[Eugene-commits] r1270 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml

agiraudet＠users.nuiton.org