svn commit: r13558 - trunk/src_new/org/argouml/persistence

Author: tfmorris
Date: 2007-09-17 13:57:14-0700
New Revision: 13558

Modified:
   trunk/src_new/org/argouml/persistence/MemberFilePersister.java
   trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
   trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java

Log:
Improve deprecation comments.

Modified: trunk/src_new/org/argouml/persistence/MemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/MemberFilePersister.java?view=diff&rev=13558&p1=trunk/src_new/org/argouml/persistence/MemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/MemberFilePersister.java&r1=13557&r2=13558
==============================================================================
--- trunk/src_new/org/argouml/persistence/MemberFilePersister.java	(original)
+++ trunk/src_new/org/argouml/persistence/MemberFilePersister.java	2007-09-17 13:57:14-0700
@@ -74,12 +74,14 @@
 
     /**
      * Save the projectmember as XML to the given writer.
-     *
+     * 
      * @param member The project member to save.
      * @param writer The Writer to which to save the XML.
      * @throws SaveException if the save fails
-     * @deprecated for 0.25.4 by tfmorris.
+     * @deprecated for 0.25.4 by tfmorris. Use
+     *             {@link #save(ProjectMember, OutputStream)}.
      */
+    @Deprecated
     public void save(
             ProjectMember member,
             Writer writer) throws SaveException {
@@ -112,6 +114,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use 
      * {@link #save(ProjectMember, OutputStream, boolean)}.
      */
+    @Deprecated
     public abstract void save(
             ProjectMember member,
             Writer writer,

Modified: trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&rev=13558&p1=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&r1=13557&r2=13558
==============================================================================
--- trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java	(original)
+++ trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java	2007-09-17 13:57:14-0700
@@ -33,7 +33,6 @@
 import java.io.Writer;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -160,6 +159,8 @@
      *         org.argouml.kernel.ProjectMember, java.io.Writer,
      *         java.lang.Integer)
      */
+    @Deprecated
+    @Override
     public void save(ProjectMember member, Writer w, boolean xmlFragment)
     	throws SaveException {
 
@@ -187,7 +188,7 @@
                 xmiWriter.write();
                 addXmlFileToWriter((PrintWriter) w, tempFile);
             } else {
-                // Othewise we are writing into a zip writer or to XMI.
+                // Otherwise we are writing into a zip writer or to XMI.
                 XmiWriter xmiWriter = 
                     Model.getXmiWriter(model, w, 
                             ApplicationVersion.getVersion() + "(" 
@@ -205,7 +206,7 @@
     /**
      * Save the project model to XMI.
      * 
-     * @see org.argouml.persistence.MemberFilePersister#save(org.argouml.kernel.ProjectMember, java.io.OutputStream, boolean)
+     * @see org.argouml.persistence.MemberFilePersister#save(ProjectMember, OutputStream)
      */
     public void save(ProjectMember member, OutputStream outStream)
         throws SaveException {

Modified: trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java?view=diff&rev=13558&p1=trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java&r1=13557&r2=13558
==============================================================================
--- trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java	(original)
+++ trunk/src_new/org/argouml/persistence/OldModelMemberFilePersister.java	2007-09-17 13:57:14-0700
@@ -47,6 +47,8 @@
      *         org.argouml.kernel.ProjectMember, java.io.Writer,
      *         boolean)
      */
+    @Deprecated
+    @Override
     public void save(ProjectMember member, Writer w, boolean xmlFragment)
     	throws SaveException {