Author: agiraudet Date: 2013-06-10 00:07:36 +0200 (Mon, 10 Jun 2013) New Revision: 1269 Url: http://nuiton.org/projects/eugene/repository/revisions/1269 Log: correction d'un probl?\195?\168me de parsage et d'import des participants des classes d'association Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/Parser.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-07 15:58:50 UTC (rev 1268) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/Parser.java 2013-06-09 22:07:36 UTC (rev 1269) @@ -430,8 +430,57 @@ log("name="+classPARSE.get(0)); } + //participant if(value instanceof Map) { + if(((Map) value).containsKey(PARTICIPANT)) + { + if(((Map) value).get(PARTICIPANT) instanceof Map) + { + for(Object entry : ((Map) ((Map) value).get(PARTICIPANT)).entrySet()) + { + if(entry instanceof Map.Entry) + { + //name attribute "value": + + List<String> participantPARSE = YamlUtil.charParse(String.valueOf(((Map.Entry) entry).getKey()),' '); + YamlObject participantYAMLO = new YamlObject(); + if(participantPARSE.contains("\""+YamlUtil.extract('"',String.valueOf(((Map.Entry) entry).getKey()))+"\"")) + { + String label = YamlUtil.extract('"',String.valueOf(((Map.Entry) entry).getKey())); + + participantYAMLO.addStringToMap(LABEL,label); + + participantPARSE.remove("\""+YamlUtil.extract('"',String.valueOf(((Map.Entry) entry).getKey()))+"\""); + } + + if(participantPARSE.size() > 0)//ajout type + { + participantYAMLO.addStringToMap(NAME,participantPARSE.get(0)); + } + if(participantPARSE.size() > 1)//ajout name + { + participantYAMLO.addStringToMap(ATTRIBUTE,participantPARSE.get(1)); + } + associationClassYAMLO.addYamlObjectToMap(PARTICIPANT,participantYAMLO); + + /*YamlObject participantYAMLO = new YamlObject(); + participantYAMLO.addStringToMap(NAME, String.valueOf(((Map.Entry) entry).getKey())); + if(((Map.Entry) entry).getValue() != null) + { + participantYAMLO.addStringToMap(ATTRIBUTE,String.valueOf(((Map.Entry) entry).getValue())); + } + associationClassYAMLO.addYamlObjectToMap(PARTICIPANT,participantYAMLO);*/ + } + } + } + ((Map) value).remove(PARTICIPANT); + } + } + //participant + + if(value instanceof Map) + { for(Object entry : ((Map) value).entrySet()) { if(entry instanceof Map.Entry) @@ -482,51 +531,6 @@ /* FACTORISER LE CODE ! */ - if(value instanceof Map) - { - if(((Map) value).containsKey(PARTICIPANT)) - { - if(((Map) value).get(PARTICIPANT) instanceof Map) - { - for(Object entry : ((Map) ((Map) value).get(PARTICIPANT)).entrySet()) - { - if(entry instanceof Map.Entry) - { - //name attribute "value": - - List<String> participantPARSE = YamlUtil.charParse(String.valueOf(((Map.Entry) entry).getKey()),' '); - YamlObject participantYAMLO = new YamlObject(); - if(participantPARSE.contains("\""+YamlUtil.extract('"',String.valueOf(((Map.Entry) entry).getKey()))+"\"")) - { - String label = YamlUtil.extract('"',String.valueOf(((Map.Entry) entry).getKey())); - - participantYAMLO.addStringToMap(LABEL,label); - - participantPARSE.remove("\""+YamlUtil.extract('"',String.valueOf(((Map.Entry) entry).getKey()))+"\""); - } - - if(participantPARSE.size() > 0)//ajout type - { - participantYAMLO.addStringToMap(NAME,participantPARSE.get(0)); - } - if(participantPARSE.size() > 1)//ajout name - { - participantYAMLO.addStringToMap(ATTRIBUTE,participantPARSE.get(1)); - } - associationClassYAMLO.addYamlObjectToMap(PARTICIPANT,participantYAMLO); - - /*YamlObject participantYAMLO = new YamlObject(); - participantYAMLO.addStringToMap(NAME, String.valueOf(((Map.Entry) entry).getKey())); - if(((Map.Entry) entry).getValue() != null) - { - participantYAMLO.addStringToMap(ATTRIBUTE,String.valueOf(((Map.Entry) entry).getValue())); - } - associationClassYAMLO.addYamlObjectToMap(PARTICIPANT,participantYAMLO);*/ - } - } - } - } - } } public void parseEnumeration(String key, Object value, YamlObject enumerationYAMLO) @@ -1161,7 +1165,8 @@ if(labelisable.containsKeyMapStringListString(NAME)) { log("5"); - reverseAttribute.addStringToMap(ASSOCIATION_CLASS_NAME,labelisable.getFirstMapStringListString(NAME)); + //tester package + reverseAttribute.addStringToMap(ASSOCIATION_CLASS_NAME,modelYAMLO.getFirstMapStringListString(PACKAGE)+"."+labelisable.getFirstMapStringListString(NAME)); } } }