svn commit: r12935 - trunk/src/model/src/org/argouml/model

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]>
Author: tfmorris
Date: 2007-06-30 12:33:06-0700
New Revision: 12935

Modified:
   trunk/src/model/src/org/argouml/model/ChangeableKind.java
   trunk/src/model/src/org/argouml/model/CoreFactory.java
   trunk/src/model/src/org/argouml/model/CoreHelper.java
   trunk/src/model/src/org/argouml/model/DataTypesHelper.java
   trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java
   trunk/src/model/src/org/argouml/model/Facade.java
   trunk/src/model/src/org/argouml/model/Model.java
   trunk/src/model/src/org/argouml/model/ModelImplementation.java
   trunk/src/model/src/org/argouml/model/ScopeKind.java
   trunk/src/model/src/org/argouml/model/UmlFactory.java
   trunk/src/model/src/org/argouml/model/UseCasesFactory.java
   trunk/src/model/src/org/argouml/model/UseCasesHelper.java
   trunk/src/model/src/org/argouml/model/XmiReader.java

Log:
Add @Deprecated annotations

Modified: trunk/src/model/src/org/argouml/model/ChangeableKind.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/ChangeableKind.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/ChangeableKind.java&p2=trunk/src/model/src/org/argouml/model/ChangeableKind.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/ChangeableKind.java	(original)
+++ trunk/src/model/src/org/argouml/model/ChangeableKind.java	2007-06-30 12:33:06-0700
@@ -30,6 +30,7 @@
  * @deprecated for 0.25.4 by tfmorris. This enumeration has been removed from
  *             UML 2. Use the getter for the isReadOnly attribute.
  */
