svn commit: r12522 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2007-05-04 09:34:20-0700
New Revision: 12522

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java

Log:
Suppress deprecation warnings for implementations of deprecated interface methods.

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=12522&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=12521&r2=12522
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	2007-05-04 09:34:20-0700
@@ -856,10 +856,7 @@
     }
     
 
-    /*
-     * @see org.argouml.model.CoreFactory#buildAttribute(java.lang.Object, 
-     *      java.lang.Object, java.lang.Object)
-     */
+    @SuppressWarnings("deprecation")
     public Object buildAttribute(Object handle, Object model, Object type) {
         Attribute attr = (Attribute) buildAttribute(model, type);
         if (handle instanceof Classifier) {
@@ -875,9 +872,6 @@
     }
     
 
-    /*
-     * @see org.argouml.model.CoreFactory#buildAttribute2(java.lang.Object, java.lang.Object)
-     */
     public Object buildAttribute2(Object handle, Object type) {
         Attribute attr = (Attribute) buildAttribute2(type);
         if (handle instanceof Classifier) {
@@ -1156,18 +1150,14 @@
         return method;
     }
 
-    /*
-     * @see org.argouml.model.CoreFactory#buildOperation(java.lang.Object,
-     *      java.lang.Object, java.lang.Object)
-     */
+
+    @SuppressWarnings("deprecation")
     public Object buildOperation(Object classifier, Object model,
             Object returnType) {
         return buildOperation(classifier, returnType);
     }
 
-    /*
-     * @see org.argouml.model.CoreFactory#buildOperation(java.lang.Object, java.lang.Object)
-     */
+
     public Object buildOperation(Object classifier, Object returnType) {
         if (!(classifier instanceof Classifier)) {
             throw new IllegalArgumentException("Handle is not a classifier");
@@ -1191,18 +1181,14 @@
         return oper;
     }
 
-    /*
-     * @see org.argouml.model.CoreFactory#buildOperation(java.lang.Object,
-     *      java.lang.Object, java.lang.Object, java.lang.String)
-     */
+
+    @SuppressWarnings("deprecation")
     public Object buildOperation(Object cls, Object model, Object returnType,
             String name) {
         return buildOperation2(cls, returnType, name);
     }
     
-    /*
-     * @see org.argouml.model.CoreFactory#buildOperation2(java.lang.Object, java.lang.Object, java.lang.String)
-     */
+
     public Object buildOperation2(Object cls, Object returnType, String name) {
         Object oper = buildOperation(cls, returnType);
         if (oper != null) {
@@ -1222,10 +1208,8 @@
         return param;
     }
 
-    /*
-     * @see org.argouml.model.CoreFactory#buildParameter(java.lang.Object,
-     *      java.lang.Object, java.lang.Object)
-     */
+
+    @SuppressWarnings("deprecation")
     public Object buildParameter(Object o, Object model, Object type) {
         return buildParameter(o, type);
     }

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=12522&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=12521&r2=12522
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	2007-05-04 09:34:20-0700
@@ -431,6 +431,7 @@
         }
     }
 
+    @SuppressWarnings("deprecation")
     public Collection getSpecifications(Object classifier) {
         try {
             return getRealizedInterfaces(classifier);
@@ -942,6 +943,7 @@
     }
 
 
+    @SuppressWarnings("deprecation")
     public Collection getAllContents(Object clazz) {
         if (clazz == null) {
             return new ArrayList();
@@ -2270,6 +2272,7 @@
     }
 
 
+    @SuppressWarnings("deprecation")
     public void addTaggedValue(Object handle, Object taggedValue) {
         modelImpl.getExtensionMechanismsHelper().addTaggedValue(handle,
                 taggedValue);

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java?view=diff&rev=12522&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java&r1=12521&r2=12522
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java	2007-05-04 09:34:20-0700
@@ -30,8 +30,6 @@
 
 import org.argouml.model.DataTypesHelper;
 import org.argouml.model.InvalidElementException;
-import org.omg.uml.foundation.core.ModelElement;
-import org.omg.uml.foundation.core.TaggedValue;
 import org.omg.uml.foundation.datatypes.Expression;
 import org.omg.uml.foundation.datatypes.Multiplicity;
 import org.omg.uml.foundation.datatypes.MultiplicityRange;
@@ -57,17 +55,13 @@
         modelImpl = implementation;
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#copyTaggedValues(
-     *      java.lang.Object, java.lang.Object)
-     */
+    
+    @SuppressWarnings("deprecation")
     public void copyTaggedValues(Object from, Object to) {
         modelImpl.getExtensionMechanismsFactory().copyTaggedValues(from, to);
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsINITIALKind(java.lang.Object)
-     */
+    
     public boolean equalsINITIALKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -79,9 +73,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsDeepHistoryKind(java.lang.Object)
-     */
+
     public boolean equalsDeepHistoryKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -93,9 +85,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsShallowHistoryKind(java.lang.Object)
-     */
+
     public boolean equalsShallowHistoryKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -107,9 +97,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsFORKKind(java.lang.Object)
-     */
+
     public boolean equalsFORKKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -121,9 +109,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsJOINKind(java.lang.Object)
-     */
+
     public boolean equalsJOINKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -135,9 +121,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsCHOICEKind(java.lang.Object)
-     */
+
     public boolean equalsCHOICEKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -149,9 +133,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#equalsJUNCTIONKind(java.lang.Object)
-     */
+
     public boolean equalsJUNCTIONKind(Object kind) {
         if (!(kind instanceof PseudostateKind)) {
             throw new IllegalArgumentException();
@@ -163,9 +145,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#multiplicityToString(java.lang.Object)
-     */
+
     public String multiplicityToString(Object multiplicity) {
         if (!(multiplicity instanceof Multiplicity)) {
             throw new IllegalArgumentException("Unrecognized object: "
@@ -204,10 +184,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#setBody(java.lang.Object,
-     *      java.lang.String)
-     */
+
     public Object setBody(Object handle, String body) {
         if (handle instanceof Expression) {
             ((Expression) handle).setBody(body);
@@ -217,9 +194,7 @@
                 + body);
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#getBody(java.lang.Object)
-     */
+
     public String getBody(Object handle) {
         try {
             if (handle instanceof Expression) {
@@ -231,10 +206,7 @@
         throw new IllegalArgumentException("handle: " + handle);
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#setLanguage(java.lang.Object,
-     *      java.lang.String)
-     */
+
     public Object setLanguage(Object handle, String language) {
         if (handle instanceof Expression) {
             ((Expression) handle).setLanguage(language);
@@ -244,9 +216,7 @@
                 + language);
     }
 
-    /*
-     * @see org.argouml.model.DataTypesHelper#getLanguage(java.lang.Object)
-     */
+
     public String getLanguage(Object handle) {
         try {
             if (handle instanceof Expression) {

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=12522&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=12521&r2=12522
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	2007-05-04 09:34:20-0700
@@ -485,10 +485,8 @@
                 + icon);
     }
 
-
-    /*
-     * @see org.argouml.model.ExtensionMechanismsHelper#setTag(java.lang.Object, java.lang.Object)
-     */
+    
+    @SuppressWarnings("deprecation")
     public void setTag(Object handle, Object tag) {
         if (handle instanceof TaggedValue) {
             TaggedValue tv = (TaggedValue) handle;

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=12522&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=12521&r2=12522
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2007-05-04 09:34:20-0700
@@ -2640,9 +2640,11 @@
     }
     
 
+    @SuppressWarnings("deprecation")
     public Object getOppositeEnd(Object handle) {
         return getNextEnd(handle);
     }
+    
 
     public Object getNextEnd(Object handle) {
         try {

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&rev=12522&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&r1=12521&r2=12522
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	2007-05-04 09:34:20-0700
@@ -305,7 +305,7 @@
             Object unidirectional, Object namespace)
         throws IllegalModelElementConnectionException {
 
-        if (!isConnectionValid(elementType, fromElement, toElement)) {
+        if (!isConnectionValid(elementType, fromElement, toElement, true)) {
             throw new IllegalModelElementConnectionException("Cannot make a "
                     + elementType.getClass().getName() + " between a "
                     + fromElement.getClass().getName() + " and a "
@@ -461,25 +461,20 @@
                 + elementType);
     }
 
-    /*
-     * @see org.argouml.model.UmlFactory#isConnectionType(java.lang.Object)
-     */
+
     public boolean isConnectionType(Object connectionType) {
         // If our map has any entries for this type, it's a connection type
         return (validConnectionMap.get(connectionType) != null);
     }
 
-    /*
-     * @see org.argouml.model.UmlFactory#isConnectionValid(java.lang.Object, java.lang.Object, java.lang.Object)
-     */
+
+    @SuppressWarnings("deprecation")
     public boolean isConnectionValid(Object connectionType, Object fromElement,
             Object toElement) {
         return isConnectionValid(connectionType, fromElement, toElement, true);
     }
     
-    /*
-     * @see org.argouml.model.UmlFactory#isConnectionValid(java.lang.Object, java.lang.Object, java.lang.Object, boolean)
-     */
+
     public boolean isConnectionValid(Object connectionType, Object fromElement,
             Object toElement, boolean checkWFR) {
         // Get the list of valid model item pairs for the given connection type