svn commit: r16634 - trunk/src/argouml-app/src/org/argouml/uml/diagram: deployment/ui static_structure/ui

Author: tfmorris
Date: 2009-01-16 10:43:24-0800
New Revision: 16634

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java

Log:
Issue 5500: Update FigLink to new constructor

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java?view=diff&pathrev=16634&r1=16633&r2=16634
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java	2009-01-16 10:43:24-0800
@@ -125,7 +125,7 @@
             asend.setDestFigNode(classifierFN);
             newEdge = asend;
         } else if (Model.getFacade().isALink(edge)) {
-            FigLink lnkFig = new FigLink(edge);
+            FigLink lnkFig = new FigLink(edge, settings);
             Collection linkEnds = Model.getFacade().getConnections(edge);
             Object[] leArray = linkEnds.toArray();
             Object fromEnd = leArray[0];

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java?view=diff&pathrev=16634&r1=16633&r2=16634
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java	2009-01-16 10:43:24-0800
@@ -173,9 +173,8 @@
         } else if (Model.getFacade().isAAssociation(edge)) {
             newEdge = new FigAssociation(edge, settings);
         } else if (Model.getFacade().isALink(edge)) {
-            Object lnk = edge;
-            FigLink lnkFig = new FigLink(lnk);
-            Collection linkEndsColn = Model.getFacade().getConnections(lnk);
+            FigLink lnkFig = new FigLink(edge, settings);
+            Collection linkEndsColn = Model.getFacade().getConnections(edge);
 
             Object[] linkEnds = linkEndsColn.toArray();
             Object fromInst = Model.getFacade().getInstance(linkEnds[0]);

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java?view=diff&pathrev=16634&r1=16633&r2=16634
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java	2009-01-16 10:43:24-0800
@@ -25,6 +25,7 @@
 package org.argouml.uml.diagram.static_structure.ui;
 
 import org.argouml.model.Model;
+import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigTextGroup;
 import org.argouml.uml.diagram.ui.PathItemPlacement;
@@ -49,13 +50,21 @@
     /*
      * Text group to contain name & stereotype
      */
-    private FigTextGroup middleGroup = new FigTextGroup(); 
+    private FigTextGroup middleGroup; 
 
     /**
      * Constructor.
+     * 
+     * @deprecated for 0.28 by tfmorris. Use
+     *             {@link #FigLink(Object, DiagramSettings)}.
      */
     @Deprecated
     public FigLink() {
+        middleGroup = new FigTextGroup();
+        initialize();
+    }
+
+    private void initialize() {
         middleGroup.addFig(getNameFig());
         addPathItem(middleGroup,
                 new PathItemPlacement(this, middleGroup, 50, 25));
@@ -68,10 +77,26 @@
      * Constructor that hooks the Fig to a UML element.
      *
      * @param edge the UML element
+     * 
+     * @deprecated for 0.28 by tfmorris. Use
+     *             {@link #FigLink(Object, DiagramSettings)}.
      */
+    @Deprecated
     public FigLink(Object edge) {
-	this();
-	setOwner(edge);
+        this();
+        setOwner(edge);
+    }
+    
+    /**
+     * Create a Fig representing a Link
+     * 
+     * @param element owning UML element
+     * @param settings render settings
+     */
+    public FigLink(Object element, DiagramSettings settings) {
+        super(element, settings);
+        middleGroup = new FigTextGroup(element, settings);
+        initialize();
     }
 
     /*

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

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