branch feature/editor updated (ec10156 -> 2d79ad2)
This is an automated email from the git hooks/post-receive script. New change to branch feature/editor in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git from ec10156 Review stereotypes display new 2d79ad2 Review stereotypes display The 1 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 2d79ad25cb2381ae6eb1aeb7350a7370467083c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:58:18 2016 +0200 Review stereotypes display Summary of changes: .../editor/application/ui/content/AttributeContentUIHandler.java | 8 ++++++-- .../editor/application/ui/content/ClassContentUIHandler.java | 6 ++++-- .../eugene/editor/application/ui/content/ContentUIHandler.java | 7 ++++--- .../application/ui/content/EnumerationContentUIHandler.java | 7 ++++--- .../editor/application/ui/content/InterfaceContentUIHandler.java | 7 +++++-- .../editor/application/ui/content/ModelContentUIHandler.java | 7 +++++-- .../editor/application/ui/content/OperationContentUIHandler.java | 5 +++-- .../editor/application/ui/content/PackageContentUIHandler.java | 7 +++++-- 8 files changed, 36 insertions(+), 18 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 feature/editor in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 2d79ad25cb2381ae6eb1aeb7350a7370467083c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:58:18 2016 +0200 Review stereotypes display --- .../editor/application/ui/content/AttributeContentUIHandler.java | 8 ++++++-- .../editor/application/ui/content/ClassContentUIHandler.java | 6 ++++-- .../eugene/editor/application/ui/content/ContentUIHandler.java | 7 ++++--- .../application/ui/content/EnumerationContentUIHandler.java | 7 ++++--- .../editor/application/ui/content/InterfaceContentUIHandler.java | 7 +++++-- .../editor/application/ui/content/ModelContentUIHandler.java | 7 +++++-- .../editor/application/ui/content/OperationContentUIHandler.java | 5 +++-- .../editor/application/ui/content/PackageContentUIHandler.java | 7 +++++-- 8 files changed, 36 insertions(+), 18 deletions(-) diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUIHandler.java index af53023..621dd24 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUIHandler.java @@ -5,12 +5,15 @@ import org.nuiton.eugene.editor.application.ModelExtensionHelper; import org.nuiton.eugene.editor.application.ModelHelper; import org.nuiton.eugene.editor.application.ui.tree.node.AttributeNode; import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Set; /** * Created on 16/09/16. @@ -59,7 +62,8 @@ public class AttributeContentUIHandler extends ContentUIHandler<ObjectModelAttri } @Override - protected Class<?> getTarget() { - return ObjectModelAttribute.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelAttribute.class); } + } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUIHandler.java index 3bf789b..ddc95ff 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUIHandler.java @@ -5,6 +5,7 @@ import org.nuiton.eugene.editor.application.ModelExtensionHelper; import org.nuiton.eugene.editor.application.ModelHelper; import org.nuiton.eugene.editor.application.ui.tree.node.ClassNode; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import javax.swing.Action; @@ -17,6 +18,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.Set; /** * Created on 16/09/16. @@ -67,8 +69,8 @@ public class ClassContentUIHandler extends ContentUIHandler<ObjectModelClassImpl } @Override - protected Class<?> getTarget() { - return ObjectModelClass.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelClassifier.class) || targets.contains(ObjectModelClass.class); } protected void registerAction(ClassContentUI ui, JButton editor) { diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUIHandler.java index 1f6ceb3..69d95be 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUIHandler.java @@ -17,6 +17,7 @@ import java.awt.GridLayout; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Set; /** * Created on 16/09/16. @@ -53,7 +54,7 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e if (tagValueMetadata == null || !boolean.class.equals(tagValueMetadata.getType())) { continue; } - if (!tagValueMetadata.getTargets().contains(getTarget())) { + if (!acceptTarget(tagValueMetadata.getTargets())) { continue; } JAXXButtonGroup buttonGroup = (JAXXButtonGroup) ui.getObjectById("tagValue-" + tagValueKey + "-rb"); @@ -68,7 +69,7 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e if (tagValueMetadata == null || boolean.class.equals(tagValueMetadata.getType())) { continue; } - if (!tagValueMetadata.getTargets().contains(getTarget())) { + if (!acceptTarget(tagValueMetadata.getTargets())) { continue; } JTextField objectById = (JTextField) ui.getObjectById("tagValue-" + tagValueKey); @@ -78,7 +79,7 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e } } - protected abstract Class<?> getTarget(); + protected abstract boolean acceptTarget(Set<Class<?>> targets); protected void close() { diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUIHandler.java index 59f471c..2bcfd68 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUIHandler.java @@ -2,11 +2,13 @@ package org.nuiton.eugene.editor.application.ui.content; import org.nuiton.eugene.editor.application.ModelExtensionHelper; import org.nuiton.eugene.editor.application.ui.tree.node.EnumerationNode; +import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; import javax.swing.DefaultListModel; import javax.swing.ListSelectionModel; +import java.util.Set; /** * Created on 16/09/16. @@ -43,8 +45,7 @@ public class EnumerationContentUIHandler extends ContentUIHandler<ObjectModelEnu } @Override - protected Class<?> getTarget() { - return ObjectModelEnumeration.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelClassifier.class) || targets.contains(ObjectModelEnumeration.class); } - } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUIHandler.java index 771df54..f1952ef 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUIHandler.java @@ -4,6 +4,7 @@ import jaxx.runtime.SwingUtil; import org.nuiton.eugene.editor.application.ModelExtensionHelper; import org.nuiton.eugene.editor.application.ModelHelper; import org.nuiton.eugene.editor.application.ui.tree.node.InterfaceNode; +import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.xml.ObjectModelInterfaceImpl; @@ -11,6 +12,7 @@ import javax.swing.ListSelectionModel; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; /** * Created on 16/09/16. @@ -54,7 +56,8 @@ public class InterfaceContentUIHandler extends ContentUIHandler<ObjectModelInter } @Override - protected Class<?> getTarget() { - return ObjectModelInterface.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelClassifier.class) || targets.contains(ObjectModelInterface.class); } + } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUIHandler.java index bef4b56..c7c8db5 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUIHandler.java @@ -5,6 +5,8 @@ import org.nuiton.eugene.editor.application.ui.tree.node.ModelNode; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; +import java.util.Set; + /** * Created on 16/09/16. * @@ -26,7 +28,8 @@ public class ModelContentUIHandler extends ContentUIHandler<ObjectModelImpl, Mod } @Override - protected Class<?> getTarget() { - return ObjectModel.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModel.class); } + } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUIHandler.java index 6d02717..ddb9d25 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUIHandler.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Set; /** * Created on 16/09/16. @@ -68,8 +69,8 @@ public class OperationContentUIHandler extends ContentUIHandler<ObjectModelOpera } @Override - protected Class<?> getTarget() { - return ObjectModelOperation.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelOperation.class); } } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUIHandler.java b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUIHandler.java index d4a62cf..d39ea59 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUIHandler.java +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUIHandler.java @@ -5,6 +5,8 @@ import org.nuiton.eugene.editor.application.ui.tree.node.PackageNode; import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.object.xml.ObjectModelPackageImpl; +import java.util.Set; + /** * Created on 16/09/16. * @@ -25,7 +27,8 @@ public class PackageContentUIHandler extends ContentUIHandler<ObjectModelPackage } @Override - protected Class<?> getTarget() { - return ObjectModelPackage.class; + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelPackage.class); } + } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm