svn commit: r17107 - trunk/src/argouml-app/src/org/argouml/uml/diagram: activity/ui deployment/ui static_structure/ui ui
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2009-04-13 11:28:43-0700
New Revision: 17107
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.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/ArgoFig.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.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/FigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java
Log:
Remove remaining uses of ArgoFig.setOwner(). Reintroduce method implementations in top level Argo Fig classes that throws UnsupportedOperationException to catch any future uses.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java?view=diff&pathrev=17107&r1=17106&r2=17107
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java 2009-04-13 11:28:43-0700
@@ -299,13 +299,6 @@
}
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateStereotypeText()
- */
- @Override
- protected void updateStereotypeText() {
- getStereotypeFig().setOwner(getOwner());
- }
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java?view=diff&pathrev=17107&r1=17106&r2=17107
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java 2009-04-13 11:28:43-0700
@@ -40,12 +40,10 @@
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ui.ArgoFig;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Geometry;
import org.tigris.gef.base.Selection;
-import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigCube;
import org.tigris.gef.presentation.FigRect;
@@ -180,11 +178,6 @@
}
@Override
- protected void updateStereotypeText() {
- getStereotypeFig().setOwner(getOwner());
- }
-
- @Override
public void mouseClicked(MouseEvent me) {
super.mouseClicked(me);
setLineColor(LINE_COLOR);
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=17107&r1=17106&r2=17107
==============================================================================
--- 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-13 11:28:43-0700
@@ -56,7 +56,6 @@
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Geometry;
import org.tigris.gef.base.Selection;
-import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigPoly;
import org.tigris.gef.presentation.FigRect;
@@ -678,8 +677,6 @@
calcBounds();
}
} else {
- getStereotypeFig().setOwner(getOwner());
-
if (!getStereotypeFig().isVisible()) {
getStereotypeFig().setVisible(true);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java?view=diff&pathrev=17107&r1=17106&r2=17107
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java 2009-04-13 11:28:43-0700
@@ -168,7 +168,7 @@
/**
* Setting the owner of the Fig must be done in the constructor and
- * not changed aftewards for all ArgoUML figs.
+ * not changed afterwards for all ArgoUML figs.
*
* @param owner owning UML element
* @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java?view=diff&pathrev=17107&r1=17106&r2=17107
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigGroup.java 2009-04-13 11:28:43-0700
@@ -137,4 +137,20 @@
renderingChanged();
}
+ /**
+ * Setting the owner of the Fig must be done in the constructor and not
+ * changed afterwards for all ArgoUML figs.
+ *
+ * @param owner owning UML element
+ * @throws UnsupportedOperationException
+ * @deprecated for 0.27.3 by tfmorris. Set owner in constructor. This method
+ * is implemented in GEF, so we'll leave this implementation
+ * here to block any attempts to use it within ArgoUML.
+ */
+ @SuppressWarnings("deprecation")
+ @Deprecated
+ public void setOwner(Object owner) {
+ throw new UnsupportedOperationException(
+ "Owner must be set in constructor and left unchanged");
+ }
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java?view=diff&pathrev=17107&r1=17106&r2=17107
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java 2009-04-13 11:28:43-0700
@@ -36,7 +36,6 @@
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
-import org.argouml.application.events.ArgoDiagramAppearanceEvent;
import org.argouml.kernel.Project;
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
@@ -233,4 +232,21 @@
renderingChanged();
}
+
+ /**
+ * Setting the owner of the Fig must be done in the constructor and not
+ * changed afterwards for all ArgoUML figs.
+ *
+ * @param owner owning UML element
+ * @throws UnsupportedOperationException
+ * @deprecated for 0.27.3 by tfmorris. Set owner in constructor. This method
+ * is implemented in GEF, so we'll leave this implementation
+ * here to block any attempts to use it within ArgoUML.
+ */
+ @SuppressWarnings("deprecation")
+ @Deprecated
+ public void setOwner(Object owner) {
+ throw new UnsupportedOperationException(
+ "Owner must be set in constructor and left unchanged");
+ }
}
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=17107&r1=17106&r2=17107
==============================================================================
--- 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-13 11:28:43-0700
@@ -659,28 +659,6 @@
Model.getPump().addModelEventListener(this, owner,
new String[] {"isNavigable", "aggregation", "participant"});
}
-
- /**
- * @deprecated by mvw in 0.27.3. Use non-deprecated constructors instead.
- */
- @SuppressWarnings("deprecation")
- @Deprecated
- @Override
- public void setOwner(Object owner) {
- if (owner != null) {
- if (!Model.getFacade().isAAssociationEnd(owner)) {
- throw new IllegalArgumentException(
- "An AssociationEnd was expected");
- }
- super.setOwner(owner);
- ordering.setOwner(owner);
- role.setOwner(owner);
- role.setText();
- determineArrowHead();
- Model.getPump().addModelEventListener(this, owner,
- new String[] {"isNavigable", "aggregation", "participant"});
- }
- }
/*
* @see org.tigris.gef.presentation.Fig#removeFromDiagram()
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=17107&r1=17106&r2=17107
==============================================================================
--- 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-13 11:28:43-0700
@@ -36,7 +36,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.VetoableChangeListener;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -218,12 +217,10 @@
"The owner must be a model element - got a "
+ element.getClass().getName());
}
- super.setOwner(element);
- nameFig.setOwner(element); // for setting abstract
+ super.setOwner(element);
if (edgePort != null) {
edgePort.setOwner(getOwner());
}
- stereotypeFig.setOwner(element); // this fixes issue 5414
NotationName nn = Notation.findNotation(
settings.getNotationSettings().getNotationLanguage());
notationProviderName =
@@ -1605,4 +1602,23 @@
f.setLineColor(getLineColor());
f.setLineWidth(getLineWidth());
}
+
+
+ /**
+ * Setting the owner of the Fig must be done in the constructor and not
+ * changed afterwards for all ArgoUML figs.
+ *
+ * @param owner owning UML element
+ * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
+ * @throws UnsupportedOperationException
+ * @deprecated for 0.27.3 by tfmorris. Set owner in constructor. This method
+ * is implemented in GEF, so we'll leave this implementation
+ * here to block any attempts to use it within ArgoUML.
+ */
+ @SuppressWarnings("deprecation")
+ @Deprecated
+ public void setOwner(Object owner) {
+ throw new UnsupportedOperationException(
+ "Owner must be set in constructor and left unchanged");
+ }
}
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=17107&r1=17106&r2=17107
==============================================================================
--- 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-13 11:28:43-0700
@@ -40,7 +40,6 @@
import java.beans.VetoableChangeListener;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -2477,6 +2476,24 @@
protected boolean isReverseEdge(int index) {
return false;
}
+ }
+
+ /**
+ * Setting the owner of the Fig must be done in the constructor and not
+ * changed afterwards for all ArgoUML figs.
+ *
+ * @param owner owning UML element
+ * @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
+ * @throws UnsupportedOperationException
+ * @deprecated for 0.27.3 by tfmorris. Set owner in constructor. This method
+ * is implemented in GEF, so we'll leave this implementation
+ * here to block any attempts to use it within ArgoUML.
+ */
+ @SuppressWarnings("deprecation")
+ @Deprecated
+ public void setOwner(Object owner) {
+ throw new UnsupportedOperationException(
+ "Owner must be set in constructor and left unchanged");
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java?view=diff&pathrev=17107&r1=17106&r2=17107
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java 2009-04-13 11:28:43-0700
@@ -127,21 +127,7 @@
Model.getPump().addModelEventListener(this, owner, "stereotype");
populate();
}
-
- /*
- * Beware: The owner here is NOT the stereotype(s),
- * but the extended element!
- */
- @SuppressWarnings("deprecation")
- @Override
- @Deprecated
- public void setOwner(Object own) {
- if (own != null) {
- super.setOwner(own);
- Model.getPump().addModelEventListener(this, own, "stereotype");
- populate();
- }
- }
+
/*
* @see org.tigris.gef.presentation.Fig#removeFromDiagram()
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1696184
To unsubscribe from this discussion, e-mail: [[email protected]].