svn commit: r18649 - trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java

Author: bobtarling
Date: 2010-08-16 18:02:07-0700
New Revision: 18649

Modified:
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java

Log:
Make association end properties owned by classifiers

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java?view=diff&pathrev=18649&r1=18648&r2=18649
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java	2010-08-16 18:02:07-0700
@@ -161,16 +161,18 @@
                 // The code below will make navigable ends owned by the classifier
                 // at the opposite end, but let's just make them owned by the association
                 // for simplicity (don't assume everything will be like this though!)
-//                if (UMLUtil.getOwnedAttributes((Type) type2) == null) {
-//                    association.getOwnedEnds().add(property1);
-//                } else {
-//                    UMLUtil.getOwnedAttributes((Type) type2).add(property1);
-//                }
-//                if (UMLUtil.getOwnedAttributes((Type) type1) == null) {
-//                    association.getOwnedEnds().add(property2);
-//                } else {
-//                    UMLUtil.getOwnedAttributes((Type) type1).add(property2);
-//                }
+                // This code reinstated by Bob 17 Aug 2010
+                if (UMLUtil.getOwnedAttributes((Type) type2) == null) {
+                    association.getOwnedEnds().add(property1);
+                } else {
+                    UMLUtil.getOwnedAttributes((Type) type2).add(property1);
+                }
+                if (UMLUtil.getOwnedAttributes((Type) type1) == null) {
+                    association.getOwnedEnds().add(property2);
+                } else {
+                    UMLUtil.getOwnedAttributes((Type) type1).add(property2);
+                }
+                //
                 ((Type) type1).getNearestPackage().getPackagedElements().add(
                         association);
                 getParams().add(association);

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

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