diff --git a/src/org/atriasoft/exml/builder/CacheIntrospectionModel.java b/src/org/atriasoft/exml/builder/CacheIntrospectionModel.java index 0308ce8..15178fc 100644 --- a/src/org/atriasoft/exml/builder/CacheIntrospectionModel.java +++ b/src/org/atriasoft/exml/builder/CacheIntrospectionModel.java @@ -21,7 +21,7 @@ public class CacheIntrospectionModel { } else if (classType.isEnum()) { out = IntrospectionModelFactory.createModelEnum(key); } else { - out = IntrospectionModelFactory.createModelPlop(key); + out = IntrospectionModelFactory.createModel(key); } this.elements.put(key, out); return out; diff --git a/src/org/atriasoft/exml/builder/IntrospectionModelFactory.java b/src/org/atriasoft/exml/builder/IntrospectionModelFactory.java index dd41917..8ee0f0e 100644 --- a/src/org/atriasoft/exml/builder/IntrospectionModelFactory.java +++ b/src/org/atriasoft/exml/builder/IntrospectionModelFactory.java @@ -6,22 +6,7 @@ import org.atriasoft.exml.exception.ExmlBuilderException; public class IntrospectionModelFactory { private IntrospectionModelFactory() {} - - public static IntrospectionModel createModelsssss(final MapKey modelType) throws ExmlBuilderException { - /* - if (modelType.model() == ModelType.ARRAY) { - return new IntrospectionModelArray(modelType.type()); - } - if (modelType.model() == ModelType.LIST) { - return new IntrospectionModelList(modelType.type()); - } - */ - if (StringSerializer.contains(modelType.type())) { - return new IntrospectionModelBaseType(modelType.type()); - } - return new IntrospectionModelComplex(modelType.type()); - } - + public static IntrospectionModel createModelArray(final String nodeName, final MapKey modelType) throws ExmlBuilderException { return new IntrospectionModelArray(nodeName, modelType.type()); } @@ -33,7 +18,7 @@ public class IntrospectionModelFactory { return new IntrospectionModelComplex(modelType.type()); } - public static IntrospectionModel createModelPlop(final MapKey modelType) throws ExmlBuilderException { + public static IntrospectionModel createModel(final MapKey modelType) throws ExmlBuilderException { if (StringSerializer.contains(modelType.type())) { return new IntrospectionModelBaseType(modelType.type()); } diff --git a/src/org/atriasoft/exml/generator/GeneratorIntrospection.java b/src/org/atriasoft/exml/generator/GeneratorIntrospection.java index d9ec6d7..032ed51 100644 --- a/src/org/atriasoft/exml/generator/GeneratorIntrospection.java +++ b/src/org/atriasoft/exml/generator/GeneratorIntrospection.java @@ -26,7 +26,7 @@ public class GeneratorIntrospection implements Generator { this.rootClassType = classType; MapKey key = new MapKey(model, classType); // TODO pb if it is a List or an Array ... - this.elements.put(key, IntrospectionModelFactory.createModelPlop(key)); + this.elements.put(key, IntrospectionModelFactory.createModel(key)); } IntrospectionModel findOrCreate(final ModelType model, final String name, final Class classType) throws ExmlBuilderException { @@ -40,7 +40,7 @@ public class GeneratorIntrospection implements Generator { } else if (model == ModelType.LIST) { out = IntrospectionModelFactory.createModelList(key.nodeName(), key); } else { - out = IntrospectionModelFactory.createModelPlop(key); + out = IntrospectionModelFactory.createModel(key); } this.elements.put(key, out); return out;