svn commit: r13217 - trunk/src/model/src/org/argouml/model

Author: mvw
Date: 2007-08-03 07:51:07-0700
New Revision: 13217

Modified:
   trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java
   trunk/src/model/src/org/argouml/model/CoreHelper.java
   trunk/src/model/src/org/argouml/model/ModelManagementHelper.java

Log:
Trying to complete these difficult functions. 

In preparation of issue 4395.

Modified: trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java?view=diff&rev=13217&p1=trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java&p2=trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java&r1=13216&r2=13217
==============================================================================
--- trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java	(original)
+++ trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java	2007-08-03 07:51:07-0700
@@ -111,6 +111,10 @@
         return impl.getOperationsInh(classifier);
     }
 
+    public Collection getParent(Object generalizableElement) {
+        return impl.getParent(generalizableElement);
+    }
+
     public List getReturnParameters(Object operation) {
         return impl.getReturnParameters(operation);
     }

Modified: trunk/src/model/src/org/argouml/model/CoreHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/CoreHelper.java?view=diff&rev=13217&p1=trunk/src/model/src/org/argouml/model/CoreHelper.java&p2=trunk/src/model/src/org/argouml/model/CoreHelper.java&r1=13216&r2=13217
==============================================================================
--- trunk/src/model/src/org/argouml/model/CoreHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/CoreHelper.java	2007-08-03 07:51:07-0700
@@ -132,6 +132,17 @@
      * @return a collection of the operations
      */
     Collection getOperationsInh(Object classifier);
+    
+    /**
+     * Return the collection of all direct parents. <p>
+     * 
+     * This function is additional operation number 1 for 
+     * a GeneralizableElement from the UML1.4 standard.
+     * 
+     * @param generalizableElement the given element
+     * @return a collection of GeneralizableElement
+     */
+    Collection getParent(Object generalizableElement);
 
     /**
      * Return all return parameters for an Operation.

Modified: trunk/src/model/src/org/argouml/model/ModelManagementHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/ModelManagementHelper.java?view=diff&rev=13217&p1=trunk/src/model/src/org/argouml/model/ModelManagementHelper.java&p2=trunk/src/model/src/org/argouml/model/ModelManagementHelper.java&r1=13216&r2=13217
==============================================================================
--- trunk/src/model/src/org/argouml/model/ModelManagementHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/ModelManagementHelper.java	2007-08-03 07:51:07-0700
@@ -263,6 +263,13 @@
      *   contents = self.ownedInstance->union(self.ownedLink)
      * </pre>
      * 
+     * For a Subsystem: <pre>
+     * [2] The operation contents results in a Set containing 
+     * the ModelElements owned by or imported by the Subsystem.
+     *   contents : Set(ModelElement)
+     *   contents = self.ownedElement->union(self.importedElement)
+     * </pre>
+     * 
      * @param namespace the ns to get the contents from
      * @return a collection of modelelements
      */