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 3242f1b32ff1e6c9f98fe8bc6ed9b6fc43c62a86 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:58:18 2016 +0200 Review stereotypes display --- .../ui/content/AttributeContentUIHandler.java | 10 ++++ .../ui/content/ClassContentUIHandler.java | 8 +++ .../application/ui/content/ContentUIHandler.java | 63 +++++----------------- .../ui/content/EnumerationContentUIHandler.java | 8 +++ .../ui/content/InterfaceContentUIHandler.java | 9 ++++ .../ui/content/ModelContentUIHandler.java | 8 +++ .../ui/content/OperationContentUIHandler.java | 6 +++ .../ui/content/PackageContentUIHandler.java | 8 +++ 8 files changed, 69 insertions(+), 51 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 27f796a..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 @@ -4,12 +4,16 @@ 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.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. @@ -56,4 +60,10 @@ public class AttributeContentUIHandler extends ContentUIHandler<ObjectModelAttri ui.getAttributeDefaultValue().setText(node.getDefaultValue()); } + + @Override + 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 3c163d3..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 @@ -4,6 +4,8 @@ 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.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; @@ -16,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. @@ -65,6 +68,11 @@ public class ClassContentUIHandler extends ContentUIHandler<ObjectModelClassImpl } + @Override + protected boolean acceptTarget(Set<Class<?>> targets) { + return targets.contains(ObjectModelClassifier.class) || targets.contains(ObjectModelClass.class); + } + protected void registerAction(ClassContentUI ui, JButton editor) { JRootPane rootPane = ui.getRootPane(); 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 50a9a4e..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. @@ -31,35 +32,9 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e ui.setModel(model); -// JPanel stereotypesPanel = ui.getStereotypes(); -// -// Map<String, StereotypeMetadata> stereotyps = (Map) stereotypesPanel.getClientProperty("stereotypes"); -// -// if (stereotyps != null) { -// -// for (String tagValue : stereotyps.keySet()) { -// -// JCheckBox objectById = (JCheckBox) ui.getObjectById("stereotype-" + tagValue); -// if (objectById != null) { -// objectById.setSelected(false); -// } -// -// } -// } -// -// for (String stereotype : stereotypes) { -// -// JCheckBox objectById = (JCheckBox) ui.getObjectById("stereotype-" + stereotype); -// if (objectById != null) { -// objectById.setSelected(true); -// } -// } - JPanel tagValuesPanel = ui.getTagValues(); Map<String, TagValueMetadata> tags = (Map) tagValuesPanel.getClientProperty("tagValues"); -// if (tags != null) { - for (String tagValue : tags.keySet()) { JTextField objectById = (JTextField) ui.getObjectById("tagValue-" + tagValue); @@ -68,23 +43,9 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e } JAXXButtonGroup buttonGroup = (JAXXButtonGroup) ui.getObjectById("tagValue-" + tagValue + "-rb"); if (buttonGroup != null) { - buttonGroup.setSelectedValue(null); + buttonGroup.setSelectedButton(null); } -// JRadioButton buttonTrue = (JRadioButton) ui.getObjectById("tagValue-" + tagValue + "-true"); -// if (buttonTrue != null) { -// buttonTrue.setSelected(false); -// } -// JRadioButton buttonFalse = (JRadioButton) ui.getObjectById("tagValue-" + tagValue + "-false"); -// if (buttonFalse != null) { -// buttonFalse.setSelected(false); -// } -// JRadioButton buttonUndefined = (JRadioButton) ui.getObjectById("tagValue-" + tagValue + "-undefined"); -// if (buttonUndefined != null) { -// buttonUndefined.setSelected(false); -// } - } -// } // first pass for boolean tag values (= stereotype) for (Map.Entry<String, String> entry : tagValues.entrySet()) { @@ -93,26 +54,24 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e if (tagValueMetadata == null || !boolean.class.equals(tagValueMetadata.getType())) { continue; } - + if (!acceptTarget(tagValueMetadata.getTargets())) { + continue; + } JAXXButtonGroup buttonGroup = (JAXXButtonGroup) ui.getObjectById("tagValue-" + tagValueKey + "-rb"); String value = entry.getValue(); - buttonGroup.setSelectedValue(value == null ? "undefined" : value); -// -// JRadioButton buttonTrue = (JRadioButton) ui.getObjectById("tagValue-" + tagValueKey + "-true"); -// buttonTrue.setSelected(false); -// JRadioButton buttonFalse = (JRadioButton) ui.getObjectById("tagValue-" + tagValueKey + "-false"); -// buttonFalse.setSelected(false); -// JRadioButton buttonUndefined = (JRadioButton) ui.getObjectById("tagValue-" + tagValueKey + "-undefined"); -// buttonUndefined.setSelected(false); - + buttonGroup.setSelectedButton(value == null ? "undefined" : value); } + // second pass for other tag values for (Map.Entry<String, String> entry : tagValues.entrySet()) { String tagValueKey = entry.getKey(); TagValueMetadata tagValueMetadata = tags.get(tagValueKey); if (tagValueMetadata == null || boolean.class.equals(tagValueMetadata.getType())) { continue; } + if (!acceptTarget(tagValueMetadata.getTargets())) { + continue; + } JTextField objectById = (JTextField) ui.getObjectById("tagValue-" + tagValueKey); if (objectById != null) { objectById.setText(entry.getValue()); @@ -120,6 +79,8 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e } } + 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 6017d64..a932a67 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,10 +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. @@ -41,4 +44,9 @@ public class EnumerationContentUIHandler extends ContentUIHandler<ObjectModelEnu } + @Override + 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 de2b7aa..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,12 +4,15 @@ 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; 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. @@ -51,4 +54,10 @@ public class InterfaceContentUIHandler extends ContentUIHandler<ObjectModelInter ui.getSuperClassesHeaderType().setSelectedItem(null); } + + @Override + 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 672e0aa..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 @@ -2,8 +2,11 @@ package org.nuiton.eugene.editor.application.ui.content; import org.nuiton.eugene.editor.application.ModelExtensionHelper; 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. * @@ -24,4 +27,9 @@ public class ModelContentUIHandler extends ContentUIHandler<ObjectModelImpl, Mod } + @Override + 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 aa09e4a..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. @@ -67,4 +68,9 @@ public class OperationContentUIHandler extends ContentUIHandler<ObjectModelOpera } + @Override + 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 b865995..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 @@ -2,8 +2,11 @@ package org.nuiton.eugene.editor.application.ui.content; import org.nuiton.eugene.editor.application.ModelExtensionHelper; 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. * @@ -23,4 +26,9 @@ public class PackageContentUIHandler extends ContentUIHandler<ObjectModelPackage } + @Override + 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>.