+@Deprecated
 public interface ChangeableKind {
     /**
      * @return Returns the AddOnly ChangeableKind.

Modified: trunk/src/model/src/org/argouml/model/CoreFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/CoreFactory.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/CoreFactory.java&p2=trunk/src/model/src/org/argouml/model/CoreFactory.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/CoreFactory.java	(original)
+++ trunk/src/model/src/org/argouml/model/CoreFactory.java	2007-06-30 12:33:06-0700
@@ -229,6 +229,7 @@
      *             speedy removal since it was just introduced with UML 1.4 and
      *             is unused by ArgoUML.
      */
+    @Deprecated
     public Object createPrimitive();
 
     
@@ -249,6 +250,7 @@
      *             scheduled for speedy removal since it was just introduced
      *             with UML 1.4 and is unused by ArgoUML.
      */
+    @Deprecated
     public Object createProgrammingLanguageDataType();
 
     /**
@@ -390,6 +392,7 @@
      * @deprecated for 0.25.2 by tfmorris - use the side effect free version
      * {@link #buildAttribute2(Object, Object)}
      */
+    @Deprecated
     Object buildAttribute(Object handle, Object model, Object type);
 
     /**
@@ -527,6 +530,7 @@
      * @deprecated for 0.25.4 by tfmorris. Generalizations are unnamed in UML
      *             2.x. Use {@link #buildGeneralization(Object, Object)}.
      */
+    @Deprecated
     Object buildGeneralization(Object child, Object parent, String name);
 
     /**
@@ -558,6 +562,7 @@
      * @deprecated for 0.25.2 by tfmorris 
      * use {@link #buildOperation(Object, Object)}
      */
+    @Deprecated
     Object buildOperation(Object classifier, Object model, Object returnType);
 
     /**
@@ -580,6 +585,7 @@
      * @deprecated for 0.25.2 by tfmorris - use 
      * {@link #buildOperation2(Object, Object, String)}
      */
+    @Deprecated
     Object buildOperation(Object cls, Object model, Object returnType,
             String name);
 
@@ -615,6 +621,7 @@
      * @deprecated for 0.25.2 by tfmorris - use
      *             {@link #buildParameter(Object, Object)}
      */
+    @Deprecated
     Object buildParameter(Object o, Object model, Object type);
 
     /**

Modified: trunk/src/model/src/org/argouml/model/CoreHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/CoreHelper.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/CoreHelper.java&p2=trunk/src/model/src/org/argouml/model/CoreHelper.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/CoreHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/CoreHelper.java	2007-06-30 12:33:06-0700
@@ -165,6 +165,7 @@
      * @deprecated for 0.25.2 by tfmorris. Use
      *             {@link Facade#getSpecifications(Object)}
      */
+    @Deprecated
     Collection getSpecifications(Object classifier);
 
     /**
@@ -350,6 +351,7 @@
      * @deprecated for 0.25.1 by tfmorris - 
      * use {@link ModelManagementHelper#getAllContents(Object)}
      */
+    @Deprecated
     Collection getAllContents(Object namespace);
 
     /**
@@ -769,6 +771,7 @@
      * @deprecated for 0.25.1 by tfmorris - use 
      * {@link ExtensionMechanismsHelper#addTaggedValue(Object, Object)}
      */
+    @Deprecated
     void addTaggedValue(Object handle, Object taggedValue);
 
     /**
@@ -894,6 +897,7 @@
      *             {@link #setReadOnly(Object, boolean)}. NOTE: The UML 1.x
      *             enum of AddOnly has no equivalent in UML 2.x.
      */
+    @Deprecated
     void setChangeability(Object handle, Object ck);
 
     /**
@@ -908,6 +912,7 @@
      * @deprecated for 0.25.4 by tfmorris - use
      *             {@link #setReadOnly(Object, boolean)} with a negated value.
      */
+    @Deprecated
     void setChangeable(Object handle, boolean changeable);
 
     /**
@@ -1120,6 +1125,7 @@
      *            {@link Model#getScopeKind()}.
      * @deprecated for 0.25.4 by tfmorris.  Use {@link #setStatic}.
      */
+    @Deprecated
     void setOwnerScope(Object feature, Object scopeKind);
 
     /**
@@ -1297,6 +1303,7 @@
      * use {@link ExtensionMechanismsHelper#setType(Object, Object)}
      * and {@link ExtensionMechanismsHelper#setValueOfTag(Object, String)}
      */
+    @Deprecated
     void setTaggedValue(Object handle, String tag, String value);
 
     /**
@@ -1307,6 +1314,7 @@
      * @deprecated for 0.25.1 by tfmorris - use 
      * {@link ExtensionMechanismsHelper#setTaggedValue(Object, Collection)}
      */
+    @Deprecated
     void setTaggedValues(Object handle, Collection taggedValues);
 
     /**
@@ -1320,6 +1328,7 @@
      * @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/model/src/org/argouml/model/DataTypesHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/DataTypesHelper.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/DataTypesHelper.java&p2=trunk/src/model/src/org/argouml/model/DataTypesHelper.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/DataTypesHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/DataTypesHelper.java	2007-06-30 12:33:06-0700
@@ -39,6 +39,7 @@
      * @deprecated for 0.25.2 by tfmorris - use
      *   {@link ExtensionMechanismsFactory#copyTaggedValues(Object, Object)}
      */
+    @Deprecated
     void copyTaggedValues(Object from, Object to);
 
     /**

Modified: trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java&p2=trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/ExtensionMechanismsHelper.java	2007-06-30 12:33:06-0700
@@ -182,6 +182,7 @@
      * @param tag String
      * @deprecated by tfmorris for 0.23.3 - use {@link #setType(Object, Object)}
      */
+    @Deprecated
     void setTag(Object handle, Object tag);
     
     /**

Modified: trunk/src/model/src/org/argouml/model/Facade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/Facade.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/Facade.java&p2=trunk/src/model/src/org/argouml/model/Facade.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/Facade.java	(original)
+++ trunk/src/model/src/org/argouml/model/Facade.java	2007-06-30 12:33:06-0700
@@ -497,6 +497,7 @@
      * @return true if handle is an ArgListsExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isAArgListsExpression(Object handle);
     
     /**
@@ -506,6 +507,7 @@
      * @return true if handle is an BooleanExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isABooleanExpression(Object handle);
     
     /**
@@ -515,6 +517,7 @@
      * @return true if handle is an IterationExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isAIterationExpression(Object handle);
     
     /**
@@ -524,6 +527,7 @@
      * @return true if handle is an MappingExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isAMappingExpression(Object handle);
     
     /**
@@ -533,6 +537,7 @@
      * @return true if handle is an ObjectSetExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isAObjectSetExpression(Object handle);
     /**
      * Recognizer for ProcedureExpression.
@@ -541,6 +546,7 @@
      * @return true if handle is an ProcedureExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isAProcedureExpression(Object handle);
     
     /**
@@ -550,6 +556,7 @@
      * @return true if handle is an TimeExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isATimeExpression(Object handle);
     
     /**
@@ -559,6 +566,7 @@
      * @return true if handle is an TypeExpression
      * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
+    @Deprecated
     boolean isATypeExpression(Object handle);
 
     /**
@@ -842,6 +850,7 @@
      * @deprecated for 0.25.4 by tfmorris. Renamed in UML 2.x. Use
      *             {@link #isAPrimitiveType(Object)}.
      */
+    @Deprecated
     boolean isAPrimitive(Object handle);
 
     /**
@@ -861,6 +870,7 @@
      * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. Use
      *             {@link #isAPrimitiveType(Object)}.
      */
+    @Deprecated
     boolean isAProgrammingLanguageDataType(Object handle);
 
     /**
@@ -886,6 +896,7 @@
      * @return the Kind
      * @deprecated by tfmorris for 0.25.3 - use {@link #getKind(Object)}
      */
+    @Deprecated
     Object getPseudostateKind(Object handle);
 
     /**
@@ -1162,6 +1173,7 @@
      * @deprecated for 0.25.4 by tfmorris. UseCaseInstances have been removed
      *             from UML 2.x.
      */
+    @Deprecated
     boolean isAUseCaseInstance(Object handle);
     
     /**
@@ -1192,6 +1204,7 @@
      *             also has an enum point of ADD_ONLY. This has been removed in
      *             UML 2.x.
      */
+    @Deprecated
     boolean isChangeable(Object handle);
 
     /**
@@ -1204,6 +1217,7 @@
      *             the same semantics, but is compatible with the UML 2.x
      *             naming.
      */
+    @Deprecated
     boolean isClassifierScope(Object handle);
 
     /**
@@ -1280,6 +1294,7 @@
      * @deprecated for 0.25.4 by tfmorris - use !{@link #isStatic(Object)}
      *             which is compatible with the UML 2.x naming.
      */
+    @Deprecated
     boolean isInstanceScope(Object handle);
 
     /**
@@ -1574,6 +1589,7 @@
      * @return the Changeability
      * @deprecated for 0.25.4 by tfmorris - use {@link #isReadOnly(Object)}
      */
+    @Deprecated
     Object getChangeability(Object handle);
 
     /**
@@ -1585,6 +1601,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use {@link #getSpecific(Object)}
      *             which matches the UML 2.x terminology.
      */
+    @Deprecated
     Object getChild(Object handle);
 
     /**
@@ -2031,6 +2048,7 @@
      * @deprecated for 0.25.4 by tfmorris. Multiplicities in UML 2.x only have a
      *             single range.
      */
+    @Deprecated
     Iterator getRanges(Object handle);
 
     /**
@@ -2249,6 +2267,7 @@
      * @deprecated for 0.25.4 by tfmorris. Discriminators have been removed from
      *             UML 2.x.
      */
+    @Deprecated
     Object getDiscriminator(Object handle);
 
     /**
@@ -2387,6 +2406,7 @@
      * @return Object the opposite end.
      * @deprecated for 0.25.2 by tfmorris - use {@link #getNextEnd(Object)}
      */
+    @Deprecated
     Object getOppositeEnd(Object handle);
 
     /**
@@ -2453,6 +2473,7 @@
      *             ScopeKind with only two enumerated values has been replaced
      *             by a boolean in UML 2.x.
      */
+    @Deprecated
     Object getOwnerScope(Object handle);
 
     /**
@@ -2554,6 +2575,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use {@link #getGeneral(Object)} which
      *             matches the UML 2.x terminology.
      */
+    @Deprecated
     Object getParent(Object handle);
 
     /**
@@ -2847,6 +2869,7 @@
      * @deprecated for 0.25.4 by tmorris. This has been removed from UML 2.x and
      *             should no longer be used.
      */
+    @Deprecated
     Object getTargetScope(Object handle);
 
     /**

Modified: trunk/src/model/src/org/argouml/model/Model.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/Model.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/Model.java&p2=trunk/src/model/src/org/argouml/model/Model.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/Model.java	(original)
+++ trunk/src/model/src/org/argouml/model/Model.java	2007-06-30 12:33:06-0700
@@ -373,6 +373,7 @@
      * @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() {
         return impl.getChangeableKind();
     }
@@ -402,6 +403,7 @@
      * @deprecated for 0.25.4 by tfmorris.  This has been removed from 
      * UML 2.  Use the getter for the isStatic attribute instead.
      */
+    @Deprecated
     public static ScopeKind getScopeKind() {
         return impl.getScopeKind();
     }
@@ -467,6 +469,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use
      *             {@link #getXmiWriter(Object, OutputStream, String)}.
      */
+    @Deprecated
     public static XmiWriter getXmiWriter(Object model, Writer writer,
             String version) throws UmlException {
         return impl.getXmiWriter(model, writer, version);

Modified: trunk/src/model/src/org/argouml/model/ModelImplementation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/ModelImplementation.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/ModelImplementation.java&p2=trunk/src/model/src/org/argouml/model/ModelImplementation.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/ModelImplementation.java	(original)
+++ trunk/src/model/src/org/argouml/model/ModelImplementation.java	2007-06-30 12:33:06-0700
@@ -209,7 +209,10 @@
      * Getter for the ChangeableKind object.
      *
      * @return The object implementing the interface.
+     * @deprecated for 0.25.4 by tfmorris.  Use 
+     * {@link Facade#isReadOnly(Object)}.
      */
+    @Deprecated
     ChangeableKind getChangeableKind();
 
     /**
@@ -228,9 +231,12 @@
 
     /**
      * Getter for the ScopeKind object.
-     *
+     * 
      * @return The object implementing the interface.
+     * @deprecated for 0.25.4 by tfmorris. Use 
+     * {@link Facade#isStatic(Object)}.
      */
+    @Deprecated
     ScopeKind getScopeKind();
 
     /**
@@ -286,6 +292,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use
      *             {@link #getXmiWriter(Object, OutputStream, String)}
      */
+    @Deprecated
     XmiWriter getXmiWriter(Object model, Writer writer, String version)
         throws UmlException;
 

Modified: trunk/src/model/src/org/argouml/model/ScopeKind.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/ScopeKind.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/ScopeKind.java&p2=trunk/src/model/src/org/argouml/model/ScopeKind.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/ScopeKind.java	(original)
+++ trunk/src/model/src/org/argouml/model/ScopeKind.java	2007-06-30 12:33:06-0700
@@ -30,6 +30,7 @@
  * @deprecated for 0.25.4 by tfmorris. This enumeration has been removed from
  *             UML 2. Use the getter for the isStatic attribute.
  */
+@Deprecated
 public interface ScopeKind {
     /**
      * @return Returns the Classifier ScopeKind.

Modified: trunk/src/model/src/org/argouml/model/UmlFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/UmlFactory.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/UmlFactory.java&p2=trunk/src/model/src/org/argouml/model/UmlFactory.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/UmlFactory.java	(original)
+++ trunk/src/model/src/org/argouml/model/UmlFactory.java	2007-06-30 12:33:06-0700
@@ -91,6 +91,7 @@
      * @param toElement       the UML object type of the "to"
      * @return true if valid
      */
+    @Deprecated
     boolean isConnectionValid(Object connectionType, Object fromElement,
             Object toElement);
     

Modified: trunk/src/model/src/org/argouml/model/UseCasesFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/UseCasesFactory.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/UseCasesFactory.java&p2=trunk/src/model/src/org/argouml/model/UseCasesFactory.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/UseCasesFactory.java	(original)
+++ trunk/src/model/src/org/argouml/model/UseCasesFactory.java	2007-06-30 12:33:06-0700
@@ -72,6 +72,7 @@
      *             from UML 2.x. Use an InstanceSpecification with a UseCase as
      *             its Classifier.
      */
+    @Deprecated
     Object createUseCaseInstance();
 
     /**

Modified: trunk/src/model/src/org/argouml/model/UseCasesHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/UseCasesHelper.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/UseCasesHelper.java&p2=trunk/src/model/src/org/argouml/model/UseCasesHelper.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/UseCasesHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/UseCasesHelper.java	2007-06-30 12:33:06-0700
@@ -70,6 +70,7 @@
      * @return Collection all usecases that extend the given usecase
      * @deprecated for 0.25.4 by tfmorris
      */
+    @Deprecated
     Collection getExtendingUseCases(Object usecase);
 
     /**

Modified: trunk/src/model/src/org/argouml/model/XmiReader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/XmiReader.java?view=diff&rev=12935&p1=trunk/src/model/src/org/argouml/model/XmiReader.java&p2=trunk/src/model/src/org/argouml/model/XmiReader.java&r1=12934&r2=12935
==============================================================================
--- trunk/src/model/src/org/argouml/model/XmiReader.java	(original)
+++ trunk/src/model/src/org/argouml/model/XmiReader.java	2007-06-30 12:33:06-0700
@@ -50,6 +50,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use 
      * {@link #parse(InputSource, boolean)}.
      */
+    @Deprecated
     Collection parse(InputSource pIs) throws UmlException;
 
     /**
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.