svn commit: r15421 - branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java

Author: bszanto
Date: 2008-07-31 05:04:53-0700
New Revision: 15421

Modified:
   branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java

Log:
Fixed: [1] a CR in a seq 2 can now be created from all classifiers (Actors, Classes, Interfaces, Nodes, Components, Use Cases, etc) and not only Classes; [2] the problem with creating messages that threw an Exception on some cases (the CR was removed from the diagram and then readded via DnD or Add to diagram)

Modified: branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java?view=diff&rev=15421&p1=branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java&p2=branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java&r1=15420&r2=15421
==============================================================================
--- branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java	(original)
+++ branches/gsoc2008/feature1_5138_bszanto/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/UMLSequenceDiagram.java	2008-07-31 05:04:53-0700
@@ -84,6 +84,7 @@
         
         LOG.debug("Created sequence diagram");
     }
+    
     /**
      * Creates a new UmlSequenceDiagram with a collaboration.
      * @param collaboration The collaboration
@@ -190,8 +191,7 @@
      */
     @Override
     public boolean doesAccept(Object objectToAccept) {
-        if (Model.getFacade().isAClass(objectToAccept) 
-                || Model.getFacade().isAActor(objectToAccept)) {
+        if (Model.getFacade().isAClassifier(objectToAccept)) {
             return true;
         }
         return false;
@@ -212,8 +212,7 @@
             node =
                 Model.getCollaborationsFactory().buildClassifierRole(
                         collaboration);
-        }
-        getGraphModel().getNodes().add(node);
+          }
         Model.getCollaborationsHelper().addBase(node, base);
         
         return node;
@@ -231,6 +230,8 @@
         
         FigClassifierRole newCR = new FigClassifierRole(classifierRole);
         
+        getGraphModel().getNodes().add(newCR.getOwner());
+        
         // Y position of the new CR should match existing CRs Y position
         List nodes = getLayer().getContentsNoEdges();
         int i = 0;
@@ -261,8 +262,7 @@
         FigClassifierRole newCR = null;
         if (Model.getFacade().isAClassifierRole(droppedObject)) {
             newCR = makeNewFigCR(droppedObject, location);           
-        } else if (Model.getFacade().isAClass(droppedObject)
-                || Model.getFacade().isAActor(droppedObject)){
+        } else if (Model.getFacade().isAClassifier(droppedObject)){
             newCR = makeNewFigCR(makeNewCR(droppedObject), location);
         }
         if (newCR != null) {
@@ -277,7 +277,7 @@
     
     @Override
     public String getInstructions(Object droppedObject) {
-        if (Model.getFacade().isAClassifierRole(droppedObject)) {
+        if (Model.getFacade().isAClassifier(droppedObject)) {
             //TODO: i18n
             return "Click on diagram to add as a new Classifier Role";
         }