X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FGraphClientImpl2.java;h=172fdd103150f28b88fac4ce604a74723e49b504;hb=HEAD;hp=7a57053bcf6aa9f1af09548424bfe00c59456751;hpb=751ee12501d220832b672dd433655a4d65806fd9;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
index 7a57053bc..172fdd103 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
@@ -17,6 +17,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -45,19 +47,23 @@ import org.simantics.db.exception.SDBException;
 import org.simantics.db.server.ProCoreException;
 import org.simantics.db.service.ClusterSetsSupport;
 import org.simantics.db.service.ClusterUID;
+import org.simantics.db.service.EventSupport;
 import org.simantics.db.service.LifecycleSupport;
-import org.simantics.utils.DataContainer;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.logging.TimeLogger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fi.vtt.simantics.procore.internal.EventSupportImpl;
 import gnu.trove.map.hash.TLongObjectHashMap;
 
 public class GraphClientImpl2 implements Database.Session {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GraphClientImpl2.class);
 	public static final boolean DEBUG = false;
+	
+	public static final String CLOSE = "close";
+	public static final String PURGE = "purge";
 
 	final ClusterManager clusters;
 
@@ -68,7 +74,9 @@ public class GraphClientImpl2 implements Database.Session {
 	private Path dbFolder;
 	private final Database database;
 	private ServiceLocator locator;
+	private FileCache fileCache;
 	private MainProgram mainProgram;
+	private EventSupportImpl eventSupport;
 
 	private static class ClientThreadFactory implements ThreadFactory {
 
@@ -92,13 +100,18 @@ public class GraphClientImpl2 implements Database.Session {
 	    this.database = database;
 	    this.dbFolder = dbFolder;
 	    this.locator = locator;
-	    this.clusters = new ClusterManager(dbFolder);
+	    this.fileCache = new FileCache();
+	    // This disposes the cache when the session is shut down 
+	    locator.registerService(FileCache.class, fileCache);
+	    this.clusters = new ClusterManager(dbFolder, fileCache);
 	    load();
 	    ClusterSetsSupport cssi = locator.getService(ClusterSetsSupport.class);
 	    cssi.setReadDirectory(clusters.lastSessionDirectory);
 	    cssi.updateWriteDirectory(clusters.workingDirectory);
 	    mainProgram = new MainProgram(this, clusters);
 	    executor.execute(mainProgram);
+	    eventSupport = (EventSupportImpl)locator.getService(EventSupport.class);
+	    
 	}
 
 	public Path getDbFolder() {
@@ -213,6 +226,7 @@ public class GraphClientImpl2 implements Database.Session {
 				throw new ProCoreException(e1);
 			}
 			closed = true;
+			eventSupport.fireEvent(CLOSE, null);
 		}
 		//impl.close();
 	}
@@ -685,7 +699,7 @@ public class GraphClientImpl2 implements Database.Session {
 		    						LOGGER.info("performUndo " + ccsid);
 		    					performUndo(ccsid, clusterChanges, support);
 		    				} catch (DatabaseException e) {
-		    					e.printStackTrace();
+		    					LOGGER.error("failed to perform undo for cluster change set {}", ccsid, e);
 		    				}
 		    			}
 		    		}
@@ -794,8 +808,10 @@ public class GraphClientImpl2 implements Database.Session {
 					unexpectedClose = true;
 				} finally {
 					try {
-						if(tr != null)
+						if(tr != null) {
 							endTransaction(tr.getTransactionId());
+							eventSupport.fireEvent(PURGE, null);
+						}
 						if (unexpectedClose) {
 							LifecycleSupport support = getServiceLocator().getService(LifecycleSupport.class);
 							try {