This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit fcc6f961c6c2cc856441d5503000ca1d2a07e908 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 10:57:44 2016 +0200 Use LoadModelExtension for legacy model extension files (Fixes #4015) --- .../object/reader/AbstractObjectModelReader.java | 32 +++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java index f6fcfa7..53b122b 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java @@ -37,6 +37,7 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelPackage; +import org.nuiton.eugene.models.object.reader.extension.LoadModelExtension; import org.nuiton.eugene.models.object.xml.ObjectModelAssociationClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; @@ -124,6 +125,8 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> ObjectModel model = new ObjectModelImpl(); + LoadModelExtension<ObjectModel> loadModelExtension = new LoadModelExtension<>(isVerbose(), strictLoading, model); + for (File file : files) { readFileToModel(file, model); @@ -137,15 +140,18 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> File propFile = new File(dir, name + ".properties"); if (!propFile.exists()) { if (isVerbose()) { - log.info("Pas de fichier de propriete " + propFile - + " associé au model"); + log.info("Pas de fichier de propriete " + propFile + " associé au model"); } } else { if (isVerbose()) { - log.info("Lecture du fichier de propriete " + propFile - + " associé au model"); + log.info("Lecture du fichier de propriete " + propFile + " associé au model"); + } + try { + loadModelExtension.load(propFile); + } catch (InvalidTagValueSyntaxException | InvalidStereotypeSyntaxException e) { + // FIXME + throw new IllegalStateException(e); } - loadModelProperties(propFile, model); } } @@ -168,6 +174,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> * @param name attribute name to find * @return the attribute found or null */ + @Deprecated protected ObjectModelAttribute getAttribute(ObjectModelClass clazz, String name) { ObjectModelAttribute result = clazz.getAttribute(name); @@ -191,6 +198,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return result; } + @Deprecated public Properties loadModelProperties(File propFile, ObjectModel model) throws IOException { @@ -445,6 +453,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> } } + @Deprecated protected boolean loadModelTagValue(ObjectModel model, String key, String value) throws InvalidModelPropertiesException { Matcher matcher; @@ -524,6 +533,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return true; } + @Deprecated protected boolean loadPackageTagValue(ObjectModel model, String key, String value) throws InvalidModelPropertiesException { Matcher matcher; @@ -600,6 +610,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return true; } + @Deprecated protected boolean loadTagValue(ObjectModel model, String key, String value) { Matcher matcher; try { @@ -720,6 +731,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return true; } + @Deprecated protected boolean loadModelStereotype(ObjectModel model, String stereotype) throws InvalidModelPropertiesException { @@ -778,6 +790,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return true; } + @Deprecated protected boolean loadStereotype(ObjectModel model, String key, String fqn, @@ -864,6 +877,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return true; } + @Deprecated protected boolean loadPackageStereotype(ObjectModel model, String key, String fqn, @@ -937,8 +951,8 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return true; } + @Deprecated protected Class<?> getTargetType(String target) { - Class<?> result = null; if (ATTRIBUTE.equals(target)) { return ObjectModelAttribute.class; } @@ -952,9 +966,10 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return ObjectModelPackage.class; } - return result; + return null; } + @Deprecated protected ObjectModelClassifier getClassifier(ObjectModel model, String type, String key, String fqn) { ObjectModelClassifier omc = model.getClassifier(fqn); if (omc == null) { @@ -979,6 +994,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return omc; } + @Deprecated protected List<ObjectModelElement> getObjectElements(ObjectModelClassifier omc, String type, String key, String fqn, String target, String targetName) { List<ObjectModelElement> elems = new ArrayList<>(); if (CLASS.equals(target)) { @@ -1016,10 +1032,12 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return elems; } + @Deprecated protected boolean isTagValue(String key) { return key.contains(TAGVALUE) || key.contains(TAG_VALUE); } + @Deprecated protected boolean isStereotype(String key) { return key.contains(STEREOTYPE); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.