refactored org to uk

[vamsas.git] / src / org / vamsas / client / simpleclient / ClientDocument.java

diff --git a/src/org/vamsas/client/simpleclient/ClientDocument.java b/src/org/vamsas/client/simpleclient/ClientDocument.java
index 631c068..3b654f8 100644 (file)
--- a/src/org/vamsas/client/simpleclient/ClientDocument.java
+++ b/src/org/vamsas/client/simpleclient/ClientDocument.java
@@ -41,7 +41,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   public boolean isModified() {
     return isModified;
   }
-  private java.util.Hashtable objrefs=null;
+  private Vector updatedObjects=null;
   /**
    *
    *  prepare Application-side dataset from the vamsas Document archive
@@ -53,13 +53,14 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   protected ClientDocument(VamsasDocument doc, VamsasArchive docHandler, IdFactory Factory, SimpleClient sclient) {
     super(Factory.getVorbaIdHash(), Factory);
     
+    
     /**
      * prepare Application-side dataset from the vamsas Document archive
      */
     this.sclient = sclient;
     archive = docHandler;
     this.doc = doc;
-    objrefs = Factory.getVorbaIdHash();
+    updatedObjects=null;  /// TODO: correct this line
   }
   
   /*
@@ -68,12 +69,12 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
    * @see org.vamsas.client.IClientDocument#getObject(org.vamsas.client.VorbaId)
    */
   public Vobject getObject(VorbaId id) {
-    if (objrefs==null) {
+    if (vamsasObjects==null) {
       log.debug("getObject called on null objrefs list.");
       return null;
     }
-    if (objrefs.containsKey(id))
-      return (Vobject) objrefs.get(id);
+    if (vamsasObjects.containsKey(id))
+      return (Vobject) vamsasObjects.get(id);
     log.debug("Returning null Vobject reference for id "+id.getId());
     return null;
   }
@@ -84,14 +85,14 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
    * @see org.vamsas.client.IClientDocument#getObjects(org.vamsas.client.VorbaId[])
    */
   public Vobject[] getObjects(VorbaId[] ids) {
-    if (objrefs==null) {
-      log.debug("getObject[]  called on null objrefs list.");
+    if (vamsasObjects==null) {
+      log.debug("getObject[]  called on null vamsasObjects list.");
       return null;
     }
     Vobject[] vo = new Vobject[ids.length];
     for (int i=0,j=ids.length; i<j;i++) 
-      if (objrefs.containsKey(ids[i]))
-        vo[i] = (Vobject) objrefs.get(ids[i]);
+      if (vamsasObjects.containsKey(ids[i]))
+        vo[i] = (Vobject) vamsasObjects.get(ids[i]);
       else
         log.debug("Returning null Vobject reference for id "+ids[i].getId());
     return vo;
@@ -312,8 +313,8 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
       log.warn("registerObjects[] called on null document.");
       return null;
     }
-    if (objrefs==null) {
-      log.warn("registerObjects[] called for null objrefs hasharray.");
+    if (vamsasObjects==null) {
+      log.warn("registerObjects[] called for null vamsasObjects hasharray.");
       return null;
     }
     if (unregistered!=null) {
@@ -325,7 +326,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
         } else {
           ids[i]=registerObject(unregistered[i]);
         }
-      log.debug("Registered "+unregistered.length+" objects - total of "+objrefs.size()+" ids.");
+      log.debug("Registered "+unregistered.length+" objects - total of "+vamsasObjects.size()+" ids.");
       return ids;
     }
     return null;
@@ -338,13 +339,13 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
       log.warn("registerObjects called on null document.");
       return null;
     }
-    if (objrefs==null) {
-      log.warn("registerObjects called for null objrefs hasharray.");
+    if (vamsasObjects==null) {
+      log.warn("registerObjects called for null vamsasObjects hasharray.");
       return null;
     }
     if (unregistered!=null) {
       VorbaId id = _registerObject(unregistered);
-      log.debug("Registered object - total of "+objrefs.size()+" ids.");
+      log.debug("Registered object - total of "+vamsasObjects.size()+" ids.");
       return id;
     }
     log.warn("Null Vobject passed to registerObject.");
@@ -503,5 +504,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
     
     super.finalize();
   }
-
+  public Vector getUpdatedObjects() {
+    return updatedObjects;
+  }
 }