branch develop updated (ff98713 -> 7e6ea92)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See http://git.nuiton.org/eugene.git from ff98713 Be able to use complex tag value Merge branch 'feature/3762' into develop new 6448629 add a FIXME to spot the issue (refs #3764) new 0cfd6fb Can use now tagvalue or tagValue on a model scope key (See #3764) new 7e6ea92 Validation fail if "tagValue" is used (Closes #3764) Merge branch 'feature/3764' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7e6ea923e2a36ab0cfc727cfecaad164cca344eb Merge: ff98713 0cfd6fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 19:47:59 2015 +0200 Validation fail if "tagValue" is used (Closes #3764) Merge branch 'feature/3764' into develop commit 0cfd6fbd27967ac4b32ef0f2ee137e7c8fb8af78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 19:47:25 2015 +0200 Can use now tagvalue or tagValue on a model scope key (See #3764) commit 6448629eb58449be0fbce73c95c62222c25cfbeb Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Aug 21 16:23:30 2015 +0200 add a FIXME to spot the issue (refs #3764) Summary of changes: .../object/reader/AbstractObjectModelReader.java | 34 +++++++++++++++------- 1 file changed, 23 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 6448629eb58449be0fbce73c95c62222c25cfbeb Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Aug 21 16:23:30 2015 +0200 add a FIXME to spot the issue (refs #3764) --- .../nuiton/eugene/models/object/reader/AbstractObjectModelReader.java | 1 + 1 file changed, 1 insertion(+) 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 3f6eea5..41e895c 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 @@ -236,6 +236,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> } // model tag value + // FIXME brendan 21/08/15 doesn't works if 'tagValue' is used instead of 'tagvalue' if (key.contains(TAGVALUE)) { boolean loaded = loadModelTagValue(model, key, value); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 0cfd6fbd27967ac4b32ef0f2ee137e7c8fb8af78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 19:47:25 2015 +0200 Can use now tagvalue or tagValue on a model scope key (See #3764) --- .../object/reader/AbstractObjectModelReader.java | 35 ++++++++++++++-------- 1 file changed, 23 insertions(+), 12 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 41e895c..f6fcfa7 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 @@ -79,6 +79,8 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> public static final String TAGVALUE = "tagvalue"; + public static final String TAG_VALUE = "tagValue"; + public static final String STEREOTYPE = "stereotype"; public static final String OPERATION = "operation"; @@ -214,6 +216,9 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> for (String key : keys) { String value = prop.getProperty(key); + boolean stereoTypeKey = isStereotype(key); + boolean tagValueTypeKey = isTagValue(key); + if (log.isDebugEnabled()) { log.debug("Property: '" + key + "' = " + value); } @@ -221,7 +226,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> if (key.startsWith(MODEL)) { // model stereotype - if (key.contains(STEREOTYPE)) { + if (stereoTypeKey) { Set<String> stereotypes = Stereotypes.getStereotypes(value); for (String stereotype : stereotypes) { @@ -236,8 +241,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> } // model tag value - // FIXME brendan 21/08/15 doesn't works if 'tagValue' is used instead of 'tagvalue' - if (key.contains(TAGVALUE)) { + if (tagValueTypeKey) { boolean loaded = loadModelTagValue(model, key, value); if (loaded) { @@ -256,7 +260,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> // package stereotype or tag value - if (key.contains(STEREOTYPE)) { + if (stereoTypeKey) { // package stereotype Matcher matcher; @@ -294,22 +298,20 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> } continue; - } else { + } - // package tag value - boolean loaded = loadPackageTagValue(model, key, value); - if (loaded) { - numberImportedTagValues++; - } - safe &= loaded; + boolean loaded = loadPackageTagValue(model, key, value); + if (loaded) { + numberImportedTagValues++; } + safe &= loaded; continue; } // element tag value or stereotype - if (key.contains(STEREOTYPE)) { + if (stereoTypeKey) { // stereotype property @@ -1013,4 +1015,13 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> return elems; } + + protected boolean isTagValue(String key) { + return key.contains(TAGVALUE) || key.contains(TAG_VALUE); + } + + 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 7e6ea923e2a36ab0cfc727cfecaad164cca344eb Merge: ff98713 0cfd6fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 19:47:59 2015 +0200 Validation fail if "tagValue" is used (Closes #3764) Merge branch 'feature/3764' into develop .../object/reader/AbstractObjectModelReader.java | 34 +++++++++++++++------- 1 file changed, 23 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm