Author: tfmorris Date: 2008-05-08 11:37:41-0700 New Revision: 14670 Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java trunk/src/argouml-core-model/src/org/argouml/model/Facade.java trunk/src/argouml-core-model/src/org/argouml/model/Model.java trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java
Log: Deprecation review. Remove old methods. Update all comments. Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java 2008-05-08 11:37:41-0700 @@ -79,6 +79,7 @@ return impl.getSupertypes(generalizableElement); } + @Deprecated public Collection getAssociateEnds(Object classifier) { return impl.getAssociateEnds(classifier); } @@ -123,7 +124,7 @@ return impl.getSpecification(object); } - + @Deprecated public Collection getSpecifications(Object classifier) { return impl.getSpecifications(classifier); } @@ -208,6 +209,7 @@ return impl.getAssociationEnd(type, assoc); } + @Deprecated public Collection getAllContents(Object clazz) { return impl.getAllContents(clazz); } @@ -414,6 +416,7 @@ impl.addSupplierDependency(supplier, dependency); } + @Deprecated public void addTaggedValue(Object handle, Object taggedValue) { impl.addTaggedValue(handle, taggedValue); } @@ -503,6 +506,7 @@ impl.setOwner(handle, owner); } + @Deprecated public void setOwnerScope(Object handle, Object os) { impl.setOwnerScope(handle, os); } @@ -543,10 +547,12 @@ impl.setSpecifications(handle, specifications); } + @Deprecated public void setTaggedValue(Object handle, String tag, String value) { impl.setTaggedValue(handle, tag, value); } + @Deprecated public void setTaggedValues(Object handle, Collection taggedValues) { impl.setTaggedValues(handle, taggedValues); } @@ -575,10 +581,12 @@ impl.setLeaf(handle, flag); } + @Deprecated public void setChangeability(Object handle, Object ck) { impl.setChangeability(handle, ck); } + @Deprecated public void setChangeable(Object handle, boolean flag) { impl.setChangeable(handle, flag); } @@ -631,6 +639,7 @@ impl.setSpecification(handle, specification); } + @Deprecated public void setTargetScope(Object handle, Object scopeKind) { impl.setTargetScope(handle, scopeKind); } Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java 2008-05-08 11:37:41-0700 @@ -80,9 +80,10 @@ return impl.getAllPossibleStereotypes(models, modelElement); } - /** + /* * @deprecated Use [EMAIL PROTECTED] #isValidStereotype(Object,Object)} instead */ + @Deprecated public boolean isValidStereoType(Object theModelElement, Object theStereotype) { return isValidStereotype(theModelElement, theStereotype); @@ -125,11 +126,6 @@ impl.setIcon(handle, icon); } - @SuppressWarnings("deprecation") - public void setTag(Object handle, Object tag) { - impl.setTag(handle, tag); - } - public void setTagType(Object handle, String tagType) { impl.setType(handle, tagType); } @@ -159,9 +155,10 @@ impl.setTaggedValue(handle, taggedValues); } - /** + /* * @deprecated Use [EMAIL PROTECTED] #hasStereotype(Object,String)} instead */ + @Deprecated public boolean hasStereoType(Object handle, String name) { return hasStereotype(handle, name); } Modified: trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/CommandStack.java 2008-05-08 11:37:41-0700 @@ -29,7 +29,10 @@ * as a stack of commands. There are methods to undo a command (moving the stack * pointer down to the previous executed command) or to redo a command (moving * the stack pointer up, to the next command in the stack) + * + * @deprecated for 0.25.5 by tfmorris. Use ArgoUMLs command stack. */ [EMAIL PROTECTED] public interface CommandStack { /** Modified: trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java 2008-05-08 11:37:41-0700 @@ -606,13 +606,13 @@ /** * Builds an operation for a classifier. - * + * * @param classifier is the given classifier * @param model is the model to which the class belongs * @param returnType the type of the return parameter * @return the operation - * @deprecated for 0.25.2 by tfmorris - * use [EMAIL PROTECTED] #buildOperation(Object, Object)} + * @deprecated for 0.25.2 by tfmorris. Use + * [EMAIL PROTECTED] #buildOperation(Object, Object)}. */ @Deprecated Object buildOperation(Object classifier, Object model, Object returnType); @@ -628,14 +628,14 @@ /** * Builds an operation with a given name for classifier. - * + * * @param cls is the classifier that shall own the operation * @param model is the model that contains the class * @param returnType the type of the return parameter * @param name the given name for the operation * @return the operation - * @deprecated for 0.25.2 by tfmorris - use - * [EMAIL PROTECTED] #buildOperation2(Object, Object, String)} + * @deprecated for 0.25.2 by tfmorris. Use + * [EMAIL PROTECTED] #buildOperation2(Object, Object, String)}. */ @Deprecated Object buildOperation(Object cls, Object model, Object returnType, @@ -670,8 +670,8 @@ * @param type * the type of the parameter * @return the parameter - * @deprecated for 0.25.2 by tfmorris - use - * [EMAIL PROTECTED] #buildParameter(Object, Object)} + * @deprecated for 0.25.2 by tfmorris. Use + * [EMAIL PROTECTED] #buildParameter(Object, Object)}. */ @Deprecated Object buildParameter(Object o, Object model, Object type); Modified: trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java 2008-05-08 11:37:41-0700 @@ -74,7 +74,7 @@ * @return a collection of the associationends * @see Facade#getAssociationEnds(Object) * @deprecated for 0.25.4 by tfmorris. Use - * [EMAIL PROTECTED] Facade#getAssociationEnds(Object)}. + * [EMAIL PROTECTED] Facade#getAssociationEnds(Object)}. */ @Deprecated Collection getAssociateEnds(Object classifier); @@ -185,7 +185,7 @@ * the class you want to have the interfaces for * @return a collection of the Interfaces * @deprecated for 0.25.2 by tfmorris. Use - * [EMAIL PROTECTED] Facade#getSpecifications(Object)} + * [EMAIL PROTECTED] Facade#getSpecifications(Object)}. */ @Deprecated Collection getSpecifications(Object classifier); @@ -364,14 +364,13 @@ Object getAssociationEnd(Object type, Object assoc); /** - * Returns the contents (owned elements) of this Namespace and - * all its parents as specified in section 2.5.3.8 of the UML 1.3 - * spec.<p> - * + * Returns the contents (owned elements) of this Namespace and all its + * parents as specified in section 2.5.3.8 of the UML 1.3 spec. + * * @param namespace is the classifier * @return Collection - * @deprecated for 0.25.1 by tfmorris - - * use [EMAIL PROTECTED] ModelManagementHelper#getAllContents(Object)} + * @deprecated for 0.25.1 by tfmorris. Use + * [EMAIL PROTECTED] ModelManagementHelper#getAllContents(Object)}. */ @Deprecated Collection getAllContents(Object namespace); @@ -812,11 +811,11 @@ /** * Add a TaggedValue to a ModelElement. - * + * * @param handle ModelElement * @param taggedValue TaggedValue - * @deprecated for 0.25.1 by tfmorris - use - * [EMAIL PROTECTED] ExtensionMechanismsHelper#addTaggedValue(Object, Object)} + * @deprecated for 0.25.1 by tfmorris. Use + * [EMAIL PROTECTED] ExtensionMechanismsHelper#addTaggedValue(Object, Object)}. */ @Deprecated void addTaggedValue(Object handle, Object taggedValue); @@ -940,7 +939,7 @@ * @param ck * a [EMAIL PROTECTED] ChangeableKind} of Changeable, Frozen or AddOnly * returned from [EMAIL PROTECTED] Model#getChangeableKind()}. - * @deprecated for 0.25.4 by tfmorris - use + * @deprecated for 0.25.4 by tfmorris. Use * [EMAIL PROTECTED] #setReadOnly(Object, boolean)}. NOTE: The UML 1.x * enum of AddOnly has no equivalent in UML 2.x. */ @@ -956,7 +955,7 @@ * @param handle * is the feature * @param changeable true for Changeable and false for Frozen. - * @deprecated for 0.25.4 by tfmorris - use + * @deprecated for 0.25.4 by tfmorris. Use * [EMAIL PROTECTED] #setReadOnly(Object, boolean)} with a negated value. */ @Deprecated @@ -1342,13 +1341,13 @@ /** * Set a tagged value of a ModelElement. - * + * * @param handle is the model element * @param tag is the tag name (a string) * @param value is the value - * @deprecated by tfmorris for 0.23.3 - - * use [EMAIL PROTECTED] ExtensionMechanismsHelper#setType(Object, Object)} - * and [EMAIL PROTECTED] ExtensionMechanismsHelper#setValueOfTag(Object, String)} + * @deprecated by tfmorris for 0.23.3. Use + * [EMAIL PROTECTED] ExtensionMechanismsHelper#setType(Object, Object)} and + * [EMAIL PROTECTED] ExtensionMechanismsHelper#setValueOfTag(Object, String)}. */ @Deprecated void setTaggedValue(Object handle, String tag, String value); @@ -1358,8 +1357,8 @@ * * @param handle ModelElement * @param taggedValues Collection of TaggedValues - * @deprecated for 0.25.1 by tfmorris - use - * [EMAIL PROTECTED] ExtensionMechanismsHelper#setTaggedValue(Object, Collection)} + * @deprecated for 0.25.1 by tfmorris. Use + * [EMAIL PROTECTED] ExtensionMechanismsHelper#setTaggedValue(Object, Collection)}. */ @Deprecated void setTaggedValues(Object handle, Collection taggedValues); @@ -1367,13 +1366,11 @@ /** * Set the targetScope of an AssociationEnd or StructuralFeature. * - * @param handle - * the model element - * @param targetScope - * a [EMAIL PROTECTED] ScopeKind} of Instance or Classifier returned from - * [EMAIL PROTECTED] Model#getScopeKind()}. - * @deprecated for 0.25.4 by tfmorris. Target Scope has been removed from - * the UML 2.x spec so this should not be used. + * @param handle the model element + * @param targetScope a [EMAIL PROTECTED] ScopeKind} of Instance or Classifier returned + * from [EMAIL PROTECTED] Model#getScopeKind()}. + * @deprecated for 0.25.4 by tfmorris. Target Scope has been removed from + * the UML 2.x spec so this should not be used. */ @Deprecated void setTargetScope(Object handle, Object targetScope); Modified: trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java 2008-05-08 11:37:41-0700 @@ -31,13 +31,12 @@ * Created from the old DataTypesHelper. */ public interface DataTypesHelper { + /** - * @param from - * source - * @param to - * destination - * @deprecated for 0.25.2 by tfmorris - use - * [EMAIL PROTECTED] ExtensionMechanismsFactory#copyTaggedValues(Object, Object)} + * @param from source + * @param to destination + * @deprecated for 0.25.2 by tfmorris. Use + * [EMAIL PROTECTED] ExtensionMechanismsFactory#copyTaggedValues(Object, Object)}. */ @Deprecated void copyTaggedValues(Object from, Object to); Modified: trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/DefaultCommandStack.java 2008-05-08 11:37:41-0700 @@ -29,7 +29,7 @@ * don't support this capability. * * @author Tom Morris <[EMAIL PROTECTED]> - * + * @deprecated for 0.25.5 by tfmorris. To be removed before 0.26. */ public class DefaultCommandStack implements CommandStack { Modified: trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsFactory.java 2008-05-08 11:37:41-0700 @@ -45,7 +45,11 @@ Object createTaggedValue(); /** - * Builds a stereotype for some kind of modelelement. + * Build a stereotype which has the given name and a base class which + * matches the type of the given model element. + * <p> + * <em>NOTE:</em> Most users will want to find and use an existing + * stereotype, often from a profile, so uses of this method should be rare. * * @param theModelElementObject a Model Element that the stereotype * will be applied to. The stereotype will Modified: trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java 2008-05-08 11:37:41-0700 @@ -28,9 +28,7 @@ /** - * The interface for the helper of the ExtensionMechanisms.<p> - * - * Created from the old ExtensionMechanismsHelper. + * The interface for the helper of the ExtensionMechanisms. */ public interface ExtensionMechanismsHelper { /** @@ -193,15 +191,6 @@ */ void setIcon(Object handle, Object icon); - /** - * Set the Tag of a TaggedValue. - * - * @param handle TaggedValue - * @param tag String - * @deprecated by tfmorris for 0.23.3 - use [EMAIL PROTECTED] #setType(Object, Object)} - */ - @Deprecated - void setTag(Object handle, Object tag); /** * Set the tagType of a TaggedDefinition. This controls the range of legal @@ -266,7 +255,7 @@ void removeTaggedValue(Object handle, Object taggedValue); /** - * Se the list of tagged values for a model element. + * Set the list of tagged values for a model element. * * @param handle The model element to set for. * @param taggedValues A Collection of tagged values. @@ -279,18 +268,17 @@ * @param handle the given object * @param name the given name * @return true if there is such a stereotype - * @deprecated for 0.25.4 by tfmorris. Use [EMAIL PROTECTED] #hasStereotype(Object,String)} instead + * @deprecated for 0.25.4 by tfmorris. Use + * [EMAIL PROTECTED] #hasStereotype(Object,String)} instead */ boolean hasStereoType(Object handle, String name); /** - * Returns <code>true</code> if the given ModelElement has a Stereotype with the - * given name. + * Returns <code>true</code> if the given ModelElement has a Stereotype + * with the given name. * - * @param element - * the given element - * @param name - * the given name + * @param element the given element + * @param name the given name * @return true if there is such a stereotype */ boolean hasStereotype(Object element, String name); Modified: trunk/src/argouml-core-model/src/org/argouml/model/Facade.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Facade.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/Facade.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/Facade.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java 2008-05-08 11:37:41-0700 @@ -852,6 +852,7 @@ * [EMAIL PROTECTED] #isAPackageImport(Object)}. * */ + @Deprecated boolean isAPermission(Object handle); /** @@ -1617,7 +1618,7 @@ * * @param handle the StructuralFeature or AssociationEnd * @return the Changeability - * @deprecated for 0.25.4 by tfmorris - use [EMAIL PROTECTED] #isReadOnly(Object)} + * @deprecated for 0.25.4 by tfmorris. Use [EMAIL PROTECTED] #isReadOnly(Object)}. */ @Deprecated Object getChangeability(Object handle); @@ -2058,6 +2059,7 @@ * or ... (do we need another method which implements the old, * as-implemented semantics) */ + @Deprecated Object getModel(Object handle); /** @@ -2470,7 +2472,7 @@ * * @param handle the association end * @return Object the opposite end. - * @deprecated for 0.25.2 by tfmorris - use [EMAIL PROTECTED] #getNextEnd(Object)} + * @deprecated for 0.25.2 by tfmorris. Use [EMAIL PROTECTED] #getNextEnd(Object)}. */ @Deprecated Object getOppositeEnd(Object handle); Modified: trunk/src/argouml-core-model/src/org/argouml/model/Model.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Model.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/Model.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/Model.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/Model.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/Model.java 2008-05-08 11:37:41-0700 @@ -355,10 +355,10 @@ // kinds in the UML meta-model. /** * Getter for the ChangeableKind object. - * + * * @return The object implementing the interface. - * @deprecated for 0.25.4 by tfmorris. This enumeration has been - * removed from UML 2. Use the getter for the isReadOnly attribute. + * @deprecated for 0.25.4 by tfmorris. This enumeration has been removed + * from UML 2. Use the getter for the isReadOnly attribute. */ @Deprecated public static ChangeableKind getChangeableKind() { @@ -385,10 +385,10 @@ /** * Getter for the ScopeKind object. - * + * * @return The object implementing the interface. - * @deprecated for 0.25.4 by tfmorris. This has been removed from - * UML 2. Use the getter for the isStatic attribute instead. + * @deprecated for 0.25.4 by tfmorris. This has been removed from UML 2. Use + * [EMAIL PROTECTED] Facade#isStatic(Object)} instead. */ @Deprecated public static ScopeKind getScopeKind() { @@ -519,13 +519,16 @@ } /** - * Allows an external system to register itself to recieve mementos - * created by the model implementation. + * Allows an external system to register itself to receive mementos created + * by the model implementation. + * * @see ModelMemento - * + * * @param observer the interested party - * @deprecated use setModelCommandCreationObserver + * @deprecated for 0.25.4 by bobtarling. Use + * [EMAIL PROTECTED] #setModelCommandCreationObserver}. */ + @Deprecated public static void setMementoCreationObserver( MementoCreationObserver observer) { mementoCreationObserver = observer; @@ -545,9 +548,12 @@ /** * Gets the external class responsible for handling mementos. + * * @return the MementoCreationObserver - * @deprecated use getModelCommandCreationObserver + * @deprecated for 0.25.4 by bobtarling. Use + * [EMAIL PROTECTED] #getModelCommandCreationObserver}. */ + @Deprecated public static MementoCreationObserver getMementoCreationObserver() { return mementoCreationObserver; } @@ -563,10 +569,12 @@ /** * Notify any observer that a command has been created. - * + * * @param memento The newly created memento. - * @deprecated use notifyModelCommandCreationObserver + * @deprecated for 0.25.4 by bobtarling. Use + * [EMAIL PROTECTED] #notifyModelCommandCreationObserver}. */ + @Deprecated public static void notifyMementoCreationObserver( ModelMemento memento) { MementoCreationObserver mco = getMementoCreationObserver(); @@ -579,7 +587,7 @@ * Notify any observer that a command has been created and execute * that it. * @param command The newly created command. - * @return the reulting object from the command + * @return the resulting object from the command */ public static Object execute( ModelCommand command) { @@ -604,11 +612,11 @@ * Get the command stack. * * @return the command stack - * @deprecated - do not use. This will be replaced by a command stack - * managed by ArgoUML, not the Model subsystem. + * @deprecated for 0.25.4 by tfmorris. Use the command stack from ArgoUML + * instead of the Model subsystem. */ @Deprecated - public static CommandStack getCommandStack() { + private static CommandStack getCommandStack() { return impl.getCommandStack(); } } Modified: trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/ModelImplementation.java 2008-05-08 11:37:41-0700 @@ -210,7 +210,7 @@ * * @return The object implementing the interface. * @deprecated for 0.25.4 by tfmorris. Use - * [EMAIL PROTECTED] Facade#isReadOnly(Object)}. + * [EMAIL PROTECTED] Facade#isReadOnly(Object)}. */ @Deprecated ChangeableKind getChangeableKind(); @@ -233,8 +233,7 @@ * Getter for the ScopeKind object. * * @return The object implementing the interface. - * @deprecated for 0.25.4 by tfmorris. Use - * [EMAIL PROTECTED] Facade#isStatic(Object)}. + * @deprecated for 0.25.4 by tfmorris. Use [EMAIL PROTECTED] Facade#isStatic(Object)}. */ @Deprecated ScopeKind getScopeKind(); @@ -290,7 +289,7 @@ * @throws UmlException * on any error while writing * @deprecated for 0.25.4 by tfmorris. Use - * [EMAIL PROTECTED] #getXmiWriter(Object, OutputStream, String)} + * [EMAIL PROTECTED] #getXmiWriter(Object, OutputStream, String)}. */ @Deprecated XmiWriter getXmiWriter(Object model, Writer writer, String version) @@ -324,8 +323,8 @@ * Get the command stack. * * @return the command stack - * @deprecated - do not use. This will be replaced by a command stack - * managed by ArgoUML, not the Model subsystem. + * @deprecated for 0.25.4 by tfmorris. Use the ArgoUML undo facility which + * merges all undo actions, including Model subsystems. */ @Deprecated CommandStack getCommandStack(); Modified: trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java 2008-05-08 11:37:41-0700 @@ -46,6 +46,7 @@ * time, so the concept of a single root model needs to be * dropped. */ + @Deprecated void setRootModel(Object rootModel); /** @@ -56,6 +57,7 @@ * for now, but that may need enhancement/change to accommodate * multiple projects. */ + @Deprecated Object getRootModel(); /** @@ -95,6 +97,7 @@ * non-null. Use single argument form * [EMAIL PROTECTED] #buildPackage(String)}. */ + @Deprecated Object buildPackage(String name, String uuid); /** Modified: trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java 2008-05-08 11:37:41-0700 @@ -208,37 +208,34 @@ * This function may fail and return null eg if some required object doesn't * exist in the target model and cannot be copied. * - * @param elem - * is some element. - * @param model - * is the model the returned object shall belong to. + * @param elem is some element. + * @param model is the model the returned object shall belong to. * @return An element of the same type and at the same position in the model * as elem, or if that would turn out impossible then null. - * @deprecated for 0.25.4 by tfmorris. Unnecessary because Model - * implementation maintains cross XMI file references now. + * @deprecated for 0.25.4 by tfmorris. Unnecessary because Model + * implementation maintains cross XMI file references now. */ @Deprecated Object getCorrespondingElement(Object elem, Object model); /** - * Utility function for managing several overlaid models, eg a user - * model to which elements from some profile models is imported when - * needed. This version of the function will only copy objects if - * canCreate is true, but may then also copy other missing elements. - * - * This function may fail and return null eg if the required object - * doesn't exist in the target model and canCreate is false or some - * required object doesn't exist in the target model and cannot be - * copied. - * + * Utility function for managing several overlaid models, eg a user model to + * which elements from some profile models is imported when needed. This + * version of the function will only copy objects if canCreate is true, but + * may then also copy other missing elements. + * <p> + * This function may fail and return null eg if the required object doesn't + * exist in the target model and canCreate is false or some required object + * doesn't exist in the target model and cannot be copied. + * * @param elem is some element. * @param model is the model the returned object shall belong to. * @param canCreate determines if objects can be copied into model. - * @return An element of the same type and at the same position in the - * model as elem, or if that would turn out impossible then null. - * - * @deprecated for 0.25.4 by tfmorris. Unnecessary because Model - * implementation maintains cross XMI file references now. + * @return An element of the same type and at the same position in the model + * as elem, or if that would turn out impossible then null. + * + * @deprecated for 0.25.4 by tfmorris. Unnecessary because Model + * implementation maintains cross XMI file references now. */ @Deprecated Object getCorrespondingElement(Object elem, Object model, Modified: trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java?view=diff&rev=14670&p1=trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java&r1=14669&r2=14670 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java 2008-05-08 11:37:41-0700 @@ -96,7 +96,8 @@ * the UML spec. To control use behavior use * [EMAIL PROTECTED] #isConnectionValid(Object, Object, Object, boolean)}.<p> * - * @deprecated for 0.25.1 by tfmorris use 4 arg version + * @deprecated for 0.25.1 by tfmorris use 4 arg version + * [EMAIL PROTECTED] #isConnectionValid(Object, Object, Object, boolean)} * @param connectionType the UML object type of the connection * @param fromElement the UML object type of the "from" * @param toElement the UML object type of the "to" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
