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

Author: bobtarling
Date: 2010-08-17 09:55:19-0700
New Revision: 18657

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

Log:
Revert back to association ownership of association end properties

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=18657&r1=18656&r2=18657
==============================================================================
--- 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-17 09:55:19-0700
@@ -161,17 +161,20 @@
                 // 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!)
-                // 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);
-                }
+                // Bob says - see page 42 and 43 of UML2.2 superstructure
+                // for info on property ownership. Default will be association ownership
+                // but we need a way for the user to change to classifier ownership at a
+                // later time.
+//                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);

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

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