refactored org to uk

[vamsas.git] / src / uk / ac / vamsas / client / simpleclient / ClientDocument.java

diff --git a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
index dde9632..86294be 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
+++ b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
@@ -8,12 +8,6 @@ import java.util.Vector;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.vamsas.client.ClientHandle;
-import org.vamsas.client.IClientAppdata;
-import org.vamsas.client.IClientDocument;
-import org.vamsas.client.UserHandle;
-import org.vamsas.client.Vobject;
-import org.vamsas.client.VorbaId;
 import org.vamsas.objects.core.ApplicationData;
 import org.vamsas.objects.core.User;
 import org.vamsas.objects.core.VAMSAS;
@@ -21,11 +15,18 @@ import org.vamsas.objects.core.VamsasDocument;
 import org.vamsas.objects.utils.AppDataReference;
 import org.vamsas.test.objects.Core;
 
+import uk.ac.vamsas.client.ClientHandle;
+import uk.ac.vamsas.client.IClientAppdata;
+import uk.ac.vamsas.client.IClientDocument;
+import uk.ac.vamsas.client.UserHandle;
+import uk.ac.vamsas.client.Vobject;
+import uk.ac.vamsas.client.VorbaId;
+
 /**
  * Maintains a collection of vamsas objects, appdatas and states, and provides api for a SimpleClient's client.
  * @author jimp 
  */
-public class ClientDocument extends org.vamsas.client.ClientDocument implements IClientDocument {
+public class ClientDocument extends uk.ac.vamsas.client.ClientDocument implements IClientDocument {
   private static Log log = LogFactory.getLog(ClientDocument.class);
   private VamsasDocument doc;
   protected SimpleClient sclient;
@@ -66,7 +67,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClientDocument#getObject(org.vamsas.client.VorbaId)
+   * @see uk.ac.vamsas.client.IClientDocument#getObject(uk.ac.vamsas.client.VorbaId)
    */
   public Vobject getObject(VorbaId id) {
     if (vamsasObjects==null) {
@@ -82,7 +83,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClientDocument#getObjects(org.vamsas.client.VorbaId[])
+   * @see uk.ac.vamsas.client.IClientDocument#getObjects(uk.ac.vamsas.client.VorbaId[])
    */
   public Vobject[] getObjects(VorbaId[] ids) {
     if (vamsasObjects==null) {
@@ -104,7 +105,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   /*
    * (non-Javadoc)
    * LATER: currently there is only one Vector of roots ever passed to client - decide if this is correct (means this is not thread safe and may behave unexpectedly)
-   * @see org.vamsas.client.IClientDocument#getVamsasRoots()
+   * @see uk.ac.vamsas.client.IClientDocument#getVamsasRoots()
    */
   public VAMSAS[] getVamsasRoots() {
     if (doc==null) {
@@ -292,7 +293,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   
   /* (non-Javadoc)
    * LATER: decide: this affects the next call to getVamsasRoots()
-   * @see org.vamsas.client.IClientDocument#addVamsasRoot(org.vamsas.objects.core.VAMSAS)
+   * @see uk.ac.vamsas.client.IClientDocument#addVamsasRoot(org.vamsas.objects.core.VAMSAS)
    */
   public void addVamsasRoot(VAMSAS newroot) {
     if (doc==null) {
@@ -306,7 +307,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClientDocument#registerObjects(org.vamsas.client.Vobject[])
+   * @see uk.ac.vamsas.client.IClientDocument#registerObjects(uk.ac.vamsas.client.Vobject[])
    */
   public VorbaId[] registerObjects(Vobject[] unregistered) {
     if (doc==null) {
@@ -332,7 +333,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
     return null;
   }
   /* (non-Javadoc)
-   * @see org.vamsas.client.IClientDocument#registerObject(org.vamsas.client.Vobject)
+   * @see uk.ac.vamsas.client.IClientDocument#registerObject(uk.ac.vamsas.client.Vobject)
    */
   public VorbaId registerObject(Vobject unregistered) {
     if (doc==null) {
@@ -356,7 +357,7 @@ public class ClientDocument extends org.vamsas.client.ClientDocument implements
    */
   SimpleClientAppdata scappd = null;
   /* (non-Javadoc)
-   * @see org.vamsas.client.IClientDocument#getClientAppdata()
+   * @see uk.ac.vamsas.client.IClientDocument#getClientAppdata()
    */
   public IClientAppdata getClientAppdata() {
     if (doc==null) {