svn commit: r16260 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java

Author: tfmorris
Date: 2008-12-06 11:21:44-0800
New Revision: 16260

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java

Log:
Issue 5542: Fix constructors so they match again.  Add more copies of the warning to make it harder to miss.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&pathrev=16260&r1=16259&r2=16260
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java	2008-12-06 11:21:44-0800
@@ -130,20 +130,30 @@
                 new PathItemPlacement(this, srcMult, 0, 5, 135, 5));
         markPosition(0, 5, 135, 5, Color.green);
         
+        //////////////////////////////////////////////////////////////////
+        // NOTE: If this needs to be updated during the deprecation period
+        // also update the constructor below
+        //////////////////////////////////////////////////////////////////
+        
         srcGroup = new FigAssociationEndAnnotation(this);
         addPathItem(srcGroup, 
                 new PathItemPlacement(this, srcGroup, 0, 5, -135, 5));
-        markPosition(0, 5, -135, 15, Color.blue);
+        markPosition(0, 5, -135, 5, Color.blue);
 
         destMult = new FigMultiplicity();
         addPathItem(destMult,
                 new PathItemPlacement(this, destMult, 100, -5, 45, 5));
         markPosition(100, -5, 45, 5, Color.red);
         
+        //////////////////////////////////////////////////////////////////
+        // NOTE: If this needs to be updated during the deprecation period
+        // also update the constructor below
+        //////////////////////////////////////////////////////////////////
+                
         destGroup = new FigAssociationEndAnnotation(this);
         addPathItem(destGroup,
                 new PathItemPlacement(this, destGroup, 100, -5, -45, 5));
-        markPosition(100, -5, -45, 15, Color.orange);
+        markPosition(100, -5, -45, 5, Color.orange);
                 
         setBetweenNearestPoints(true);
     }
@@ -179,8 +189,8 @@
         
         srcGroup = new FigAssociationEndAnnotation(this, ends[0], settings);
         addPathItem(srcGroup, 
-                new PathItemPlacement(this, srcGroup, 0, 5, -135, 15));
-        markPosition(0, 5, -135, 15, Color.blue);
+                new PathItemPlacement(this, srcGroup, 0, 5, -135, 5));
+        markPosition(0, 5, -135, 5, Color.blue);
 
         destMult = new FigMultiplicity(ends[1], settings);
         addPathItem(destMult,
@@ -189,8 +199,8 @@
         
         destGroup = new FigAssociationEndAnnotation(this, ends[1], settings);
         addPathItem(destGroup,
-                new PathItemPlacement(this, destGroup, 100, -5, -45, 15));
-        markPosition(100, -5, -45, 15, Color.orange);
+                new PathItemPlacement(this, destGroup, 100, -5, -45, 5));
+        markPosition(100, -5, -45, 5, Color.orange);
 
         setBetweenNearestPoints(true);

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

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