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

Author: tfmorris
Date: 2007-11-04 11:46:43-0700
New Revision: 13718

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

Log:
Mark isReturn() and hasReturnParameterDirectionKind() as duplicates and remove redundant implementation.

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=13718&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=13717&r2=13718
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2007-11-04 11:46:43-0700
@@ -317,7 +317,7 @@
         } catch (InvalidObjectException e) {
             throw new InvalidElementException(e);
         }
-        if (handle instanceof ModelElement) {
+        if (isAUMLElement(handle)) {
             return false;
         } else {
             return illegalArgumentBoolean(handle);
@@ -1049,7 +1049,7 @@
         } catch (InvalidObjectException e) {
             throw new InvalidElementException(e);
         }
-        if (handle instanceof ModelElement) {
+        if (isAUMLElement(handle)) {
             return false;
         } else {
             return illegalArgumentBoolean(handle);
@@ -1071,7 +1071,7 @@
         } catch (InvalidObjectException e) {
             throw new InvalidElementException(e);
         }
-        if (handle instanceof ModelElement) {
+        if (isAUMLElement(handle)) {
             return false;
         } else {
             return illegalArgumentBoolean(handle);
@@ -1198,15 +1198,7 @@
 
 
     public boolean isReturn(Object handle) {
-        try {
-            if (handle instanceof Parameter) {
-                return ParameterDirectionKindEnum.PDK_RETURN
-                .equals(((Parameter) handle).getKind());
-            }
-            return illegalArgumentBoolean(handle);
-        } catch (InvalidObjectException e) {
-            throw new InvalidElementException(e);
-        }
+        return hasReturnParameterDirectionKind(handle);
     }