renamed base class for all vamsas document objects (now org.vamsas.client.Vobject)

[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 91b1d9e..1a9bae9 100644 (file)
--- a/src/org/vamsas/test/simpleclient/ArchiveWriter.java
+++ b/src/org/vamsas/test/simpleclient/ArchiveWriter.java
@@ -27,7 +27,7 @@ public class ArchiveWriter {
    * form is ArchiveWriter new/modified argive command list
    */
   
-  static Log log = LogFactory.getLog("org.vamsas.test.simpleclient.ArchiveWriter");
+  static Log log = LogFactory.getLog(ArchiveWriter.class);
     
   private static void mergeVecs(Object[] destvec, Object[] svec1, Object[] svec2) {
     int i;
@@ -46,7 +46,7 @@ public class ArchiveWriter {
       if (!ht.containsKey(appdatas[i].getUrn())) {
         Hashtable aphash = new Hashtable();
         ht.put(appdatas[i].getUrn(), aphash);
-        aphash.put(appdatas[i], appdatas[i].getAppDataChoice().getDataReference());
+        aphash.put(appdatas[i], appdatas[i].getDataReference());
       } else {
         // ensure urns and references are unique
         
@@ -59,7 +59,7 @@ public class ArchiveWriter {
   /**
    * safely copies an appData from one archive to another.
    * @param darc destination archive
-   * @param dest destination document object
+   * @param dest destination document Vobject
    * @param sarc source archive reader
    * @param entry application data to be copied from source archive
    */
@@ -102,7 +102,7 @@ public class ArchiveWriter {
     /** TODO: LATER: should verify that all ids really are unique in newly merged document. If not then what ?
      *  investigate possibility of having an id translation between appDatas and the core document - 
      *  the mapping is stored when an external application performs a merge, but when the owning 
-     *  Application accesses the object, the vorba_id is updated to the new one when it writes its 
+     *  Application accesses the Vobject, the vorba_id is updated to the new one when it writes its 
      *  references in to its appdata again
      */
     if (source.getApplicationDataCount()>0) {