X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fclient%2Fsimpleclient%2FSimpleClient.java;h=fccfba7b9bef41a28709e32d3466e0fc04d77536;hb=d6ac358fdc0e79968dd68a5bad050a763403191a;hp=ad742098ab59b9be852beaf1b038be703b673204;hpb=4af676753de2489148d92c834398ec88079bcf24;p=vamsas.git diff --git a/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java b/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java index ad74209..fccfba7 100644 --- a/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java +++ b/src/uk/ac/vamsas/client/simpleclient/SimpleClient.java @@ -6,14 +6,14 @@ */ 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.io.RandomAccessFile; +import java.nio.channels.FileChannel; + +import java.nio.channels.OverlappingFileLockException; import java.util.Hashtable; import java.util.Vector; @@ -29,13 +29,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 @@ -51,6 +47,13 @@ public class SimpleClient implements IClient { protected ClientHandle client = null; protected EventGeneratorThread evgen = null; protected ClientDocument cdocument = null; + + + + + private Lock activeClientFilelock = null; + private File clientlockFile = null; + /** * object hash table that persists in each client holding vorbaIds and hash values after a document write */ @@ -61,7 +64,9 @@ public class SimpleClient implements IClient { * @return */ private IdFactory makeVorbaIdFactory() { - return new IdFactory(getSessionHandle(), client, user); + if (extantobjects==null) + extantobjects=new Hashtable(); + return new IdFactory(getSessionHandle(), client, user, extantobjects); } /** @@ -211,7 +216,7 @@ public class SimpleClient implements IClient { new Thread() { public void run() { SimpleClient.log.debug("Stopping pickManager.."); - dying.pickmanager.haltPickManager(); + dying.pickmanager.shutdown(); SimpleClient.log.debug("pickManager halted."); } }.start(); @@ -236,12 +241,15 @@ public class SimpleClient implements IClient { // if (handlers.containsKey(Events.)) // if (handlers.containsKey(Events.CLIENT_FINALIZATION)) // deregister listeners. + log.debug("Stopping pickManager"); haltPickmanager(); - SimpleClient.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."); } @@ -315,26 +323,21 @@ public class SimpleClient implements IClient { log.debug("updateDocument for "+session.getSessionUrn()+" with unmodified IClientDocument (skipping the write)"); } else { try { - if (!cdocument.updateSessionDocument()) { + boolean updated=cdocument.updateSessionDocument(); + if (!updated) { log.warn("Session document did not update properly for session directory "+_session.sessionDir); // cdocument.archive.cancelArchive(); // LATER: could be done - would need to prevent updateSessionDocument closing the iohandler. _session.slog.warn("Session Document updated but may not be valid (false return from org.vamsas.simpleclient.ClientDocument.updateSessionDocument()"); + } else { + log.debug("Document update successful."); } - log.debug("Document update successful."); + _session.setUnsavedFlag(); } catch (IOException e) { log.warn("IO Problems when updating document!",e); _session.slog.error("IO problems when attempting to update document."); } } - try { - _session.setUnsavedFlag(); - _session.unlockVamsasDocument(); - evgen.enableDocumentWatch(); - } catch (IOException e) { - log.warn("IO Problems when releasing lock on session document!",e); - _session.slog.error("IO problems when attempting to release lock on session document."); - } // garbage collect the ClientDocument instance. try { log.debug("Finalizing ClientDocument instance."); @@ -343,6 +346,14 @@ public class SimpleClient implements IClient { log.error("Exception when trying to garbage collect ClientDocument for "+session.getSessionUrn(), e); } cdocument = null; // this is probably done by finalize + + try { + _session.unlockVamsasDocument(); + evgen.enableDocumentWatch(); + } catch (IOException e) { + log.warn("IO Problems when releasing lock on session document!",e); + _session.slog.error("IO problems when attempting to release lock on session document."); + } } /* @@ -359,11 +370,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(); } @@ -442,7 +452,15 @@ public class SimpleClient implements IClient { */ public void importDocument(File location) { // TODO LATER: implement SimpleClient.importDocument() + // if (numberOfClients<1 or document file is empty/new, then can import directly.) + // more complex if data is already present in document. Could have a 'clearSession' method, too, or dump and overwrite instead. 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) { @@ -488,4 +506,64 @@ public class SimpleClient implements IClient { pickmanager = new SimplePickManager(new uk.ac.vamsas.client.picking.SocketManager()); } } + + + protected void releaseActiveClientFile() throws IOException + { + + log.debug("Releasing active client file"); + if( activeClientFilelock != null) + {// Release the lock + activeClientFilelock.release(); + activeClientFilelock = null; + } else { + log.debug("ReleaseActiveClientFile called when client has no lock on its clientLockFile"); + } + if (this.clientlockFile != null) + { + if (this.clientlockFile.exists()) + this.clientlockFile.delete(); + log.debug("deleted active client lock file"); + } else { + log.debug("ReleaseActiveClientFile called when client has no clientLockFile"); + } + + } + + protected void createActiveClientFile() throws IOException + { + if(this.clientlockFile != null )return; + log.debug("createActiveClientFile"); + //create, if need, subdirectory to contain client files + File clientlockFileDir = new File ( this.get_session().sessionDir, this.get_session().clientFileDirectory); + if( !clientlockFileDir.exists()) + {//the directory does not exist, create it + if (! clientlockFileDir.mkdirs()) + { + throw new IOException("Failed to create sub directory to session directory for client lock files'"+clientlockFileDir.getAbsolutePath()+"'"); + } + } + else + { + if (!(clientlockFileDir.isDirectory() && clientlockFileDir.canWrite())) + { + throw new IOException("Directory for client lock files is not a directory or is not accessibl: '"+clientlockFileDir.getAbsolutePath()+"'"); + } + } + this.clientlockFile = new File (clientlockFileDir, this.getClientHandle().getClientUrn().replaceAll("[:;/\\\\]+","")); + + log.debug("Creating active client lock file "+ this.clientlockFile.getAbsolutePath()); + Lock clientLock = uk.ac.vamsas.client.simpleclient.LockFactory.getLock(clientlockFile, false); + if (clientLock==null || !clientLock.isLocked()) + { + log.fatal("IMPLEMENTATION ERROR: Couldn't get a lock for the client lock file "+clientlockFile); + } + activeClientFilelock = clientLock; + } + /** + * @return the clientlockFile + */ + protected File getClientlockFile() { + return clientlockFile; + } }