Added support for crashed client.

[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 dc3df20..5f0836e 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java
+++ b/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java
@@ -6,14 +6,10 @@
  */
 package uk.ac.vamsas.client.simpleclient;
 
-import java.beans.EventHandler;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.util.Hashtable;
 import java.util.Vector;
 
@@ -29,13 +25,9 @@ import uk.ac.vamsas.client.InvalidSessionUrnException;
 import uk.ac.vamsas.client.SessionHandle;
 import uk.ac.vamsas.client.UserHandle;
 import uk.ac.vamsas.client.picking.IPickManager;
-import uk.ac.vamsas.objects.core.ApplicationData;
 import uk.ac.vamsas.objects.core.Entry;
-import uk.ac.vamsas.objects.core.LockFile;
 import uk.ac.vamsas.objects.core.VamsasDocument;
-import uk.ac.vamsas.objects.utils.AppDataReference;
 import uk.ac.vamsas.objects.utils.ProvenanceStuff;
-import uk.ac.vamsas.objects.utils.document.VersionEntries;
 
 /**
  * @author jimp
@@ -240,11 +232,13 @@ public class SimpleClient implements IClient {
     // deregister listeners.
     log.debug("Stopping pickManager");
     haltPickmanager();
-    log.debug("Stopping EventGenerator..");
-    evgen.stopWatching();
-    SimpleClient.log.debug("EventGenerator halted.");
+    
     log.debug("Deregistering Client");
     _session.removeClient(this);
+    //log.debug("Stopping EventGenerator..");
+    //evgen.stopWatching();
+    SimpleClient.log.debug("EventGenerator halted.");
+    this.cdocument = null;
     log.debug("finalization Complete.");
   }
   
@@ -365,11 +359,10 @@ public class SimpleClient implements IClient {
     // Events.DOCUMENT_FINALIZEAPPDATA
     try {
       _session.writeVamsasDocument(location, vamlock);
-      _session.clearUnsavedFlag();
+       _session.clearUnsavedFlag();
     } catch (Exception e) {
       log.warn("Exception whilst trying to store document in "+location,e);
     }
-    
     vamlock.release();
   }
   
@@ -449,6 +442,12 @@ public class SimpleClient implements IClient {
   public void importDocument(File location) {
     // TODO LATER: implement SimpleClient.importDocument()
     log.error("importDocument is not yet implemented for a SimpleClient Session.");
+    
+   /* try {
+      this._session.setVamsasDocument(location);
+    } catch (IOException e) {
+      log.error("importDocument failed.");
+    }*/
   }
 
   public IObjectUpdate getUpdateHandler(Class rootObject) {