svn commit: r15741 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java

Author: mvw
Date: 2008-09-18 13:04:34-0700
New Revision: 15741

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java

Log:
The last patch as described in issue 5396 for the sequence2 project.

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java?view=diff&rev=15741&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java&r1=15740&r2=15741
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/SequenceDiagramGraphModel.java	2008-09-18 13:04:34-0700
@@ -68,17 +68,6 @@
      * The interaction that is shown on the sequence diagram.
      */
     private Object interaction;
-
-    /**
-     * State for actions in sequence diagram.
-     */
-    private Object defaultState;
-
-    /**
-     * State machine for default state.
-     */
-    private Object defaultStateMachine;
-
     
     
     /**
@@ -351,10 +340,7 @@
                     associationRole);
             if (action != null) {
                 Model.getCollaborationsHelper().setAction(message, action);
-                Model.getStateMachinesHelper().setDoActivity(
-                    Model.getStateMachinesFactory().buildSimpleState(
-                            getDefaultState()),
-                    action);
+                Model.getCoreHelper().setNamespace(action, getCollaboration());
             }
             Model.getCollaborationsHelper()
                 .setSender(message, fromPort);
@@ -381,45 +367,4 @@
         }
     }
 
-    
-    
-    private Object getDefaultStateMachine() {
-        if (defaultStateMachine == null) {
-            Object clsfr =
-                Model.getFacade().getRepresentedClassifier(getCollaboration());
-            if (clsfr == null) {
-                Object oper = Model.getFacade().getRepresentedOperation(
-                        getCollaboration());
-                if (oper != null) clsfr = Model.getFacade().getOwner(oper);
-            }
-            if (clsfr == null) {
-                Object ns = Model.getFacade().getNamespace(getCollaboration());
-                clsfr = Model.getCoreFactory().buildClass(ns);
-            }
-            if (clsfr == null) {
-                throw new IllegalStateException("Can not create a Classifier");
-            }
-            for (Object child : Model.getFacade().getOwnedElements(clsfr)) {
-                if (Model.getFacade().isAStateMachine(child)) {
-                    defaultStateMachine = child;
-                    break;
-                }
-            }
-            if (defaultStateMachine == null) {
-                defaultStateMachine =
-                    Model.getStateMachinesFactory().buildStateMachine(clsfr);
-            }
-        }
-        return defaultStateMachine;
-    }
-
-    private Object getDefaultState() {
-        if (defaultState == null) {
-            defaultState =
-                Model.getStateMachinesHelper()
-                    .getTop(getDefaultStateMachine());
-        }
-        return defaultState;
-    }
-
 }