svn commit: r18199 - trunk/src: argouml-app/src/org/argouml/application/helpers argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2010-03-29 14:57:36-0700
New Revision: 18199
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementTemplateParameterListModel.java
Modified:
trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoaderWrapper.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Log:
Create New button for TemplateParameter and for Parameter in Reception
Modified: trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoaderWrapper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoaderWrapper.java?view=diff&pathrev=18199&r1=18198&r2=18199
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoaderWrapper.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoaderWrapper.java 2010-03-29 14:57:36-0700
@@ -412,7 +412,7 @@
images.put("button.new-message", "Message");
images.put("button.new-argument", "Argument");
images.put("button.new-property", "Property");
- images.put("button.new-template-parameter", "TemplateParameter");
+ images.put("button.new-templateparameter", "TemplateParameter");
}
static {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&pathrev=18199&r1=18198&r2=18199
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2010-03-29 14:57:36-0700
@@ -340,17 +340,20 @@
validContainmentMap.put(ModelElement.class,
new Class<?>[] {
+ TemplateParameter.class
});
// specifies valid elements for a Model to contain
validContainmentMap.put(org.omg.uml.modelmanagement.Model.class,
new Class<?>[] {
+ TemplateParameter.class,
ComponentInstance.class, NodeInstance.class
});
// specifies valid elements for a Package to contain
validContainmentMap.put(UmlPackage.class,
new Class<?>[] {
+ TemplateParameter.class,
UmlPackage.class, Actor.class,
UseCase.class, UmlClass.class,
Interface.class, Component.class,
@@ -362,6 +365,7 @@
// specifies valid elements for a class to contain
validContainmentMap.put(UmlClass.class,
new Class<?>[] {
+ TemplateParameter.class,
Attribute.class, Operation.class,
UmlClass.class, Reception.class
});
@@ -375,18 +379,21 @@
// specifies valid elements for an Interface to contain
validContainmentMap.put(Interface.class,
new Class<?>[] {
+ TemplateParameter.class,
Operation.class, Reception.class
});
// specifies valid elements for a Signal to contain
validContainmentMap.put(Signal.class,
new Class<?>[] {
+ TemplateParameter.class,
Operation.class, Attribute.class
});
// specifies valid elements for an Actor to contain
validContainmentMap.put(Actor.class,
new Class<?>[] {
+ TemplateParameter.class,
Operation.class,
Reception.class
});
@@ -394,6 +401,7 @@
// specifies valid elements for a Use Case to contain
validContainmentMap.put(UseCase.class,
new Class<?>[] {
+ TemplateParameter.class,
ExtensionPoint.class, Attribute.class,
Operation.class, Reception.class
});
@@ -401,12 +409,14 @@
// specifies valid elements for a Use Case to contain
validContainmentMap.put(Extend.class,
new Class<?>[] {
+ TemplateParameter.class,
ExtensionPoint.class
});
// specifies valid elements for a Component to contain
validContainmentMap.put(Component.class,
new Class<?>[] {
+ TemplateParameter.class,
Reception.class,
Operation.class
});
@@ -414,6 +424,7 @@
// specifies valid elements for a Node to contain
validContainmentMap.put(Node.class,
new Class<?>[] {
+ TemplateParameter.class,
Operation.class,
Reception.class
});
@@ -421,12 +432,14 @@
// specifies valid elements for a Enumeration to contain
validContainmentMap.put(Enumeration.class,
new Class<?>[] {
+ TemplateParameter.class,
EnumerationLiteral.class, Operation.class
});
// specifies valid elements for a DataType to contain
validContainmentMap.put(DataType.class,
new Class<?>[] {
+ TemplateParameter.class,
Operation.class,
Reception.class
});
@@ -434,6 +447,7 @@
// specifies valid elements for a Operation to contain
validContainmentMap.put(Operation.class,
new Class<?>[] {
+ TemplateParameter.class,
Parameter.class,
Signal.class,
Method.class
@@ -442,71 +456,89 @@
// specifies valid elements for an Event to contain
validContainmentMap.put(Event.class,
new Class<?>[] {
+ TemplateParameter.class,
Parameter.class
});
// specifies valid elements for an ObjectFlowState to contain
validContainmentMap.put(ObjectFlowState.class,
new Class<?>[] {
+ TemplateParameter.class,
Parameter.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(AssociationRole.class,
new Class<?>[] {
+ TemplateParameter.class,
Message.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(CallAction.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(UninterpretedAction.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(ReturnAction.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(DestroyAction.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(SendAction.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(TerminateAction.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(ActionSequence.class,
new Class<?>[] {
+ TemplateParameter.class,
Argument.class
});
// specifies valid elements for an AssociationRole to contain
validContainmentMap.put(Transition.class,
new Class<?>[] {
+ TemplateParameter.class,
Guard.class,
CallAction.class, ReturnAction.class,
CreateAction.class, DestroyAction.class, SendAction.class, TerminateAction.class, UninterpretedAction.class, ActionSequence.class,
CallEvent.class, ChangeEvent.class, SignalEvent.class, TimeEvent.class
});
+
+ // specifies valid elements for an AssociationRole to contain
+ validContainmentMap.put(Reception.class,
+ new Class<?>[] {
+ Parameter.class,
+ TemplateParameter.class
+ });
}
public Object buildConnection(Object elementType, Object fromElement,
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml?view=diff&pathrev=18199&r1=18198&r2=18199
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml 2010-03-29 14:57:36-0700
@@ -61,7 +61,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -92,7 +92,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -123,7 +123,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -155,7 +155,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -197,7 +197,7 @@
<checkbox name="isAbstract" type="Boolean" />
<checkbox name="isActive" type="Boolean" label="checkbox.active-uc" />
</checkgroup>
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="clientDependency" type="Dependency" label="label.client-dependencies" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
@@ -291,7 +291,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -321,7 +321,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -397,7 +397,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<separator/>
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -446,7 +446,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -476,7 +476,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -581,7 +581,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -707,7 +707,7 @@
<list name="referenceTag" type="ModelElement" />
<list name="templateArgument" type="ModelElement" />
<list name="raisedSignal" type="BehavioralFeature" label="label.raisedsignals" />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="elementImport" type="ModelElement" label="label.element-import" />
<attribute name="ownerScope" type="ScopeKind" />
<attribute name="owner" type="Classifier" />
@@ -914,7 +914,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1104,7 +1104,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1148,7 +1148,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1238,7 +1238,7 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<attribute name="supplierDependency" type="ModelElement" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1334,7 +1334,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1369,7 +1369,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1416,7 +1416,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1464,7 +1464,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1554,7 +1554,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1710,7 +1710,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1817,7 +1817,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1858,7 +1858,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2015,7 +2015,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2048,7 +2048,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="clientDependency" type="Dependency" label="label.client-dependencies" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
@@ -2083,7 +2083,7 @@
<list name="targetFlow" type="Flow" label="label.target-flows" />
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<attribute name="supplierDependency" type="ModelElement" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2191,7 +2191,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2357,7 +2357,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2494,7 +2494,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2663,7 +2663,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2694,7 +2694,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2725,7 +2725,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -3317,7 +3317,7 @@
<list name="targetFlow" type="Flow" label="label.target-flows" />
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
<list name="elementResidence" type="ModelElement" />
@@ -3353,7 +3353,7 @@
</checkgroup>
<list name="specification" type="Classifier" />
<list name="qualifier" type="Attribute" label="label.qualifiers" />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
<list name="elementResidence" type="ModelElement" />
@@ -3465,7 +3465,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -3496,7 +3496,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -3595,7 +3595,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -3768,7 +3768,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -3886,7 +3886,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.omg.uml.foundation.core.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml?view=diff&pathrev=18199&r1=18198&r2=18199
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml 2010-03-29 14:57:36-0700
@@ -155,7 +155,7 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -197,7 +197,7 @@
<checkbox name="isAbstract" type="Boolean" />
<checkbox name="isActive" type="Boolean" label="checkbox.active-uc" />
</checkgroup>
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="clientDependency" type="Dependency" label="label.client-dependencies" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
@@ -254,7 +254,7 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
<attribute name="elementResidence" type="ModelElement" />
@@ -290,7 +290,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -320,7 +319,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -396,7 +394,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator/>
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -446,7 +444,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -476,7 +473,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -507,13 +503,13 @@
<separator />
<list name="associationRole" type="Association" label="label.association-roles" />
<list name="link" type="Association" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<debug />
<attribute name="clientDependency" type="Dependency" />
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -535,6 +531,7 @@
<combo name="type" type="Classifier" />
<combo name="multiplicity" type="Multiplicity" />
<singlerow name="owner" type="Classifier" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<optionbox name="visibility" type="VisibilityKind" />
<checkgroup name="modifiers">
@@ -548,7 +545,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -581,7 +577,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -606,6 +601,7 @@
<text name="name" type="Name" />
<singlerow name="owner" type="Classifier" />
<list name="parameter" type="org.eclipse.uml2.uml.Parameter" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<optionbox name="visibility" type="VisibilityKind" />
<checkgroup name="modifiers">
@@ -627,7 +623,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -723,6 +718,7 @@
<checkbox name="isAbstract" type="Boolean" />
<checkbox name="isActive" type="Boolean" label="checkbox.active-uc" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="clientDependency" type="Dependency" label="label.client-dependencies" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
@@ -779,7 +775,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -811,7 +806,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
<attribute name="elementResidence" type="ModelElement" />
@@ -900,6 +894,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -913,7 +908,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
<attribute name="elementResidence" type="ModelElement" />
@@ -949,6 +943,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -964,7 +959,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -1147,6 +1141,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="clientDependency" type="Dependency" label="label.client-dependencies" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
@@ -1221,6 +1216,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -1233,7 +1229,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -1373,8 +1368,8 @@
<list name="targetFlow" type="Flow" label="label.target-flows" />
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -1965,7 +1960,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2332,6 +2326,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<list name="clientDependency" type="Dependency" label="label.client-dependencies" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<separator />
@@ -2349,7 +2344,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
<attribute name="elementResidence" type="ModelElement" />
@@ -2383,6 +2377,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -2396,7 +2391,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -2562,6 +2556,7 @@
<combo name="namespace" type="Namespace" />
<combo name="context" type="ModelElement" />
<list name="top" type="State" label="label.top-state" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="transitions" type="Transition" />
<list name="submachineState" type="SubmachineState" />
@@ -2575,7 +2570,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -2602,7 +2596,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2633,7 +2626,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2664,7 +2656,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
@@ -2709,7 +2700,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -3157,6 +3147,7 @@
<combo name="namespace" type="Namespace" />
<combo name="representedClassifier" type="Classifier" />
<combo name="representedOperation" type="Operation" />
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<singlerow name="interaction" type="Interaction" />
<list name="constrainingElement" type="ModelElement" />
@@ -3175,7 +3166,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -3291,7 +3281,6 @@
</checkgroup>
<list name="specification" type="Classifier" />
<list name="qualifier" type="Attribute" label="label.qualifiers" />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
<list name="elementResidence" type="ModelElement" />
@@ -3341,7 +3330,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -3375,7 +3363,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -3749,6 +3736,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -3760,7 +3748,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
<attribute name="elementResidence" type="ModelElement" />
@@ -3783,6 +3770,7 @@
<checkbox name="isLeaf" type="Boolean" />
<checkbox name="isAbstract" type="Boolean" />
</checkgroup>
+ <list name="templateParameter" type="org.eclipse.uml2.uml.TemplateParameter" label="label.template-parameters" />
<separator />
<list name="generalization" type="Generalization" />
<list name="specialization" type="GeneralizableElement" />
@@ -3794,7 +3782,6 @@
<attribute name="targetFlow" type="Flow" />
<attribute name="sourceFlow" type="Flow" />
<attribute name="comment" type="Comment" />
- <attribute name="templateParameter" type="TemplateParameter" />
<attribute name="supplierDependency" type="ModelElement" />
<attribute name="presentation" type="ModelElement" />
<attribute name="defaultedParameter" type="ModelElement" />
@@ -3824,7 +3811,6 @@
<list name="sourceFlow" type="Flow" label="label.source-flows" />
<list name="comment" type="Comment" />
<separator />
- <list name="templateParameter" type="TemplateParameter" label="label.template-parameters" />
<list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
<list name="presentation" type="ModelElement" />
<list name="defaultedParameter" type="ModelElement" />
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java?view=diff&pathrev=18199&r1=18198&r2=18199
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java 2010-03-29 14:57:36-0700
@@ -84,6 +84,7 @@
addGetterSetter("effect", new EffectGetterSetter());
addGetterSetter("trigger", new TriggerGetterSetter());
addGetterSetter("elementImport", new ElementImportGetterSetter());
+ addGetterSetter("templateParameter", new TemplateParameterGetterSetter());
// UML2 only
addGetterSetter("ownedOperation", new FeatureGetterSetter());
@@ -1029,6 +1030,30 @@
}
}
+ private class TemplateParameterGetterSetter extends ListGetterSetter {
+
+ public Collection getOptions(Object modelElement, String type) {
+ return Model.getFacade().getTemplateParameters(modelElement);
+ }
+
+ public Object get(Object modelElement, String type) {
+ // not needed
+ return null;
+ }
+
+ public void set(Object element, Object x) {
+ // not needed
+ }
+
+ public boolean isValidElement(Object element, String type) {
+ return getOptions(element, type).contains(element);
+ }
+
+ public Object getMetaType() {
+ return Model.getMetaTypes().getTemplateParameter();
+ }
+ }
+
private class ElementImportGetterSetter extends ListGetterSetter implements Addable, Removeable {
public Collection getOptions(Object modelElement, String type) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java?view=diff&pathrev=18199&r1=18198&r2=18199
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java 2010-03-29 14:57:36-0700
@@ -170,8 +170,6 @@
model = new UMLStateMachineTransitionListModel(modelElement);
} else if ("typedValue".equals(propName)) {
model = new UMLTagDefinitionTypedValuesListModel(modelElement);
- } else if ("templateParameter".equals(propName)) {
- model = new UMLModelElementTemplateParameterListModel(modelElement);
}
if (model == null) {
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementTemplateParameterListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementTemplateParameterListModel.java?view=markup&pathrev=18198
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2466861
To unsubscribe from this discussion, e-mail: [[email protected]].