Author: mvw Date: 2008-11-08 13:50:52-0800 New Revision: 15995 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log: Made the return parameter of FigNodeModelElement.getStereotypeFig() more specific; it now returns a FigStereotypesGroup in stead of a Fig. Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java?view=diff&rev=15995&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&r1=15994&r2=15995 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java 2008-11-08 13:50:52-0800 @@ -32,7 +32,6 @@ import org.argouml.model.Model; import org.argouml.ui.targetmanager.TargetManager; import org.argouml.uml.diagram.ArgoDiagram; -import org.argouml.uml.diagram.ui.FigStereotypesGroup; import org.tigris.gef.base.Editor; import org.tigris.gef.base.Globals; import org.tigris.gef.base.Selection; @@ -82,9 +81,7 @@ */ public FigDataType() { - FigStereotypesGroup fsc = - (FigStereotypesGroup) getStereotypeFig(); - fsc.setKeyword("datatype"); + getStereotypeFig().setKeyword("datatype"); // Put all the bits together, suppressing bounds calculations until // we're all done for efficiency. @@ -126,7 +123,7 @@ */ public FigDataType(GraphModel gm, Object node, String keyword) { this(gm, node); - ((FigStereotypesGroup) getStereotypeFig()).setKeyword(keyword); + getStereotypeFig().setKeyword(keyword); } Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java?view=diff&rev=15995&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java&r1=15994&r2=15995 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java 2008-11-08 13:50:52-0800 @@ -32,7 +32,6 @@ import org.argouml.model.Model; import org.argouml.ui.targetmanager.TargetManager; import org.argouml.uml.diagram.ArgoDiagram; -import org.argouml.uml.diagram.ui.FigStereotypesGroup; import org.tigris.gef.base.Editor; import org.tigris.gef.base.Globals; import org.tigris.gef.base.Selection; @@ -83,9 +82,7 @@ */ public FigInterface() { - FigStereotypesGroup fsc = - (FigStereotypesGroup) getStereotypeFig(); - fsc.setKeyword("interface"); + getStereotypeFig().setKeyword("interface"); // Put all the bits together, suppressing bounds calculations until // we're all done for efficiency. Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java?view=diff&rev=15995&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&r1=15994&r2=15995 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java 2008-11-08 13:50:52-0800 @@ -52,9 +52,7 @@ */ public FigSignal() { super(); - FigStereotypesGroup fsc = - (FigStereotypesGroup) getStereotypeFig(); - fsc.setKeyword("signal"); + getStereotypeFig().setKeyword("signal"); addFig(getBigPort()); addFig(getStereotypeFig()); Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java?view=diff&rev=15995&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java&r1=15994&r2=15995 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java 2008-11-08 13:50:52-0800 @@ -45,7 +45,6 @@ import org.argouml.uml.diagram.ui.ActionEdgesDisplay; import org.argouml.uml.diagram.ui.CompartmentFigText; import org.argouml.uml.diagram.ui.FigCompartmentBox; -import org.argouml.uml.diagram.ui.FigStereotypesGroup; import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewTagDefinition; import org.tigris.gef.base.Selection; import org.tigris.gef.graph.GraphModel; @@ -67,9 +66,8 @@ * Create a new Fig for a stereotype declaration. */ public FigStereotypeDeclaration() { - FigStereotypesGroup fsc = - (FigStereotypesGroup) getStereotypeFig(); - fsc.setKeyword("stereotype"); + + getStereotypeFig().setKeyword("stereotype"); // Put all the bits together, suppressing bounds calculations until // we're all done for efficiency. 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&rev=15995&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=15994&r2=15995 ============================================================================== --- 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 2008-11-08 13:50:52-0800 @@ -206,7 +206,7 @@ * Use getStereotype() and setStereotype() to change stereotype * text. */ - private Fig stereotypeFig; + private FigStereotypesGroup stereotypeFig; /** * The <code>FigProfileIcon</code> being currently displayed @@ -371,6 +371,7 @@ * Clone this figure. After the base clone method has been called determine * which child figs of the clone represent the name, stereotype and port. * <p> + * TODO: enclosedFigs, encloser and eventSenders may also need to be cloned. * * @see java.lang.Object#clone() * @return the cloned figure @@ -387,14 +388,22 @@ } if (thisFig == nameFig) { clone.nameFig = (FigSingleLineText) thisFig; + /* TODO: MVW: I think this has to be: + * clone.nameFig = (FigSingleLineText) cloneFig; + * but have not the means to investigate, + * since this code is not yet used. + * Enable the menu-items for Copy/Paste to test... + * BTW: In some other FigNodeModelElement + * classes I see the same mistake. */ } if (thisFig == stereotypeFig) { - clone.stereotypeFig = (Fig) thisFig; + clone.stereotypeFig = (FigStereotypesGroup) thisFig; + /* Idem here: + * clone.stereotypeFig = (FigStereotypesGroup) cloneFig; */ } } return clone; } -// TODO: _enclosedFigs, _encloser and _eventSenders may also need to be cloned /** * Default Reply text to be shown while placing node in diagram. @@ -1689,19 +1698,15 @@ this.removeFig(icon); } floatingStereotypes.clear(); - - - int practicalView = getPracticalView(); + + + int practicalView = getPracticalView(); Object modelElement = getOwner(); Collection stereos = Model.getFacade().getStereotypes(modelElement); - Fig stereoFig = getStereotypeFig(); - if (stereoFig instanceof FigStereotypesGroup) { - boolean hiding = - practicalView == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON; - ((FigStereotypesGroup) stereoFig) - .setHidingStereotypesWithIcon(hiding); - } + boolean hiding = + practicalView == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON; + getStereotypeFig().setHidingStereotypesWithIcon(hiding); if (practicalView == DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON) { @@ -1865,13 +1870,10 @@ /** * Get the Fig containing the stereotype(s). - * <p> - * TODO: Should return FigStereotypesGroup or at the very least - * a FigGroup * - * @return the stereotype Fig + * @return the stereotype FigGroup */ - protected Fig getStereotypeFig() { + protected FigStereotypesGroup getStereotypeFig() { return stereotypeFig; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
