Author: bobtarling Date: 2011-05-24 03:04:28-0700 New Revision: 19501 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java 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/deployment/ui/UMLDeploymentDiagram.java trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java
Log: Allow replacement Deployment Diagram for UML2 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&pathrev=19501&r1=19500&r2=19501 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java 2011-05-24 03:04:28-0700 @@ -42,7 +42,6 @@ import org.argouml.model.Model; import org.argouml.uml.CommentEdge; -import org.argouml.uml.diagram.ui.FigCompartment; import org.argouml.uml.diagram.ui.FigCompartmentBox; import org.argouml.uml.diagram.ui.FigEdgeModelElement; import org.tigris.gef.base.Layer; @@ -329,7 +328,7 @@ * @param modelElement the model element to find presentation for * @return the FigNode presentation of the model element */ - private FigNode getNodePresentationFor(Layer lay, Object modelElement) { + protected FigNode getNodePresentationFor(Layer lay, Object modelElement) { assert modelElement != null : "A modelElement must be supplied"; for (Object fig : lay.getContentsNoEdges()) { @@ -353,13 +352,8 @@ final ArgoDiagram diagram, final Object associationEnd) { final Object element; - if (Model.getFacade().getUmlVersion().startsWith("1")) { - element = - Model.getFacade().getClassifier(associationEnd); - } else { - element = - Model.getFacade().getLifeline(associationEnd); - } + element = + Model.getFacade().getClassifier(associationEnd); return getNodePresentationFor(diagram.getLayer(), element); } 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=19501&r1=19500&r2=19501 ============================================================================== --- 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 2011-05-24 03:04:28-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009-2010 Contributors - see below + * Copyright (c) 2009-2011 Contributors - see below * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -168,4 +168,18 @@ addEdge(lay, newEdge, edge); return newEdge; } + + protected FigNode getFigNodeForAssociationEnd( + final ArgoDiagram diagram, + final Object associationEnd) { + final Object element; + if (Model.getFacade().getUmlVersion().startsWith("1")) { + element = + Model.getFacade().getClassifier(associationEnd); + } else { + element = + Model.getFacade().getLifeline(associationEnd); + } + return getNodePresentationFor(diagram.getLayer(), element); + } } 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=19501&r1=19500&r2=19501 ============================================================================== --- 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 2011-05-24 03:04:28-0700 @@ -93,8 +93,7 @@ // Although not generally true for GEF, for Argo we know that the layer // is a LayerPerspective which knows the associated diagram Diagram diag = ((LayerPerspective) lay).getDiagram(); - if (diag instanceof UMLDiagram - && ((UMLDiagram) diag).doesAccept(node)) { + if (((UMLDiagram) diag).doesAccept(node)) { figNode = (FigNode) ((UMLDiagram) diag).drop(node, null); } else { LOG.debug("TODO: DeploymentDiagramRenderer getFigNodeFor"); Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java?view=diff&pathrev=19501&r1=19500&r2=19501 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java 2011-05-24 03:04:28-0700 @@ -184,33 +184,19 @@ * @see org.argouml.uml.diagram.ui.UMLDiagram#getUmlActions() */ protected Object[] getUmlActions() { - if (Model.getFacade().getUmlVersion().startsWith("1")) { - final Object[] actions = { - getActionMNode(), - getActionMNodeInstance(), - getActionMComponent(), - getActionMComponentInstance(), - getActionMGeneralization(), - getActionMAbstraction(), - getActionMDependency(), - getAssociationActions(), - getActionMObject(), - getActionMLink(), - }; - return actions; - } else { - final Object[] actions = { - getActionMNode(), - getActionMComponent(), - getActionMGeneralization(), - getActionMAbstraction(), - getActionMDependency(), - getAssociationActions(), - getActionMObject(), - getActionMLink(), - }; - return actions; - } + final Object[] actions = { + getActionMNode(), + getActionMNodeInstance(), + getActionMComponent(), + getActionMComponentInstance(), + getActionMGeneralization(), + getActionMAbstraction(), + getActionMDependency(), + getAssociationActions(), + getActionMObject(), + getActionMLink(), + }; + return actions; } private Object[] getAssociationActions() { Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java?view=diff&pathrev=19501&r1=19500&r2=19501 ============================================================================== --- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java (original) +++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/SequenceDiagramRenderer.java 2011-05-24 03:04:28-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009-2010 Contributors - see below + * Copyright (c) 2009-2011 Contributors - see below * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -115,4 +115,17 @@ return figEdge; } + protected FigNode getFigNodeForAssociationEnd( + final ArgoDiagram diagram, + final Object associationEnd) { + final Object element; + if (Model.getFacade().getUmlVersion().startsWith("1")) { + element = + Model.getFacade().getClassifier(associationEnd); + } else { + element = + Model.getFacade().getLifeline(associationEnd); + } + return getNodePresentationFor(diagram.getLayer(), element); + } } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2746935 To unsubscribe from this discussion, e-mail: [[email protected]].
