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

Author: linus
Date: 2011-10-30 09:57:29-0700
New Revision: 19771

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

Log:
Reverted the change done in 19769 for issue 5990. Michiels fix in 19770 solves the problem in another way.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&pathrev=19771&r1=19770&r2=19771
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2011-10-30 09:57:29-0700
@@ -4733,14 +4733,8 @@
 
     public boolean isAASynchCallMessage(Object handle) {
         Message message = (Message) handle;
-        Action action;
-        try {
-            action = message.getAction();
-        } catch (InvalidObjectException e) {
-            return false;
-        }
-        if (action instanceof CallAction) {
-            CallAction ca = (CallAction) action;
+        if (message.getAction() instanceof CallAction) {
+            CallAction ca = (CallAction) message.getAction();
             return ca.isAsynchronous();
         }
         return false;
@@ -4748,14 +4742,8 @@
 
     public boolean isAASynchSignalMessage(Object handle) {
         Message message = (Message) handle;
-        Action action;
-        try {
-            action = message.getAction();
-        } catch (InvalidObjectException e) {
-            return false;
-        }
-        if (action instanceof SendAction) {
-            SendAction sa = (SendAction) action;
+        if (message.getAction() instanceof SendAction) {
+            SendAction sa = (SendAction) message.getAction();
             return sa.isAsynchronous();
         }
         return false;
@@ -4763,47 +4751,23 @@
 
     public boolean isACreateMessage(Object handle) {
         Message message = (Message) handle;
-        Action action;
-        try {
-            action = message.getAction();
-        } catch (InvalidObjectException e) {
-            return false;
-        }
-        return (action instanceof CreateAction);
+        return (message.getAction() instanceof CreateAction);
     }
 
     public boolean isADeleteMessage(Object handle) {
         Message message = (Message) handle;
-        Action action;
-        try {
-            action = message.getAction();
-        } catch (InvalidObjectException e) {
-            return false;
-        }
-        return (action instanceof DestroyAction);
+        return (message.getAction() instanceof DestroyAction);
     }
 
     public boolean isAReplyMessage(Object handle) {
         Message message = (Message) handle;
-        Action action;
-        try {
-            action = message.getAction();
-        } catch (InvalidObjectException e) {
-            return false;
-        }
-        return (action instanceof ReturnAction);
+        return (message.getAction() instanceof ReturnAction);
     }
 
     public boolean isASynchCallMessage(Object handle) {
         Message message = (Message) handle;
-        Action action;
-        try {
-            action = message.getAction();
-        } catch (InvalidObjectException e) {
-            return false;
-        }
-        if (action instanceof CallAction) {
-            CallAction ca = (CallAction) action;
+        if (message.getAction() instanceof CallAction) {
+            CallAction ca = (CallAction) message.getAction();
             return !ca.isAsynchronous();
         }
         return false;

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

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