refactored AppData stream classes so they are returned from the IClientAppdata interf...

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@428 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/src/uk/ac/vamsas/client/simpleclient/AppDataInputStream.java b/src/uk/ac/vamsas/client/AppDataInputStream.java
similarity index 96%
rename from src/uk/ac/vamsas/client/simpleclient/AppDataInputStream.java
rename to src/uk/ac/vamsas/client/AppDataInputStream.java
index c16d0cf..0b021aa 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/AppDataInputStream.java
+++ b/src/uk/ac/vamsas/client/AppDataInputStream.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package uk.ac.vamsas.client.simpleclient;
+package uk.ac.vamsas.client;
 
 import java.io.DataInput;
 import java.io.DataInputStream;

diff --git a/src/uk/ac/vamsas/client/simpleclient/AppDataOutputStream.java b/src/uk/ac/vamsas/client/AppDataOutputStream.java
similarity index 98%
rename from src/uk/ac/vamsas/client/simpleclient/AppDataOutputStream.java
rename to src/uk/ac/vamsas/client/AppDataOutputStream.java
index 339ec0d..5eb1ff3 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/AppDataOutputStream.java
+++ b/src/uk/ac/vamsas/client/AppDataOutputStream.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package uk.ac.vamsas.client.simpleclient;
+package uk.ac.vamsas.client;
 
 import java.io.DataOutputStream;
 import java.io.IOException;

diff --git a/src/uk/ac/vamsas/client/IClientAppdata.java b/src/uk/ac/vamsas/client/IClientAppdata.java
index c718d22..4df6abb 100644 (file)
--- a/src/uk/ac/vamsas/client/IClientAppdata.java
+++ b/src/uk/ac/vamsas/client/IClientAppdata.java
@@ -3,8 +3,7 @@
  */
 package uk.ac.vamsas.client;
 
-import java.io.DataInput;
-import java.io.DataOutput;
+
 
 /**
  * Object for accessing Client and User specific data
@@ -43,19 +42,19 @@ public interface IClientAppdata {
   /**
    * @return non-user specific data output stream 
    */
-  DataOutput getClientOutputStream();
+  AppDataOutputStream getClientOutputStream();
   /**
    * @return non-user specific data input stream 
    */
-  DataInput getClientInputStream();
+  AppDataInputStream getClientInputStream();
   /**
    * 
    * @return user specific data output stream
    */
-  DataOutput getUserOutputStream();
+  AppDataOutputStream getUserOutputStream();
   /**
    * 
    * @return user specific data input stream
    */
-  DataInput getUserInputStream();
+  AppDataInputStream getUserInputStream();
 }

diff --git a/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java b/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java
index 747e051..9044e0d 100644 (file)
--- a/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java
+++ b/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java
@@ -14,13 +14,13 @@ import org.apache.commons.logging.LogFactory;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
 
+import uk.ac.vamsas.client.AppDataOutputStream;
 import uk.ac.vamsas.client.ClientHandle;
 import uk.ac.vamsas.client.IVorbaIdFactory;
 import uk.ac.vamsas.client.SessionHandle;
 import uk.ac.vamsas.client.UserHandle;
 import uk.ac.vamsas.client.Vobject;
 import uk.ac.vamsas.client.VorbaId;
-import uk.ac.vamsas.client.simpleclient.AppDataOutputStream;
 import uk.ac.vamsas.client.simpleclient.FileWatcher;
 import uk.ac.vamsas.client.simpleclient.IdFactory;
 import uk.ac.vamsas.client.simpleclient.SessionFile;