svn commit: r18653 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel2.xml

Author: bobtarling
Date: 2010-08-17 05:46:18-0700
New Revision: 18653

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel2.xml

Log:
Correct XML so that association controls hold Association model element types

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel2.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel2.xml?view=diff&pathrev=18653&r1=18652&r2=18653
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel2.xml	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel2.xml	2010-08-17 05:46:18-0700
@@ -238,7 +238,7 @@
     <list name="powertypeRange" type="Generalization" />
     <list name="typedFeature" type="Classifier" />
     <list name="typedParameter" type="Classifier" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="specifiedEnd" type="Classifier" />
     <list name="instance" type="Classifier" />
     <list name="createAction" type="Classifier" />
@@ -266,7 +266,7 @@
     <separator />
     <list name="feature" type="Property" new="true" label="label.attributes" />
     <list name="ownedOperation" type="Operation,Reception" new="true" label="label.operations" />
-    <list name="association" type="Property" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="ownedElement" type="Class" new="true" label="label.owned-elements"/>
 	<debug />
     <attribute name="targetFlow" type="Flow" />
@@ -459,7 +459,7 @@
 	<list name="generalization" type="Generalization" />    
     <list name="specialization" type="GeneralizableElement" />
 	<separator />
-	<list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="feature" type="Property" new="true" label="label.attributes" />
     <list name="ownedOperation" type="Operation,Reception" new="true" label="label.operations" />
 	
@@ -797,7 +797,7 @@
     <separator />
     <list name="feature" type="Property" new="true" label="label.attributes" />
     <list name="ownedOperation" type="Operation,Reception" new="true" label="label.operations" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="ownedElement" type="ModelElement" label="label.owned-elements"/>
     
     <debug />
@@ -1192,7 +1192,7 @@
     <list name="powertypeRange" type="Generalization" />
     <list name="typedFeature" type="Classifier" />
     <list name="typedParameter" type="Classifier" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="specifiedEnd" type="Classifier" />
     <list name="instance" type="Classifier" />
     <list name="createAction" type="Classifier" />
@@ -1414,7 +1414,7 @@
     <list name="powertypeRange" type="Generalization" />
     <list name="typedFeature" type="Classifier" />
     <list name="typedParameter" type="Classifier" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="specifiedEnd" type="Classifier" />
     <list name="instance" type="Classifier" />
     <list name="createAction" type="Classifier" />
@@ -1461,7 +1461,7 @@
     <list name="powertypeRange" type="Generalization" />
     <list name="typedFeature" type="Classifier" />
     <list name="typedParameter" type="Classifier" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="specifiedEnd" type="Classifier" />
     <list name="instance" type="Classifier" />
     <list name="createAction" type="Classifier" />
@@ -2406,7 +2406,7 @@
     <separator />
     <list name="feature" type="Property" new="true" label="label.attributes" />
     <list name="ownedOperation" type="Operation,Reception" new="true" label="label.operations" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="extensionPoint" type="ExtensionPoint" new="true" label="label.extension-points" />
 	<debug />
 	<attribute name="visibility" type="VisibilityKind" />
@@ -2451,7 +2451,7 @@
     <list name="generalization" type="Generalization" />
     <list name="specialization" type="GeneralizableElement" />
     <separator />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="ownedOperation" type="Operation,Reception" new="true" label="label.operations" />
 
 	<debug />
@@ -3261,7 +3261,7 @@
     <separator />
     <list name="generalization" type="Generalization" />
     <list name="specialization" type="GeneralizableElement" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <separator />
     <list name="availableFeature" type="Feature" label="label.available-features" />
     <list name="availableContents" type="ModelElement" label="label.available-contents" />
@@ -3786,7 +3786,7 @@
     <list name="powertypeRange" type="Generalization" />
     <list name="typedFeature" type="Classifier" />
     <list name="typedParameter" type="Classifier" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="specifiedEnd" type="Classifier" />
     <list name="instance" type="Classifier" />
     <list name="createAction" type="Classifier" />
@@ -3938,7 +3938,7 @@
     <list name="powertypeRange" type="Generalization" />
     <list name="typedFeature" type="Classifier" />
     <list name="typedParameter" type="Classifier" />
-    <list name="association" type="Classifier" />
+    <list name="association" type="Association" label="label.associations" />
     <list name="specifiedEnd" type="Classifier" />
     <list name="instance" type="Classifier" />
     <list name="createAction" type="Classifier" />

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2647831

To unsubscribe from this discussion, e-mail: [[email protected]].