refactored and incorporated basic io routines from vamsas web services stack.

[vamsas.git] / src / org / vamsas / test / simpleclient / ArchiveWriter.java

diff --git a/src/org/vamsas/test/simpleclient/ArchiveWriter.java b/src/org/vamsas/test/simpleclient/ArchiveWriter.java
index cfba99b..91b1d9e 100644 (file)
--- a/src/org/vamsas/test/simpleclient/ArchiveWriter.java
+++ b/src/org/vamsas/test/simpleclient/ArchiveWriter.java
@@ -18,6 +18,7 @@ import org.vamsas.objects.core.Entry;
 import org.vamsas.objects.core.Provenance;
 import org.vamsas.objects.core.VAMSAS;
 import org.vamsas.objects.core.VamsasDocument;
+import org.vamsas.objects.utils.ProvenanceStuff;
 
 public class ArchiveWriter {
   
@@ -27,28 +28,7 @@ public class ArchiveWriter {
    */
   
   static Log log = LogFactory.getLog("org.vamsas.test.simpleclient.ArchiveWriter");
-  
-  /**
-   * @param action
-   *          text for action entry
-   * @return new Provenance entry for ArchiveWriter created docs.
-   * TODO: Verify and move to SimpleClient class for provenance handling
-   */
-  public static Entry newProvenanceEntry(String user, String action) { 
-    log.debug("Adding ProvenanceEntry("+user+","+action+")");
-    Entry e = new Entry();
-    e.setAction(action);
-    e.setUser(user);
-    e.setDate(new org.exolab.castor.types.Date(new Date()));
-    return e;
-  }
-  
-  public static Provenance newProvenance() {
-    Provenance list = new Provenance();
-    list.addEntry(newProvenanceEntry("ArchiveWriter", "Created new Vamsas Document"));
-    return list;
-  }
-  
+    
   private static void mergeVecs(Object[] destvec, Object[] svec1, Object[] svec2) {
     int i;
     for (i=0; i<svec1.length; i++)
@@ -162,7 +142,7 @@ public class ArchiveWriter {
       VamsasArchive varc = new VamsasArchive(newarch, true);
       VamsasDocument docroot;
       docroot = new VamsasDocument();
-      docroot.setProvenance(newProvenance());
+      docroot.setProvenance(ProvenanceStuff.newProvenance("ArchiveWriter", "Created new Vamsas Document"));
       while (++argpos<argv.length) {
         File archive = new File(argv[argpos]);
         InputStream istream;
@@ -181,7 +161,7 @@ public class ArchiveWriter {
               if ((istream = vdoc.getVamsasXmlStream())!=null) {
                 // make a new vamsas document from the vamsas.xml entry
                 VAMSAS root = VAMSAS.unmarshal(new InputStreamReader(istream)); // TODO: verify only one VAMSAS element per vamsas.xml entry.
-                docroot.getProvenance().addEntry(newProvenanceEntry("user", "added vamsas.xml from "+argv[argpos-1]));
+                docroot.getProvenance().addEntry(ProvenanceStuff.newProvenanceEntry("user", "added vamsas.xml from "+argv[argpos-1]));
                 docroot.addVAMSAS(root);
               }
           }