added new constructor and File object accessor to make VamsasFile usable with VamsasA...

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

diff --git a/src/org/vamsas/client/simpleclient/VamsasArchive.java b/src/org/vamsas/client/simpleclient/VamsasArchive.java
index d769a5c..f065d04 100644 (file)
--- a/src/org/vamsas/client/simpleclient/VamsasArchive.java
+++ b/src/org/vamsas/client/simpleclient/VamsasArchive.java
@@ -196,7 +196,15 @@ public class VamsasArchive {
    */
   public VamsasArchive(VamsasFile archive, boolean vamsasdocument, boolean overwrite) throws IOException {
     this(archive.sessionFile, overwrite, vamsasdocument, archive);
-    log.debug("using non-functional lock-IO stream jar access constructor");
+    // log.debug("using non-functional lock-IO stream jar access constructor");
+  }
+  /**
+   * read and write to archive - will not overwrite original contents, and will always write an up to date vamsas document structure.
+   * @param archive
+   * @throws IOException
+   */
+  public VamsasArchive(VamsasFile archive) throws IOException {
+    this(archive, true, false); 
   }
   /**
    * 

diff --git a/src/org/vamsas/client/simpleclient/VamsasFile.java b/src/org/vamsas/client/simpleclient/VamsasFile.java
index ecacdb9..3dd2581 100644 (file)
--- a/src/org/vamsas/client/simpleclient/VamsasFile.java
+++ b/src/org/vamsas/client/simpleclient/VamsasFile.java
@@ -37,6 +37,13 @@ public class VamsasFile extends SessionFile {
     super(sessionFile);
   }
   /**
+   * 
+   * @return the VamsasFile
+   */
+  public File getVamsasFile() {
+    return sessionFile;
+  }
+  /**
    * Expand a previously stored session into the sessionDir
    * @param sessionDir
    * @param storedSession
@@ -72,6 +79,16 @@ public class VamsasFile extends SessionFile {
     return null;
   }
   /**
+   * 
+   * @param extantLock
+   * @return null, extantLock or new Lock.
+   */
+  public Lock getLock(Lock extantLock) {
+    if (lockFile(extantLock))
+      return fileLock;
+    return null;
+  }
+  /**
    * explicitly unlocks vamsas file.
    * if you have called getLock() you *must* 
    * call this to release the lock.