svn commit: r17256 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java

Author: bobtarling
Date: 2009-08-10 14:33:05-0700
New Revision: 17256

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

Log:
Give diagrams the responsibility of creating DiagramElements (Figs) so that reverse engineering does not need to know of FigClass FigInterface or any other concrete Figs

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java?view=diff&pathrev=17256&r1=17255&r2=17256
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	2009-08-10 14:33:05-0700
@@ -35,10 +35,12 @@
 import org.argouml.model.CollaborationsHelper;
 import org.argouml.model.Facade;
 import org.argouml.model.Model;
+import org.argouml.uml.diagram.DiagramElement;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.SequenceDiagram;
 import org.argouml.uml.diagram.static_structure.ui.FigComment;
 import org.argouml.uml.diagram.ui.ActionSetMode;
+import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.tigris.gef.base.Editor;
@@ -273,37 +275,36 @@
         return null;
     }
     
-    @Override
-    public FigNode drop(Object droppedObject, Point location) {
-        FigNode figNode = null;
+    public DiagramElement createDiagramElement(
+            final Object modelElement,
+            final Rectangle bounds) {
+        
+        FigNodeModelElement figNode = null;
         
-
-        // If location is non-null, convert to a rectangle that we can use
-        Rectangle bounds = null;
-        if (location != null) {
-            bounds = new Rectangle(location.x, location.y, 0, 0);
-        }
         DiagramSettings settings = getDiagramSettings();
         
-        if (Model.getFacade().isAComment(droppedObject)) {
-            figNode = new FigComment(droppedObject, bounds, settings);
-        } else if (Model.getFacade().isAClassifierRole(droppedObject)) {
-            if (!getGraphModel().getNodes().contains(droppedObject)) {
-                figNode = makeNewFigCR(droppedObject, location);  
+        if (Model.getFacade().isAComment(modelElement)) {
+            figNode = new FigComment(modelElement, bounds, settings);
+        } else if (Model.getFacade().isAClassifierRole(modelElement)) {
+            if (!getGraphModel().getNodes().contains(modelElement)) {
+                figNode = makeNewFigCR(modelElement, bounds.getLocation());  
             }
-        } else if (Model.getFacade().isAClassifier(droppedObject)) {
-            figNode = makeNewFigCR(makeNewCR(droppedObject), location);
+        } else if (Model.getFacade().isAClassifier(modelElement)) {
+            figNode = makeNewFigCR(
+                    makeNewCR(modelElement),
+                    bounds.getLocation());
         }
         
         if (figNode != null) {
-            LOG.debug("Dropped object " + droppedObject + " converted to " 
+            LOG.debug("Model element " + modelElement + " converted to " 
                     + figNode);
         } else {
-            LOG.debug("Dropped object NOT added " + droppedObject);
+            LOG.debug("Dropped object NOT added " + figNode);
         }
         return figNode;
     }
     
+    
     @Override
     public String getInstructions(Object droppedObject) {
     	if (Model.getFacade().isAClassifierRole(droppedObject)) {

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

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