X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Fclient%2Fsimpleclient%2FClientDocument.java;h=3e5fcfa78c191f0e69fbd779916ac85de46208d3;hb=9d184deaf6769baf57402335f95be259e7943311;hp=05fe4943d869a85113cf6f58a85f6b87a07d1aa3;hpb=850f1fa6ce1e8d0b76566b19a507a387b8d3afd9;p=vamsas.git

diff --git a/src/org/vamsas/client/simpleclient/ClientDocument.java b/src/org/vamsas/client/simpleclient/ClientDocument.java
index 05fe494..3e5fcfa 100644
--- a/src/org/vamsas/client/simpleclient/ClientDocument.java
+++ b/src/org/vamsas/client/simpleclient/ClientDocument.java
@@ -16,16 +16,11 @@ import org.vamsas.objects.core.VamsasDocument;
  * @author jimp Contains a collection of vamsas objects and reference to a
  *         specified ClientHandle's information.
  */
-public class ClientDocument implements IClientDocument {
+public class ClientDocument extends org.vamsas.client.ClientDocument implements IClientDocument {
   protected IClient vorba;
   protected org.vamsas.objects.core.VAMSAS[] roots;
   protected byte[] appData;
-
-  /**
-   * collection of org.vamsas.client.object references
-   */
-  protected Hashtable vamsasObjects;
-  
+  protected VamsasArchive archive = null;
   /*
    * (non-Javadoc)
    * 
@@ -33,18 +28,12 @@ public class ClientDocument implements IClientDocument {
    */
 
   /**
-   * 
-   * @param data
-   * @param doc
-   * @param objects
-   * @param vorba
    */
-  protected ClientDocument(byte[] data, VAMSAS[] roots, Hashtable objects, IClient vorba) {
-    // TODO Auto-generated constructor stub
-    appData = data;
-    this.roots =roots;
-    vamsasObjects = objects;
+  protected ClientDocument(VamsasArchive document, IdFactory Factory, IClient vorba) {
+    super(Factory.getVorbaIdHash(), Factory);
     this.vorba = vorba;
+    archive = document;
+    roots = null;
   }
 
   public byte[] getApplicationData() {
@@ -148,12 +137,10 @@ public class ClientDocument implements IClientDocument {
 /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClientDocument#registerObject(org.vamsas.client.object)
+   * @see org.vamsas.client.IClientDocument#setApplicationData(byte[])
    */
-public VorbaId registerObject(object unregistered) {
-    if (!unregistered.isRegistered())
-      unregistered.setVorbaId(unregistered.__vorba.makeVorbaId());
-    return unregistered.getVorbaId();
+  public void setApplicationData(byte[] newData) {
+    appData = newData;
   }
   /*
    * (non-Javadoc)
@@ -170,12 +157,11 @@ public VorbaId registerObject(object unregistered) {
     return null;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.vamsas.client.IClientDocument#setApplicationData(byte[])
+  /* (non-Javadoc)
+   * @see org.vamsas.client.IClientDocument#registerObject(org.vamsas.client.object)
    */
-  public void setApplicationData(byte[] newData) {
-    appData = newData;
+  public VorbaId registerObject(object unregistered) {
+    // TODO: add provenance stuff to newly registered object
+    return _registerObject(unregistered);
   }
 }