diff options
Diffstat (limited to 'plugins/uml/properties/org.eclipse.papyrus.uml.properties')
3 files changed, 36 insertions, 16 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleGeneralOrdering.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleGeneralOrdering.xwt index 2c29867de9c..daedfcded32 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleGeneralOrdering.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleGeneralOrdering.xwt @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" - xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> @@ -10,6 +11,16 @@ <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:EnumCombo input="{Binding}" + property="UML:NamedElement:visibility"></ppe:EnumCombo> </Composite> -</Composite> + <Composite> + <Composite.layout> + <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> + </Composite.layout> + <ppe:ReferenceDialog input="{Binding}" + property="UML:GeneralOrdering:before"></ppe:ReferenceDialog> + <ppe:ReferenceDialog input="{Binding}" + property="UML:GeneralOrdering:after"></ppe:ReferenceDialog> + </Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleGeneralOrdering.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleGeneralOrdering.xwt index 5e73f3ed24b..9f5f9fb262e 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleGeneralOrdering.xwt +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleGeneralOrdering.xwt @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" - xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"> +<Composite xmlns="http://www.eclipse.org/xwt/presentation" + xmlns:j="clr-namespace:java.lang" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> @@ -9,13 +11,20 @@ <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout> - <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor> - <ppe:StringEditor input="{Binding}" property="UML:NamedElement:label"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="UML:NamedElement:name"></ppe:StringEditor> + <ppe:StringEditor input="{Binding}" + property="UML:NamedElement:label"></ppe:StringEditor> + <ppe:EnumCombo input="{Binding}" + property="UML:NamedElement:visibility"></ppe:EnumCombo> </Composite> <Composite> <Composite.layout> - <ppel:PropertiesLayout></ppel:PropertiesLayout> + <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout> </Composite.layout> - <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo> + <ppe:ReferenceDialog input="{Binding}" + property="UML:GeneralOrdering:before"></ppe:ReferenceDialog> + <ppe:ReferenceDialog input="{Binding}" + property="UML:GeneralOrdering:after"></ppe:ReferenceDialog> </Composite> -</Composite> +</Composite>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java index a44b6db1b5c..1863a29c024 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java @@ -207,7 +207,7 @@ public class UMLModelElement extends EMFModelElement { .map(interaction -> element -> isAncestor(interaction, element)); } - return isValid.map( + return isValid.<UMLContentProvider> map( valid -> new UMLContentProvider(source, feature, null, resourceSet) { @Override public boolean isValidValue(Object element) { @@ -236,7 +236,7 @@ public class UMLModelElement extends EMFModelElement { EReference reference = (EReference) feature; if (reference == UMLPackage.eINSTANCE.getMessage_Argument()) { if (source instanceof Message) { - Set<ParameterDirectionKind> directions = new HashSet<ParameterDirectionKind>(); + Set<ParameterDirectionKind> directions = new HashSet<>(); switch (((Message) source).getMessageSort()) { case REPLY_LITERAL: directions.add(OUT_LITERAL); @@ -279,7 +279,7 @@ public class UMLModelElement extends EMFModelElement { protected List<EClass> getAvailableEClasses() { // according to the UML norm 2.5, section 17.4.3.1 // The signature of a Message refers to either an Operation or a Signal. - final List<EClass> eClasses = new ArrayList<EClass>(); + final List<EClass> eClasses = new ArrayList<>(); eClasses.add(UMLPackage.eINSTANCE.getOperation()); eClasses.add(UMLPackage.eINSTANCE.getSignal()); return eClasses; @@ -325,7 +325,7 @@ public class UMLModelElement extends EMFModelElement { /** * The set of all EStructuralFeature representing subsets of {@link Namespace#getOwnedRules()} */ - public static final Set<EStructuralFeature> ownedRuleSubsets = new HashSet<EStructuralFeature>(); + public static final Set<EStructuralFeature> ownedRuleSubsets = new HashSet<>(); static { // Behavior |