modified castor-1.1 library and refactored uk.ac.vamsas

[jalview.git] / src / jalview / gui / VamsasClient.java

diff --git a/src/jalview/gui/VamsasClient.java b/src/jalview/gui/VamsasClient.java
index 7c37bd3..de62c6d 100755 (executable)
--- a/src/jalview/gui/VamsasClient.java
+++ b/src/jalview/gui/VamsasClient.java
@@ -16,14 +16,14 @@ import javax.swing.JInternalFrame;
 import jalview.bin.Cache;
 import jalview.io.VamsasDatastore;
 
-import org.vamsas.client.UserHandle;
-import org.vamsas.client.simpleclient.FileWatcher;
-import org.vamsas.client.simpleclient.VamsasArchive;
-import org.vamsas.client.simpleclient.VamsasFile;
-import org.vamsas.objects.core.Entry;
-import org.vamsas.objects.core.VamsasDocument;
-import org.vamsas.test.simpleclient.ArchiveClient;
-import org.vamsas.test.simpleclient.ClientDoc;
+import uk.ac.vamsas.client.UserHandle;
+import uk.ac.vamsas.client.simpleclient.FileWatcher;
+import uk.ac.vamsas.client.simpleclient.VamsasArchive;
+import uk.ac.vamsas.client.simpleclient.VamsasFile;
+import uk.ac.vamsas.objects.core.Entry;
+import uk.ac.vamsas.objects.core.VamsasDocument;
+import uk.ac.vamsas.test.simpleclient.ArchiveClient;
+import uk.ac.vamsas.test.simpleclient.ClientDoc;
 
 /**
  * @author jimp
@@ -127,7 +127,7 @@ public class VamsasClient
     watchForChange = true;
     if (watcher != null)
     {
-      watcher.start();
+      startWatcher(); /// TODO: check this works... must recreate watcher to start it...
     }
     // collect all uncached alignments and put them into the vamsas dataset.
     // store them.
@@ -208,7 +208,7 @@ public class VamsasClient
 
   private Entry baseProvEntry()
   {
-    org.vamsas.objects.core.Entry pentry = new org.vamsas.objects.core.Entry();
+    uk.ac.vamsas.objects.core.Entry pentry = new uk.ac.vamsas.objects.core.Entry();
     pentry.setUser(this.getProvenanceUser());
     pentry.setApp(this.getClientHandle().getClientName());
     pentry.setDate(new org.exolab.castor.types.Date(new java.util.Date()));