svn commit: r18714 - trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2

Author: bobtarling
Date: 2010-08-31 09:43:47-0700
New Revision: 18714

Modified:
   trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java
   trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java
   trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java
   trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java

Log:
Fix broken compilation

Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java?view=diff&pathrev=18714&r1=18713&r2=18714
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java	(original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociation2.java	2010-08-31 09:43:47-0700
@@ -41,6 +41,7 @@
 import java.beans.PropertyChangeEvent;
 
 import org.apache.log4j.Logger;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigAssociation;
 
@@ -59,9 +60,11 @@
      * @param owner owning uml element
      * @param settings rendering settings
      */
-    public FigAssociation2(Object owner, DiagramSettings settings) {
-        super(owner, settings);
-        addListener(owner);
+    public FigAssociation2(
+            final DiagramEdgeSettings diagramEdgeSettings,
+            final DiagramSettings settings) {
+        super(diagramEdgeSettings, settings);
+        addListener(diagramEdgeSettings.getOwner());
     }
     
     @Override

Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java?view=diff&pathrev=18714&r1=18713&r2=18714
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java	(original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/FigAssociationClass2.java	2010-08-31 09:43:47-0700
@@ -38,6 +38,7 @@
 
 package org.argouml.diagram.uml2;
 
+import org.argouml.uml.diagram.DiagramEdgeSettings;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigAssociationClass;
 
@@ -70,7 +71,9 @@
      * @param element model element
      * @param settings rendering settings
      */
-    public FigAssociationClass2(Object element, DiagramSettings settings) {
-        super(element, settings);
+    public FigAssociationClass2(
+            final DiagramEdgeSettings diagramElementSettings,
+            DiagramSettings settings) {
+        super(diagramElementSettings, settings);
     }
 }

Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java?view=diff&pathrev=18714&r1=18713&r2=18714
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java	(original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/StructureDiagram2Renderer.java	2010-08-31 09:43:47-0700
@@ -46,6 +46,7 @@
 import org.argouml.model.Model;
 import org.argouml.uml.CommentEdge;
 import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.GraphChangeAdapter;
 import org.argouml.uml.diagram.UmlDiagramRenderer;
@@ -160,7 +161,14 @@
         
         FigEdge newEdge = null;
         if (Model.getFacade().isAAssociationClass(edge)) {
-            newEdge = new FigAssociationClass2(edge, settings);
+            Object[] associationEnds = 
+                Model.getFacade().getConnections(edge).toArray();
+            newEdge = new FigAssociationClass2(
+                    new DiagramEdgeSettings(
+                            edge, 
+                            associationEnds[0], 
+                            associationEnds[1]), 
+                            settings);
         } else if (Model.getFacade().isAAssociationEnd(edge)) {
             FigAssociationEnd2 asend = new FigAssociationEnd2(edge, settings);
             Model.getFacade().getAssociation(edge);
@@ -176,7 +184,14 @@
             asend.setDestFigNode(classifierFN);
             newEdge = asend;
         } else if (Model.getFacade().isAAssociation(edge)) {
-            newEdge = new FigAssociation2(edge, settings);
+            Object[] associationEnds = 
+                Model.getFacade().getConnections(edge).toArray();
+            newEdge = new FigAssociation2(
+                    new DiagramEdgeSettings(
+                            edge, 
+                            associationEnds[0], 
+                            associationEnds[1]), 
+                            settings);
         } else if (Model.getFacade().isALink(edge)) {
             FigLink2 lnkFig = new FigLink2(edge, settings);
             Collection linkEndsColn = Model.getFacade().getConnections(edge);

Modified: trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java?view=diff&pathrev=18714&r1=18713&r2=18714
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java	(original)
+++ trunk/src/argouml-core-diagrams-uml2/src/org/argouml/diagram/uml2/UseCaseDiagramRenderer2.java	2010-08-31 09:43:47-0700
@@ -44,6 +44,7 @@
 import org.argouml.model.Model;
 import org.argouml.uml.CommentEdge;
 import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.DiagramUtils;
 import org.argouml.uml.diagram.GraphChangeAdapter;
@@ -173,7 +174,14 @@
         FigEdge newEdge = null;
 
         if (Model.getFacade().isAAssociation(edge)) {
-            newEdge = new FigAssociation2(edge, settings);
+            Object[] associationEnds = 
+                Model.getFacade().getConnections(edge).toArray();
+            newEdge = new FigAssociation2(
+                    new DiagramEdgeSettings(
+                            edge, 
+                            associationEnds[0], 
+                            associationEnds[1]), 
+                            settings);
         } else if (Model.getFacade().isAGeneralization(edge)) {
             newEdge = new FigGeneralization2(edge, settings);
         } else if (Model.getFacade().isAExtend(edge)) {

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

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