svn commit: r17328 - trunk/src/argouml-app/src/org/argouml/uml/diagram: . collaboration/ui deployment/ui static_structure/ui ui use_case/ui
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2009-09-15 04:45:37-0700
New Revision: 17328
Added:
trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramEdgeSettings.java
- copied, changed from r17319, /trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramAssociationSettings.java
Removed:
trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramAssociationSettings.java
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
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/ui/FigAssociation.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
Log:
Make the association settings name more generic so we can use it for other edge types
Removed: trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramAssociationSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramAssociationSettings.java?view=markup&pathrev=17327
Copied: trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramEdgeSettings.java (from r17319, /trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramAssociationSettings.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramEdgeSettings.java?view=diff&pathrev=17328&r1=17319&r2=17328
==============================================================================
--- /trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramAssociationSettings.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramEdgeSettings.java 2009-09-15 04:45:37-0700
@@ -1,4 +1,4 @@
-// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
+// $Id: DiagramEdgeSettings.java 11347 2006-10-26 22:37:44Z linus $
// Copyright (c) 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
@@ -24,24 +24,24 @@
package org.argouml.uml.diagram;
-public class DiagramAssociationSettings extends DiagramElementSettings {
+public class DiagramEdgeSettings extends DiagramElementSettings {
- private final Object associationEnd1;
- private final Object associationEnd2;
+ private final Object sourceConnector;
+ private final Object destinationConnector;
- public DiagramAssociationSettings(
- final Object association,
- final Object associationEnd1,
- final Object associationEnd2) {
- super(association);
- this.associationEnd1 = associationEnd1;
- this.associationEnd2 = associationEnd2;
+ public DiagramEdgeSettings(
+ final Object modelElement,
+ final Object sourceConnector,
+ final Object destinationConnector) {
+ super(modelElement);
+ this.sourceConnector = sourceConnector;
+ this.destinationConnector = destinationConnector;
}
- public Object getAssociationEnd1() {
- return associationEnd1;
+ public Object getSourceConnector() {
+ return sourceConnector;
}
- public Object getAssociationEnd2() {
- return associationEnd2;
+ public Object getDestinationConnector() {
+ return destinationConnector;
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java?view=diff&pathrev=17328&r1=17327&r2=17328
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java 2009-09-15 04:45:37-0700
@@ -30,7 +30,7 @@
import org.argouml.model.Model;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.DiagramAssociationSettings;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.UmlDiagramRenderer;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
@@ -129,7 +129,7 @@
Object[] associationEnds =
Model.getFacade().getConnections(edge).toArray();
newEdge = new FigAssociationRole(
- new DiagramAssociationSettings(
+ new DiagramEdgeSettings(
edge,
associationEnds[0],
associationEnds[1]),
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=17328&r1=17327&r2=17328
==============================================================================
--- 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-09-15 04:45:37-0700
@@ -31,7 +31,7 @@
import org.argouml.model.Model;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.DiagramAssociationSettings;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.UmlDiagramRenderer;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
@@ -110,7 +110,7 @@
Object[] associationEnds =
Model.getFacade().getConnections(edge).toArray();
newEdge = new FigAssociationClass(
- new DiagramAssociationSettings(
+ new DiagramEdgeSettings(
edge,
associationEnds[0],
associationEnds[1]),
@@ -127,7 +127,7 @@
Object[] associationEnds =
Model.getFacade().getConnections(edge).toArray();
newEdge = new FigAssociation(
- new DiagramAssociationSettings(
+ new DiagramEdgeSettings(
edge,
associationEnds[0],
associationEnds[1]),
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=17328&r1=17327&r2=17328
==============================================================================
--- 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-09-15 04:45:37-0700
@@ -32,7 +32,7 @@
import org.argouml.model.Model;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.DiagramAssociationSettings;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.GraphChangeAdapter;
import org.argouml.uml.diagram.UmlDiagramRenderer;
@@ -158,7 +158,7 @@
Object[] associationEnds =
Model.getFacade().getConnections(edge).toArray();
newEdge = new FigAssociationClass(
- new DiagramAssociationSettings(
+ new DiagramEdgeSettings(
edge,
associationEnds[0],
associationEnds[1]),
@@ -189,7 +189,7 @@
Object[] associationEnds =
Model.getFacade().getConnections(edge).toArray();
newEdge = new FigAssociation(
- new DiagramAssociationSettings(
+ new DiagramEdgeSettings(
edge,
associationEnds[0],
associationEnds[1]),
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=17328&r1=17327&r2=17328
==============================================================================
--- 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 2009-09-15 04:45:37-0700
@@ -43,7 +43,7 @@
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.DiagramAssociationSettings;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
import org.argouml.uml.diagram.DiagramElementSettings;
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.ArrowHead;
@@ -108,22 +108,19 @@
/**
* Constructor used by PGML parser.
*
- * @param diagramElementSettings the destination uml association-end element
+ * @param diagramEdgeSettings the destination uml association-end element
* @param settings rendering settings
*/
public FigAssociation(
- final DiagramElementSettings diagramElementSettings,
+ final DiagramEdgeSettings diagramEdgeSettings,
final DiagramSettings settings) {
- super(diagramElementSettings.getOwner(), settings);
+ super(diagramEdgeSettings.getOwner(), settings);
createNameLabel(getOwner(), settings);
- final DiagramAssociationSettings set =
- (DiagramAssociationSettings) diagramElementSettings;
-
createEndFigs(
- set.getAssociationEnd1(),
- set.getAssociationEnd2(),
+ diagramEdgeSettings.getSourceConnector(),
+ diagramEdgeSettings.getDestinationConnector(),
settings, 45);
setBetweenNearestPoints(true);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java?view=diff&pathrev=17328&r1=17327&r2=17328
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java 2009-09-15 04:45:37-0700
@@ -30,7 +30,7 @@
import org.argouml.model.Model;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.DiagramAssociationSettings;
+import org.argouml.uml.diagram.DiagramEdgeSettings;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.uml.diagram.GraphChangeAdapter;
@@ -169,7 +169,7 @@
final Object[] associationEnds =
Model.getFacade().getConnections(edge).toArray();
newEdge = new FigAssociation(
- new DiagramAssociationSettings(
+ new DiagramEdgeSettings(
edge,
associationEnds[0],
associationEnds[1]),
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2394994
To unsubscribe from this discussion, e-mail: [[email protected]].