svn commit: r14394 - trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java

Author: tfmorris
Date: 2008-04-18 22:06:48-0700
New Revision: 14394

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

Log:
Simplify MDR calls

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java?view=diff&rev=14394&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java&r1=14393&r2=14394
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	2008-04-18 22:06:48-0700
@@ -306,9 +306,7 @@
     public void addSubvertex(Object handle, Object subvertex) {
         if (handle instanceof CompositeState
                 && subvertex instanceof StateVertex) {
-            modelImpl.getUmlPackage().getStateMachines().
-                    getAContainerSubvertex().add((CompositeState) handle,
-                            (StateVertex) subvertex);
+            ((StateVertex) subvertex).setContainer((CompositeState) handle);
             return;
         }
         throw new IllegalArgumentException("handle: " + handle
@@ -516,16 +514,8 @@
 
     public void setSubvertices(Object handle, Collection subvertices) {
         if (handle instanceof CompositeState) {
-            Collection vertices = Model.getFacade().getSubvertices(handle);
-            if (!vertices.isEmpty()) {
-                Collection verts = new ArrayList(vertices);
-                for (Object vertex : verts) {
-                    removeSubvertex(handle, vertex);
-                }
-            }
-            for (Object vertex : subvertices) {
-                addSubvertex(handle, vertex);
-            }
+            ((CompositeState) handle).getSubvertex().clear();
+            ((CompositeState) handle).getSubvertex().addAll(subvertices);
             return;
         }
         throw new IllegalArgumentException("handle: " + handle
@@ -650,9 +640,7 @@
 
     public void addDeferrableEvent(Object state, Object deferrableEvent) {
         if (state instanceof State && deferrableEvent instanceof Event) {
-            modelImpl.getUmlPackage().getStateMachines()
-                    .getAStateDeferrableEvent().add((State) state,
-                            (Event) deferrableEvent);
+            ((State) state).getDeferrableEvent().add((Event) deferrableEvent);
             return;
         }
         throw new IllegalArgumentException("handle: " + state + " or evt: "
@@ -663,9 +651,7 @@
     public void removeDeferrableEvent(Object state, Object deferrableEvent) {
         try {
             if (state instanceof State && deferrableEvent instanceof Event) {
-                modelImpl.getUmlPackage().getStateMachines()
-                        .getAStateDeferrableEvent().remove((State) state,
-                                (Event) deferrableEvent);
+                ((State) state).getDeferrableEvent().remove(deferrableEvent);
                 return;
             }
         } catch (InvalidObjectException e) {