refactored org to uk

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

diff --git a/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java b/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java
index 2858dd3..e93df6c 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java
+++ b/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java
@@ -19,14 +19,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.Events;
-import org.vamsas.client.IClient;
-import org.vamsas.client.IClientDocument;
-import org.vamsas.client.IObjectUpdate;
-import org.vamsas.client.InvalidSessionUrnException;
-import org.vamsas.client.SessionHandle;
-import org.vamsas.client.UserHandle;
 import org.vamsas.objects.core.ApplicationData;
 import org.vamsas.objects.core.Entry;
 import org.vamsas.objects.core.LockFile;
@@ -35,6 +27,15 @@ import org.vamsas.objects.utils.AppDataReference;
 import org.vamsas.objects.utils.ProvenanceStuff;
 import org.vamsas.objects.utils.document.VersionEntries;
 
+import uk.ac.vamsas.client.ClientHandle;
+import uk.ac.vamsas.client.Events;
+import uk.ac.vamsas.client.IClient;
+import uk.ac.vamsas.client.IClientDocument;
+import uk.ac.vamsas.client.IObjectUpdate;
+import uk.ac.vamsas.client.InvalidSessionUrnException;
+import uk.ac.vamsas.client.SessionHandle;
+import uk.ac.vamsas.client.UserHandle;
+
 /**
  * @author jimp
  */
@@ -109,7 +110,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * LATER: check that build substitution variables are correct
-   * @see org.vamsas.client.IClient#getAbout()
+   * @see uk.ac.vamsas.client.IClient#getAbout()
    */
   public String getAbout() {
     return new String("VORBA SimpleClient version $version$ build $build$");
@@ -118,7 +119,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#getSessionUrn()
+   * @see uk.ac.vamsas.client.IClient#getSessionUrn()
    */
   public String getSessionUrn() {
     return session.getSessionUrn();
@@ -127,7 +128,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#getSessionHandle()
+   * @see uk.ac.vamsas.client.IClient#getSessionHandle()
    */
   public SessionHandle getSessionHandle() {
     // TODO: eliminate SessionHandle ? need to refactor interfaces.
@@ -138,7 +139,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#getClientHandle()
+   * @see uk.ac.vamsas.client.IClient#getClientHandle()
    */
   public ClientHandle getClientHandle() {
     return client;
@@ -147,7 +148,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#getUserHandle()
+   * @see uk.ac.vamsas.client.IClient#getUserHandle()
    */
   public UserHandle getUserHandle() {
     return user;
@@ -174,7 +175,7 @@ public class SimpleClient implements IClient {
   
   /**
    * make all the PropertyChangeSupport objects for the
-   * events described in org.vamsas.client.Event
+   * events described in uk.ac.vamsas.client.Event
    * @return
    */
   private static Hashtable initHandlers() {
@@ -190,7 +191,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#addDocumentUpdateHandler(java.util.EventListener)
+   * @see uk.ac.vamsas.client.IClient#addDocumentUpdateHandler(java.util.EventListener)
    */
   public void addDocumentUpdateHandler(PropertyChangeListener evt) {
     if (handlers.containsKey(Events.DOCUMENT_UPDATE)) {
@@ -205,7 +206,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#finalizeClient()
+   * @see uk.ac.vamsas.client.IClient#finalizeClient()
    */
   public void finalizeClient() {
     // TODO: determine if this is last client in session
@@ -220,7 +221,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#getClientDocument()
+   * @see uk.ac.vamsas.client.IClient#getClientDocument()
    */
   public IClientDocument getClientDocument() throws IOException {
     if (cdocument!=null) {
@@ -263,7 +264,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * @throws Errors for invalid newdoc parameter
-   * @see org.vamsas.client.IClient#updateDocument(org.vamsas.client.IClientDocument)
+   * @see uk.ac.vamsas.client.IClient#updateDocument(uk.ac.vamsas.client.IClientDocument)
    */
   public void updateDocument(IClientDocument newdoc) {
     if (!(newdoc instanceof ClientDocument)) {
@@ -302,7 +303,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#storeDocument(java.io.File)
+   * @see uk.ac.vamsas.client.IClient#storeDocument(java.io.File)
    */
   public void storeDocument(File location) {
     
@@ -322,7 +323,7 @@ public class SimpleClient implements IClient {
   /*
    * (non-Javadoc)
    * 
-   * @see org.vamsas.client.IClient#addVorbaEventHandler(java.lang.String,
+   * @see uk.ac.vamsas.client.IClient#addVorbaEventHandler(java.lang.String,
    *      java.beans.PropertyChangeListener)
    */
   public void addVorbaEventHandler(String EventChain, PropertyChangeListener evt) {
@@ -336,7 +337,7 @@ public class SimpleClient implements IClient {
   }
   
   /* (non-Javadoc)
-   * @see org.vamsas.client.IClient#pollUpdate()
+   * @see uk.ac.vamsas.client.IClient#pollUpdate()
    */
   public void pollUpdate() {
     
@@ -361,7 +362,7 @@ public class SimpleClient implements IClient {
   }
   
   /* (non-Javadoc)
-   * @see org.vamsas.client.IClient#joinSession()
+   * @see uk.ac.vamsas.client.IClient#joinSession()
    */
   public void joinSession() throws Exception {
     // start the EventGenerator thread.
@@ -387,7 +388,7 @@ public class SimpleClient implements IClient {
   
   
   /* (non-Javadoc)
-   * @see org.vamsas.client.IClient#importDocument(java.io.File)
+   * @see uk.ac.vamsas.client.IClient#importDocument(java.io.File)
    */
   public void importDocument(File location) {
     // TODO LATER: implement SimpleClient.importDocument()