svn commit: r15727 - trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java

Author: mvw
Date: 2008-09-18 12:09:25-0700
New Revision: 15727

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java

Log:
The last patch as described in issue 5396.

I also removed the code that is now not used any more.

And corrected one spelling error in a comment.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java?view=diff&rev=15727&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java&r1=15726&r2=15727
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java	2008-09-18 12:09:25-0700
@@ -46,7 +46,7 @@
 /**
  * This class defines a bridge between the UML meta-model
  * representation of the design and the GraphModel interface used by
- * GEF.  This class handles only UML Sequence Digrams.
+ * GEF.  This class handles only UML Sequence Diagrams.
  *
  * @author [email protected]
  */
@@ -73,15 +73,6 @@
      */
     private Object interaction;
 
-    /**
-     * State for actions in sequence diagram.
-     */
-    private Object defaultState;
-
-    /**
-     * State machine for default state.
-     */
-    private Object defaultStateMachine;
 
     ////////////////////////////////////////////////////////////////
     // GraphModel implementation
@@ -370,10 +361,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, fromObject);
@@ -455,45 +443,6 @@
         return interaction;
     }
 
-    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;
-    }
-
     /*
      * @see org.argouml.uml.diagram.UMLMutableGraphSupport#getHomeModel()
      */