diff options
| author | ytanguy | 2011-01-13 17:20:03 +0000 |
|---|---|---|
| committer | ytanguy | 2011-01-13 17:20:03 +0000 |
| commit | acb062e868f7b570f833383da2c6fd4a1e1f6889 (patch) | |
| tree | a93cf8e573dffa215ecf81438cccf3fc560fc3f0 | |
| parent | c5b6c0c8f2ec910e65b3a1e3d7b6e77f2186f47a (diff) | |
| download | org.eclipse.papyrus-acb062e868f7b570f833383da2c6fd4a1e1f6889.tar.gz org.eclipse.papyrus-acb062e868f7b570f833383da2c6fd4a1e1f6889.tar.xz org.eclipse.papyrus-acb062e868f7b570f833383da2c6fd4a1e1f6889.zip | |
NEW - bug 334292: [Composite Structure Diagram] Property should be created Composite by default
https://bugs.eclipse.org/bugs/show_bug.cgi?id=334292
4 files changed, 11 insertions, 0 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java index 90739caba21..c4120e0c8e4 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.papyrus.diagram.composite.providers.ElementInitializers;
+import org.eclipse.uml2.uml.AggregationKind;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.StructuredClassifier;
import org.eclipse.uml2.uml.UMLFactory;
@@ -66,6 +67,7 @@ public class PropertyPartCreateCommand extends org.eclipse.papyrus.diagram.compo StructuredClassifier owner = (StructuredClassifier)((Property)getElementToEdit()).getType();
owner.getOwnedAttributes().add(newElement);
+ newElement.setAggregation(AggregationKind.COMPOSITE_LITERAL);
ElementInitializers.getInstance().init_Property_3070(newElement);
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java index 25ac6d1ed9c..8b17c15d853 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/custom-src/org/eclipse/papyrus/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java @@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
import org.eclipse.papyrus.diagram.composite.providers.ElementInitializers;
+import org.eclipse.uml2.uml.AggregationKind;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.StructuredClassifier;
import org.eclipse.uml2.uml.Type;
@@ -71,6 +72,7 @@ public class PropertyPartFromTypeCreateCommand extends EditElementCommand { StructuredClassifier owner = (StructuredClassifier)getElementToEdit();
owner.getOwnedAttributes().add(newElement);
newElement.setType(type);
+ newElement.setAggregation(AggregationKind.COMPOSITE_LITERAL);
ElementInitializers.getInstance().init_Property_3070(newElement);
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen index 4fdda0e9ed9..a510e795817 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen +++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen @@ -371,6 +371,12 @@ <feature
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="/0/@expressionProviders/@providers.1/@expressions.0">
+ <feature
+ href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
<labels
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/ElementInitializers.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/ElementInitializers.java index cababafb60b..4854b10a54b 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/ElementInitializers.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/providers/ElementInitializers.java @@ -793,6 +793,7 @@ public class ElementInitializers { try {
Object value_0 = name_Property_3070(instance);
instance.setName((String)value_0);
+ instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);
} catch (RuntimeException e) {
UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
}
|