svn commit: r14669 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2008-05-08 11:37:31-0700
New Revision: 14669

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java

Log:
Deprecation review.  Remove old methods.  Update all comments.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=14669&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=14668&r2=14669
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	2008-05-08 11:37:31-0700
@@ -290,9 +290,7 @@
     }
 
 
-    /**
-     * @deprecated Use {@link #isValidStereotype(Object,Object)} instead
-     */
+    @Deprecated
     public boolean isValidStereoType(Object theModelElement,
             Object theStereotype) {
         return isValidStereotype(theModelElement, theStereotype);
@@ -439,40 +437,6 @@
                 + icon);
     }
 
-    
-    @SuppressWarnings("deprecation")
-    public void setTag(Object handle, Object tag) {
-        if (handle instanceof TaggedValue) {
-            TaggedValue tv = (TaggedValue) handle;
-            if (tag instanceof TagDefinition) {
-                tv.setType((TagDefinition) tag);
-            } else {
-                // TODO: Remove old UML 1.3 code
-                //preserve old behavior
-                TagDefinition td = tv.getType();
-                if (tag == null) {
-                    tag = "";
-                }
-                if (td == null) {
-                    td =
-                        ((ExtensionMechanismsFactoryMDRImpl) modelImpl
-                            .getExtensionMechanismsFactory())
-                            .getTagDefinition(tag.toString());
-                    Object model = modelImpl.getFacade().getModel(handle);
-                    if (!modelImpl.getFacade().isAModel(model)) {
-                        model = modelImpl.getModelManagementFactory()
-                                .getRootModel();
-                    }
-                    tv.setType(td);
-                } else {
-                    // TODO: This is going to change the name of the
-                    // existing TagDefinition, essentially redefining it,
-                    // which is probably not what we want to do - tfm
-                    td.setName(tag.toString());
-                }
-            }
-        }
-    }
 
     public void setValueOfTag(Object handle, String value) {
         setDataValues(handle, new String[] {value});
@@ -560,9 +524,6 @@
     }
 
 
-    /**
-     * @deprecated Use {@link #hasStereotype(Object,String)} instead
-     */
     @Deprecated
     public boolean hasStereoType(Object handle, String name) {
         return hasStereotype(handle, name);

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java?view=diff&rev=14669&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&r1=14668&r2=14669
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java	2008-05-08 11:37:31-0700
@@ -119,7 +119,8 @@
      *            The writer to write to
      * @param version the ArgoUML version
      * @throws IllegalArgumentException if no writer provided
-     * @deprecated for 0.25.4 by tfmorris.  Use other constructor.
+     * @deprecated for 0.25.4 by tfmorris.  Use 
+     * {@link #XmiWriterMDRImpl(MDRModelImplementation, Object, OutputStream, String)}.
      */
     public XmiWriterMDRImpl(MDRModelImplementation theParent, Object theModel,
             Writer theWriter, String version) {
@@ -189,7 +190,8 @@
                 stream = oStream;
             }
 
-            xmiWriter.write(stream, "file:///ThisIsADummyName.xmi", elements, XMI_VERSION);
+            xmiWriter.write(stream, "file:///ThisIsADummyName.xmi", elements,
+                    XMI_VERSION);
         } catch (IOException e) {
             throw new UmlException(e);
         }
@@ -204,7 +206,7 @@
      * @author lmaitre
      * @deprecated for 0.25.4 by tfmorris
      */
-    public class WriterOuputStream extends OutputStream {
+    private class WriterOuputStream extends OutputStream {
 
         private Writer myWriter;
         private boolean inTag = false;