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 ec101563100fe386f9b2e18949809d9852461d24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 15:24:59 2016 +0200 Review stereotypes display --- eugene-editor-maven-plugin/pom.xml | 6 + .../application/ui/content/AttributeContentUI.jaxx | 7 +- .../ui/content/AttributeContentUIHandler.java | 6 + .../application/ui/content/ClassContentUI.jaxx | 7 +- .../ui/content/ClassContentUIHandler.java | 6 + .../editor/application/ui/content/ContentUI.jcss | 8 +- .../application/ui/content/ContentUIHandler.java | 62 +- .../ui/content/EnumerationContentUI.jaxx | 7 +- .../ui/content/EnumerationContentUIHandler.java | 6 + .../application/ui/content/InterfaceContentUI.jaxx | 7 +- .../ui/content/InterfaceContentUIHandler.java | 6 + .../application/ui/content/ModelContentUI.jaxx | 7 +- .../ui/content/ModelContentUIHandler.java | 5 + .../application/ui/content/OperationContentUI.jaxx | 6 +- .../ui/content/OperationContentUIHandler.java | 5 + .../application/ui/content/PackageContentUI.jaxx | 7 +- .../ui/content/PackageContentUIHandler.java | 5 + pom.xml.orig | 700 +++++++++++++++++++++ 18 files changed, 797 insertions(+), 66 deletions(-) diff --git a/eugene-editor-maven-plugin/pom.xml b/eugene-editor-maven-plugin/pom.xml index fa392d1..1126fb0 100644 --- a/eugene-editor-maven-plugin/pom.xml +++ b/eugene-editor-maven-plugin/pom.xml @@ -502,6 +502,12 @@ <version>3.2-SNAPSHOT</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>3.0.1</version> + <scope>compile</scope> + </dependency> </dependencies> </plugin> </plugins> diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUI.jaxx index ca9353c..b84fbbc 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/AttributeContentUI.jaxx @@ -82,7 +82,7 @@ public void close() { handler.close(); } </row> </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -91,6 +91,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> @@ -99,7 +103,6 @@ public void close() { handler.close(); } </cell> </row> </Table> - </org.jdesktop.swingx.JXTaskPane> </org.jdesktop.swingx.JXTaskPaneContainer> 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..af53023 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,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.AttributeNode; +import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import java.util.ArrayList; @@ -56,4 +57,9 @@ public class AttributeContentUIHandler extends ContentUIHandler<ObjectModelAttri ui.getAttributeDefaultValue().setText(node.getDefaultValue()); } + + @Override + protected Class<?> getTarget() { + return ObjectModelAttribute.class; + } } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUI.jaxx index 688992c..b92bf2f 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ClassContentUI.jaxx @@ -61,7 +61,7 @@ public void close() { handler.close(); } </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -70,6 +70,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> @@ -78,7 +82,6 @@ public void close() { handler.close(); } </cell> </row> </Table> - </org.jdesktop.swingx.JXTaskPane> </org.jdesktop.swingx.JXTaskPaneContainer> 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..3bf789b 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,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.ClassNode; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import javax.swing.Action; @@ -65,6 +66,11 @@ public class ClassContentUIHandler extends ContentUIHandler<ObjectModelClassImpl } + @Override + protected Class<?> getTarget() { + return 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/ContentUI.jcss b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUI.jcss index 8387121..603943e 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUI.jcss +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ContentUI.jcss @@ -10,8 +10,12 @@ title:"eugene.editor.general"; } -#stereotypesAndTagValuesPane { - title:"eugene.editor.stereotypesAndTagValues"; +#stereotypesPane { + title:"eugene.editor.stereotypes"; +} + +#tagValuesPane { + title:"eugene.editor.tagValues"; } #stereotypes { border: {new javax.swing.border.TitledBorder(t("eugene.editor.stereotypes"))}; 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..1f6ceb3 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 @@ -31,35 +31,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 +42,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 +53,24 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e if (tagValueMetadata == null || !boolean.class.equals(tagValueMetadata.getType())) { continue; } - + if (!tagValueMetadata.getTargets().contains(getTarget())) { + 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 (!tagValueMetadata.getTargets().contains(getTarget())) { + continue; + } JTextField objectById = (JTextField) ui.getObjectById("tagValue-" + tagValueKey); if (objectById != null) { objectById.setText(entry.getValue()); @@ -120,6 +78,8 @@ public abstract class ContentUIHandler<X extends WithTagValuesOrStereotypes, M e } } + protected abstract Class<?> getTarget(); + protected void close() { } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUI.jaxx index 3e8f19e..9bdfd56 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/EnumerationContentUI.jaxx @@ -48,7 +48,7 @@ public void close() { handler.close(); } </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -57,6 +57,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> @@ -65,7 +69,6 @@ public void close() { handler.close(); } </cell> </row> </Table> - </org.jdesktop.swingx.JXTaskPane> </org.jdesktop.swingx.JXTaskPaneContainer> 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..59f471c 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,6 +2,7 @@ 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.ObjectModelEnumeration; import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; import javax.swing.DefaultListModel; @@ -41,4 +42,9 @@ public class EnumerationContentUIHandler extends ContentUIHandler<ObjectModelEnu } + @Override + protected Class<?> getTarget() { + return ObjectModelEnumeration.class; + } + } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUI.jaxx index f72ea9f..7b88b6b 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/InterfaceContentUI.jaxx @@ -52,7 +52,7 @@ public void close() { handler.close(); } </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -61,6 +61,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> @@ -69,7 +73,6 @@ public void close() { handler.close(); } </cell> </row> </Table> - </org.jdesktop.swingx.JXTaskPane> </org.jdesktop.swingx.JXTaskPaneContainer> 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..771df54 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.ObjectModelInterface; import org.nuiton.eugene.models.object.xml.ObjectModelInterfaceImpl; import javax.swing.ListSelectionModel; @@ -51,4 +52,9 @@ public class InterfaceContentUIHandler extends ContentUIHandler<ObjectModelInter ui.getSuperClassesHeaderType().setSelectedItem(null); } + + @Override + protected Class<?> getTarget() { + return ObjectModelInterface.class; + } } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUI.jaxx index f6c1994..882cf0a 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/ModelContentUI.jaxx @@ -37,7 +37,7 @@ public void close() { handler.close(); } </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -46,6 +46,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> @@ -54,7 +58,6 @@ public void close() { handler.close(); } </cell> </row> </Table> - </org.jdesktop.swingx.JXTaskPane> </org.jdesktop.swingx.JXTaskPaneContainer> 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..bef4b56 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,6 +2,7 @@ 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; /** @@ -24,4 +25,8 @@ public class ModelContentUIHandler extends ContentUIHandler<ObjectModelImpl, Mod } + @Override + protected Class<?> getTarget() { + return ObjectModel.class; + } } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUI.jaxx index 1a4c87c..c355bc7 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/OperationContentUI.jaxx @@ -58,7 +58,7 @@ public void close() { handler.close(); } </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -67,6 +67,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> 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..6d02717 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 @@ -67,4 +67,9 @@ public class OperationContentUIHandler extends ContentUIHandler<ObjectModelOpera } + @Override + protected Class<?> getTarget() { + return ObjectModelOperation.class; + } + } diff --git a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUI.jaxx b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUI.jaxx index 751491b..47109f8 100644 --- a/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUI.jaxx +++ b/eugene-editor-maven-plugin/src/main/java/org/nuiton/eugene/editor/application/ui/content/PackageContentUI.jaxx @@ -34,7 +34,7 @@ public void close() { handler.close(); } </Table> </org.jdesktop.swingx.JXTaskPane> - <org.jdesktop.swingx.JXTaskPane id="stereotypesAndTagValuesPane"> + <org.jdesktop.swingx.JXTaskPane id="stereotypesPane"> <Table fill="both"> <row> <cell weightx="1"> @@ -43,6 +43,10 @@ public void close() { handler.close(); } </JPanel> </cell> </row> + </Table> + </org.jdesktop.swingx.JXTaskPane> + <org.jdesktop.swingx.JXTaskPane id="tagValuesPane"> + <Table fill="both"> <row> <cell weightx="1"> <JPanel id="tagValues"> @@ -51,7 +55,6 @@ public void close() { handler.close(); } </cell> </row> </Table> - </org.jdesktop.swingx.JXTaskPane> </org.jdesktop.swingx.JXTaskPaneContainer> 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..d4a62cf 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,6 +2,7 @@ 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; /** @@ -23,4 +24,8 @@ public class PackageContentUIHandler extends ContentUIHandler<ObjectModelPackage } + @Override + protected Class<?> getTarget() { + return ObjectModelPackage.class; + } } diff --git a/pom.xml.orig b/pom.xml.orig new file mode 100644 index 0000000..3ba4d10 --- /dev/null +++ b/pom.xml.orig @@ -0,0 +1,700 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + EUGene + + $HeadURL$ + %% + Copyright (C) 2004 - 2016 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>nuitonpom</artifactId> + <version>10.3</version> + </parent> + + <artifactId>eugene</artifactId> + <version>3.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>EUGene</name> + <description>Efficient Universal Generator</description> + <url>http://eugene.nuiton.org</url> + <inceptionYear>2004</inceptionYear> + + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Arnaud Thimel</name> + <id>athimel</id> + <email>thimel@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Julien Ruchaud</name> + <id>jruchaud</id> + <email>ruchaud@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + </developers> + <contributors> + <contributor> + <name>Stéphane Chorlet</name> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </contributor> + <contributor> + <name>Florian Desbois</name> + <roles> + <role>developer</role> + </roles> + </contributor> + </contributors> + + <modules> + <module>eugene</module> + <module>eugene-java-templates</module> + <module>eugene-plantuml-templates</module> + <module>eugene-yaml-templates</module> + <module>eugene-maven-plugin</module> + <module>eugene-editor-maven-plugin</module> + </modules> + + <scm> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/eugene.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/eugene.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/eugene</url> + </scm> + + <properties> + + <!-- redmine project Id --> + <projectId>eugene</projectId> + <ciViewId>Eugene</ciViewId> + + <processorPluginVersion>1.3</processorPluginVersion> + <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> + <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <nuitonConfigVersion>3.0</nuitonConfigVersion> + <plantumlVersion>8047</plantumlVersion> + <snakeyamlVersion>1.17</snakeyamlVersion> + <antlr4Version>4.5</antlr4Version> + + <!--Multilanguage maven-site --> + <locales>en,fr</locales> + <siteSourcesType>rst</siteSourcesType> + + <plexusPluginVersion>1.3.8</plexusPluginVersion> + <doxiaVersion>1.6</doxiaVersion> + <mavenVersion>3.3.9</mavenVersion> + <jaxxVersion>2.33</jaxxVersion> + <i18nVersion>3.6.2</i18nVersion> + <swingXVersion>1.6.5-1</swingXVersion> + + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + + <!-- I18n configuration --> + <i18n.failsIfAnyKeyMissingValue>true</i18n.failsIfAnyKeyMissingValue> + <i18n.checkBundle>true</i18n.checkBundle> + <i18n.showEmpty>true</i18n.showEmpty> + + </properties> + + <dependencyManagement> + <dependencies> + + <!-- Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>2.1</version> + </dependency> + + <!-- Guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>19.0</version> + </dependency> + + <!-- Nuiton --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> +<<<<<<< 07ddf2c8844c98c5830d48bc8ff5d0c5b051ee97 +======= + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonConfigVersion}</version> + </dependency> + + <dependency> +>>>>>>> use nuiton-config 3.0 + last stable of jaxx + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-digester3</artifactId> + <version>3.2</version> + <scope>compile</scope> + </dependency> + + <!-- JAXP parser impl for digester --> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.11.0</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.1.0.8</version> + </dependency> + + <!-- dom4j dep --> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.4</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>maven-plugins</groupId> + <artifactId>maven-cobertura-plugin</artifactId> + </exclusion> + <exclusion> + <groupId>maven-plugins</groupId> + <artifactId>maven-findbugs-plugin</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- Meta model uml d'eclipse --> + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> + <version>2.1.0-v200706251652</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.uml2</groupId> + <artifactId>uml</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin-api</artifactId> + <version>${helperPluginVersion}</version> + <exclusions> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + </exclusions> + </dependency> + + <!-- see http://stackoverflow.com/a/32918434/2038100 --> + <dependency> + <groupId>com.tunnelvisionlabs</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr4Version}</version> + </dependency> + <dependency> + <groupId>com.tunnelvisionlabs</groupId> + <artifactId>antlr4-annotations</artifactId> + <version>${antlr4Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${mavenVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + <version>1.0-beta-10</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>${doxiaVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.24</version> + </dependency> + + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>${snakeyamlVersion}</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.plantuml</groupId> + <artifactId>plantuml</artifactId> + <version>${plantumlVersion}</version> + </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <!-- Do not use version 2.0.0 nor 2.0.2, they miss ElementTraversal class needed by eugene:help --> + <version>1.4.01</version> + <scope>runtime</scope> + </dependency> + + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-select</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-about</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-swing</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + <version>${swingXVersion}</version> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-painters</artifactId> + <version>${swingXVersion}</version> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + <version>${swingXVersion}</version> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + <version>${swingXVersion}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>processor-maven-plugin</artifactId> + <version>${processorPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <extraExtensions> + <objectmodel>xml</objectmodel> + <xsd>xml</xsd> + </extraExtensions> + </configuration> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <version>${i18nVersion}</version> + </plugin> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-maven-plugin</artifactId> + <version>${nuitonConfigVersion}</version> + </plugin> + + </plugins> + </pluginManagement> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0</version> + </extension> + + </extensions> + </build> + + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin><!-- copy object model xsd to site --> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + + <execution> + <id>xsd-to-site</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> + <fileset dir="${basedir}/eugene/src/main/resources/xsd"> + <include name="**/*.xsd"/> + </fileset> + </copy> + <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> + <fileset dir="${basedir}/eugene/src/main/resources/dtd"> + <include name="**/*.dtd"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>generate-changelog</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <properties> + + <redmine.xmlPath>${project.build.directory}/changes/changes.xml</redmine.xmlPath> + </properties> + <build> + <defaultGoal>process-classes</defaultGoal> + <plugins> + + <!-- Generate changelog.txt and attach it to project --> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-changes</id> + <goals> + <goal>generate-changes</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <generateOnce>true</generateOnce> + <actionMapping>fix:1, add:2, update:4</actionMapping> + </configuration> + </execution> + <execution> + <id>generate-changelog</id> + <inherited>false</inherited> + <goals> + <goal>generate-changelog</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <attach>true</attach> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> +</project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.