svn commit: r17046 - trunk/src: argouml-app/src/org/argouml/uml/diagram/sequence/ui argouml-app/src/org/argouml/uml/diagram/state/ui argouml-app/src/org/argouml/uml/diagram/static_structure/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram
Michiel van der Wulp <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mvw
Date: 2009-04-05 10:36:02-0700
New Revision: 17046
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgePort.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java
trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java
trunk/src/argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram/TestFigClassifierRole.java
Log:
Issue 4075: remove the setOwner calls.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java 2009-04-05 10:36:02-0700
@@ -998,15 +998,6 @@
return lifeLineFig.getYCoordinate(linkPositions.indexOf(node));
}
- /*
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- */
- @Override
- public void setOwner(Object own) {
- super.setOwner(own);
- bindPort(own, headFig);
- }
-
/**
* Returns the index of a given node.
*
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java 2009-04-05 10:36:02-0700
@@ -115,17 +115,6 @@
}
/*
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- @Override
- public void setOwner(Object newOwner) {
- super.setOwner(newOwner);
- renderingChanged();
- }
-
- /*
* @see org.argouml.uml.diagram.state.ui.FigStateVertex#initNotationProviders(java.lang.Object)
*/
@Override
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java 2009-04-05 10:36:02-0700
@@ -111,15 +111,6 @@
}
/*
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- */
- @Override
- public void setOwner(Object node) {
- super.setOwner(node);
- renderingChanged();
- }
-
- /*
* @see java.lang.Object#clone()
*/
@Override
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java 2009-04-05 10:36:02-0700
@@ -134,17 +134,6 @@
}
/*
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- @Override
- public void setOwner(Object node) {
- super.setOwner(node);
- updateInclude();
- }
-
- /*
* @see java.lang.Object#clone()
*/
@Override
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java 2009-04-05 10:36:02-0700
@@ -219,14 +219,6 @@
setBounds(getBounds());
}
- @SuppressWarnings("deprecation")
- @Deprecated
- @Override
- public void setOwner(Object owner) {
- attributesFigCompartment.setOwner(owner);
- super.setOwner(owner);
- }
-
/**
* @param isVisible true if the attribute compartment is visible
*
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2009-04-05 10:36:02-0700
@@ -226,17 +226,6 @@
return figClone;
}
- /*
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- @Override
- public void setOwner(Object own) {
- super.setOwner(own);
- updateBody();
- }
-
private void updateBody() {
if (getOwner() != null) {
String body = (String) Model.getFacade().getBody(getOwner());
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=17046&r1=17045&r2=17046
==============================================================================
--- 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-04-05 10:36:02-0700
@@ -141,33 +141,6 @@
new PathItemPlacement(this, middleGroup, 50, 25));
ArgoFigUtil.markPosition(this, 50, 0, 90, 25, Color.yellow);
}
-
- /**
- * Set the owner.
- *
- * @param owner ignored
- * @see org.argouml.uml.diagram.ui.FigEdgeModelElement#setOwner(java.lang.Object)
- * @deprecated for 0.27.3 by tfmorris. Set the owner in the constructor.
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- @Override
- public void setOwner(Object owner) {
- super.setOwner(owner);
-
- Object[] ends =
- Model.getFacade().getConnections(owner).toArray();
-
- Object source = ends[0];
- Object dest = ends[1];
-
- srcGroup.setOwner(source);
- srcMult.setOwner(source);
-
- destGroup.setOwner(dest);
- destMult.setOwner(dest);
- }
-
@Override
public void renderingChanged() {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2009-04-05 10:36:02-0700
@@ -926,53 +926,6 @@
}
/**
- * This method should only be called once for any one Fig instance that
- * represents a model element (ie not for a FigEdgeNote). It is called
- * either by the constructor that takes a model element as an argument or
- * it is called by PGMLStackParser after it has created the Fig by use of
- * the empty constructor.
- * <p>
- * The assigned model element (owner) must not change during the lifetime of
- * the Fig.
- *
- * @param owner the model element that this Fig represents.
- * @throws IllegalArgumentException if the owner given is not a model
- * element
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- * @deprecated for 0.27.3 by tfmorris. Owner must be specified in the
- * constructor and can't be changed afterwards.
- */
- @Deprecated
- @Override
- public void setOwner(Object owner) {
- if (owner == null) {
- throw new IllegalArgumentException("An owner must be supplied");
- }
- if (getOwner() != null) {
- throw new IllegalStateException(
- "The owner cannot be changed once set");
- }
- if (!Model.getFacade().isAUMLElement(owner)) {
- throw new IllegalArgumentException(
- "The owner must be a model element - got a "
- + owner.getClass().getName());
- }
- super.setOwner(owner);
- nameFig.setOwner(owner); // for setting abstract
- if (edgePort != null) {
- edgePort.setOwner(getOwner());
- }
- stereotypeFig.setOwner(owner); // this fixes issue 5414
- initNotationProviders(owner);
- updateListeners(null, owner);
- // TODO: The following is redundant. It's done when setLayer is
- // called after initialization complete
-// renderingChanged();
- }
-
-
-
- /**
* Replace the NotationProvider(s). <p>
*
* This method shall not be used for the initial creation of
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgePort.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgePort.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgePort.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgePort.java 2009-04-05 10:36:02-0700
@@ -64,6 +64,7 @@
DiagramSettings settings) {
super(owner, bounds, settings);
initialize();
+ bigPort.setOwner(owner);
}
/*
@@ -73,16 +74,6 @@
public boolean hit(Rectangle r) {
return false;
}
-
- /*
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- */
- @Override
- @Deprecated
- public void setOwner(Object own) {
- bigPort.setOwner(own);
- super.setOwner(own);
- }
@Override
public Object getOwner() {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java 2009-04-05 10:36:02-0700
@@ -172,16 +172,6 @@
super.paint(g);
}
- /*
- * @see org.tigris.gef.presentation.Fig#setOwner(Object)
- */
- @SuppressWarnings("deprecation")
- @Override
- public void setOwner(Object own) {
- super.setOwner(own);
- fixup(own);
- }
-
/**
* Fix up bad figs.
* <p>
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2009-04-05 10:36:02-0700
@@ -1446,55 +1446,6 @@
}
/**
- * This method should only be called once for any one Fig instance that
- * represents a model element (ie not for a FigEdgeNote).
- * It is called either by the constructor that takes an model element as an
- * argument or it is called by PGMLStackParser after it has created the Fig
- * by use of the empty constructor.
- * The assigned model element (owner) must not change during the lifetime
- * of the Fig.
- * <p>
- * TODO: It is planned to refactor so that there is only one Fig
- * constructor. When this is achieved this method can refactored out.
- *
- * @param owner the model element that this Fig represents.
- * @throws IllegalArgumentException if the owner given is not a model
- * element
- * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
- * @deprecated for 0.27.3 by tfmorris. Owner must be provided in
- * constructor and may not be changed afterwards.
- */
- public void setOwner(Object owner) {
- assert false; // This should never be called any more...
- if (owner == null) {
- throw new IllegalArgumentException("An owner must be supplied");
- }
- if (getOwner() != null) {
- throw new IllegalStateException(
- "The owner cannot be changed once set");
- }
- if (!Model.getFacade().isAUMLElement(owner)) {
- throw new IllegalArgumentException(
- "The owner must be a model element - got a "
- + owner.getClass().getName());
- }
- super.setOwner(owner);
- nameFig.setOwner(owner); // for setting abstract
- if (getStereotypeFig() != null) {
- getStereotypeFig().setOwner(owner);
- }
- initNotationProviders(owner);
- readyToEdit = true;
- renderingChanged();
-// updateBounds(); // included in the previous line.
- /* This next line presumes that the 1st fig with this owner
- * is the previous port - and consequently nullifies the owner
- * of this 1st fig. */
- bindPort(owner, bigPort);
- updateListeners(null, owner);
- }
-
- /**
* Replace the NotationProvider(s). <p>
*
* This method shall not be used for the initial creation of
Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java (original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigClassifierRole.java 2009-04-05 10:36:02-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2007-2008 The Regents of the University of California. All
+// Copyright (c) 2007-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
// agreement is hereby granted, provided that the above copyright notice
@@ -76,30 +76,8 @@
* The minimum height of the classifier role.
*/
private int minimumHeight;
-
- /**
- * Constructor
- * @deprecated for 0.28.alpha3 by penyaskito. Use
- * {@link #FigClassifierRole(Object, Rectangle, DiagramSettings)}.
- */
- public FigClassifierRole() {
- super();
- initialize();
- }
/**
- * Constructor.
- * @param node The model element
- * @deprecated for 0.28.alpha3 by penyaskito. Use
- * {@link #FigClassifierRole(Object, Rectangle, DiagramSettings)}.
-
- */
- public FigClassifierRole(Object node) {
- this();
- setOwner(node);
- }
-
- /**
* Construct a use case figure with the given owner, bounds, and rendering
* settings. This constructor is used by the PGML parser.
*
Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java (original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java 2009-04-05 10:36:02-0700
@@ -78,20 +78,6 @@
private SDNotationSettings notationSettings;
/**
- * Constructs a new FigMessage and sets the owner of the FigMessage.
- *
- * @param owner is the owner.
- * @deprecated for 0.28.alpha3 by penyaskito. Use
- * {@link #FigMessage(Object, DiagramSettings)}
- */
- public FigMessage(Object owner) {
- super();
- textGroup = new FigTextGroup();
- initialize();
- setOwner(owner);
- }
-
- /**
* Construct a fig owned by the given UML element with the provided render
* settings.
* @param edge owning UML element
@@ -146,18 +132,6 @@
protected SDNotationSettings getNotationSettings() {
return notationSettings;
}
-
- /**
- * @deprecated for 0.28.alpha3 by penyaskito. Owner must be specified in the
- * constructor and can't be changed afterwards.
- */
- @Override
- @Deprecated
- public void setOwner(Object owner) {
- super.setOwner(owner);
- action = Model.getFacade().getAction(owner);
- updateArrow();
- }
boolean isCallAction() {
return Model.getFacade().isACallAction(getAction());
@@ -194,15 +168,6 @@
getDestArrowHead().setLineColor(getLineColor());
getDestArrowHead().setFillColor(getLineColor());
}
-
- /**
- * Constructor here for saving and loading purposes.
- * @deprecated for 0.28.alpha3 by penyaskito. Use
- * {@link #FigMessage(Object, DiagramSettings)}
- */
- public FigMessage() {
- this(null);
- }
/**
* Gets the action attached to the message.
Modified: trunk/src/argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram/TestFigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram/TestFigClassifierRole.java?view=diff&pathrev=17046&r1=17045&r2=17046
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram/TestFigClassifierRole.java (original)
+++ trunk/src/argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram/TestFigClassifierRole.java 2009-04-05 10:36:02-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2007 The Regents of the University of California. All
+// Copyright (c) 2007-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
// agreement is hereby granted, provided that the above copyright notice
@@ -24,9 +24,9 @@
package org.argouml.sequence2.diagram;
+import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
import junit.framework.TestCase;
@@ -34,12 +34,10 @@
import org.argouml.model.Model;
import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.profile.init.InitProfileSubsystem;
-import org.argouml.sequence2.diagram.FigClassifierRole;
-import org.argouml.sequence2.diagram.UMLSequenceDiagram;
+import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.base.LayerPerspective;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.graph.GraphNodeRenderer;
-import org.tigris.gef.presentation.Fig;
/**
* Tests the FigClassifierRole class.
@@ -82,8 +80,10 @@
List<Object> bases = new ArrayList<Object>();
bases.add(clazz);
Model.getCollaborationsHelper().setBases(cr, bases);
-
- FigClassifierRole fig = new FigClassifierRole(cr);
+
+ Rectangle bounds = new Rectangle(10, 10, 20, 20);
+ DiagramSettings settings = new DiagramSettings();
+ FigClassifierRole fig = new FigClassifierRole(cr, bounds, settings);
int count = 0;
count = diagram.getLayer().getContents().size();
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1552965
To unsubscribe from this discussion, e-mail: [[email protected]].