svn commit: r15425 - branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java

Author: bszanto
Date: 2008-07-31 08:03:58-0700
New Revision: 15425

Modified:
   branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java

Log:
Removed position checking for new classifier roles in collab diags -> this was not required here.

Modified: branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&rev=15425&p1=branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&p2=branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&r1=15424&r2=15425
==============================================================================
--- branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java	(original)
+++ branches/gsoc2008/feature1_5138_bszanto/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java	2008-07-31 08:03:58-0700
@@ -484,28 +484,8 @@
         
         getGraphModel().getNodes().add(newCR.getOwner());
         
-        // Y position of the new CR should match existing CRs Y position
-        List nodes = getLayer().getContentsNoEdges();
-        int i = 0;
-        boolean figClassifierRoleFound = false;
-        Fig fig = null;
-        while (i < nodes.size() && !figClassifierRoleFound) {
-            fig = (Fig) nodes.get(i);
-            if (nodes.get(i) instanceof Fig) {
-                if (fig != newCR && fig instanceof FigClassifierRole) {
-                    newCR.setY(fig.getY());
-                    newCR.setHeight(fig.getHeight());
-                    figClassifierRoleFound = true;
-                }
-            }
-            i++;
-        }
-        if (location != null) {
-            if (newCR.getY() == 0) {
-                newCR.setY(location.y);
-            }
-            newCR.setX(location.x);
-        }
+        newCR.setY(location.y);
+        newCR.setX(location.x);
         return newCR;
     }