svn commit: r12784 - trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java

Author: tfmorris
Date: 2007-06-08 00:51:22-0700
New Revision: 12784

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java

Log:
More UML 2.x related API & Javadoc updates

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=12784&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=12783&r2=12784
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2007-06-08 00:51:22-0700
@@ -557,6 +557,10 @@
         return handle instanceof MultiplicityRange;
     }
 
+    public boolean isANamedElement(Object handle) {
+        return handle instanceof ModelElement;
+    }
+    
     public boolean isANamespace(Object handle) {
         return handle instanceof Namespace;
     }
@@ -949,7 +953,7 @@
         try {
             if (handle instanceof AssociationEnd) {
                 return AggregationKindEnum.AK_AGGREGATE
-                .equals(((AssociationEnd) handle).getAggregation());
+                        .equals(((AssociationEnd) handle).getAggregation());
             }
         } catch (InvalidObjectException e) {
             throw new InvalidElementException(e);
@@ -1450,9 +1454,14 @@
         }
     }
 
+    
+    @SuppressWarnings("deprecation")
+    public Object getChild(Object handle) {
+        return getSpecific(handle);
+    }
 
 
-    public Object getChild(Object handle) {
+    public Object getSpecific(Object handle) {
         try {
             if (handle instanceof Generalization) {
                 return ((Generalization) handle).getChild();
@@ -1462,7 +1471,7 @@
             throw new InvalidElementException(e);
         }
     }
-
+    
 
     public Collection getChildren(Object handle) {
         try {
@@ -2116,7 +2125,7 @@
             if (isAModel(handle)) {
                 return handle;
             }
-            if (!isAModelElement(handle)) {
+            if (!isAUMLElement(handle)) {
                 return illegalArgumentObject(handle);
             }
             // If we can't find a model, return the outermost
@@ -3034,7 +3043,12 @@
     }
 
 
+    @SuppressWarnings("deprecation")
     public Object getParent(Object handle) {
+        return getGeneral(handle);
+    }
+    
+    public Object getGeneral(Object handle) {
         try {
             if (handle instanceof Generalization) {
                 return ((Generalization) handle).getParent();