svn commit: r17163 - branches/BRANCH_0_28_x/src: . argouml-app argouml-app/tests/org/argouml/profile argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram

Author: linus
Date: 2009-06-30 08:45:26-0700
New Revision: 17163

Modified:
   branches/BRANCH_0_28_x/src/   (props changed)
   branches/BRANCH_0_28_x/src/argouml-app/   (props changed)
   branches/BRANCH_0_28_x/src/argouml-app/tests/org/argouml/profile/   (props changed)
   branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/   (props changed)
   branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java
   branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java

Log:
Merged in r17105 (solution to issue 5789).

Modified: branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java?view=diff&pathrev=17163&r1=17162&r2=17163
==============================================================================
--- branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java	(original)
+++ branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramGraphModel.java	2009-06-30 08:45:26-0700
@@ -190,18 +190,27 @@
     /*
      * @see org.tigris.gef.graph.MutableGraphModel#canAddNode(java.lang.Object)
      */
+    @Override
     public boolean canAddNode(Object node) {
         if (node == null) {
             return false;
         }
-        return !getNodes().contains(node)
-                && Model.getFacade().isAModelElement(node)
+        if (getNodes().contains(node)) {
+            return false;
+        }
+        if (Model.getFacade().isAComment(node)) {
+            // Comments from anywhere in the model are allowed
+            return true;
+        }
+        return Model.getFacade().isAModelElement(node)
+                // All other types of elements must be in this namespace
                 && Model.getFacade().getNamespace(node) == getCollaboration();
     }
 
     /*
      * @see org.tigris.gef.graph.MutableGraphModel#canAddEdge(java.lang.Object)
      */
+    @Override
     public boolean canAddEdge(Object edge) {
         if (edge == null) {
             return false;
@@ -249,6 +258,7 @@
     /*
      * @see org.tigris.gef.graph.MutableGraphModel#addNode(java.lang.Object)
      */
+    @Override
     public void addNode(Object node) {
         if (canAddNode(node)) {
             getNodes().add(node);
@@ -286,6 +296,7 @@
      * @see org.tigris.gef.graph.MutableGraphModel#connect(
      *          Object, Object, Class)
      */
+    @Override
     public Object connect(Object fromPort, Object toPort, Object edgeType) {
         if (!canConnect(fromPort, toPort, edgeType)) {
             return null;
@@ -293,8 +304,6 @@
         if (edgeType == CommentEdge.class) {
             return super.connect(fromPort, toPort, edgeType);
         }
-        Object edge = null;
-        Object action = null;
         Editor curEditor = Globals.curEditor();
         ModeManager modeManager = curEditor.getModeManager();
         Mode mode = modeManager.top();
@@ -305,7 +314,7 @@
     
     /**
      * Creates a link based on the given from and toPort. The fromPort
-     * should allways point to a MessageCoordinates instance. The toPort
+     * should always point to a MessageCoordinates instance. The toPort
      * can point to a MessageCoordinates instance or to a Object
      * instance. On a sequence diagram you can only draw Messages. So
      * other edgeClasses then links are not supported.
@@ -313,7 +322,8 @@
      * @see org.tigris.gef.graph.MutableGraphModel#connect(
      *          Object, Object, Class)
      */
-    public Object connect(Object fromPort, Object toPort, Object edgeType, Object actionType) {
+    public Object connect(Object fromPort, Object toPort, Object edgeType, 
+    		Object actionType) {
         Object edge = null;
         Object action = null;
         if (Model.getMetaTypes().getCallAction().equals(actionType)) {
@@ -376,6 +386,7 @@
     /*
      * @see org.tigris.gef.graph.MutableGraphModel#addEdge(java.lang.Object)
      */
+    @Override
     public void addEdge(Object edge) {
         if (canAddEdge(edge)) {
             getEdges().add(edge);

Modified: branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java?view=diff&pathrev=17163&r1=17162&r2=17163
==============================================================================
--- branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java	(original)
+++ branches/BRANCH_0_28_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java	2009-06-30 08:45:26-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2007-2008 The Regents of the University of California. All
+// Copyright (c) 2007-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -68,6 +68,8 @@
                 && ((UMLDiagram) diag).doesAccept(node)) {
             result = ((UMLDiagram) diag).drop(node, null);
         } else {
+            LOG.warn("SequenceDiagramRenderer getFigNodeFor unexpected node " 
+                    + node);
             return null;
         }
         LOG.debug("SequenceDiagramRenderer getFigNodeFor " + result);

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

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