From 18e319bb76e217917978524539cf9e905ed5e228 Mon Sep 17 00:00:00 2001
From: Iain Sproat <iainsproat@gmail.com>
Date: Wed, 16 Jun 2010 14:17:17 +0000
Subject: [PATCH] Moved call to FileHistoryEntryManager from ProjectManager to
 FileProjectManager.

Added interface HistoryEntryManager, which seems to have been forgotten from last commit.
FileHistoryEntry is now named FileHistoryEntryManager.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@983 7d457c2a-affb-35e4-300a-418c747d4874
---
 main/src/com/metaweb/gridworks/ProjectManager.java   |  8 +-------
 .../gridworks/history/HistoryEntryManager.java       | 12 ++++++++++++
 ...istoryEntry.java => FileHistoryEntryManager.java} |  4 ++--
 .../com/metaweb/gridworks/io/FileProjectManager.java |  7 +++++--
 4 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 main/src/com/metaweb/gridworks/history/HistoryEntryManager.java
 rename main/src/com/metaweb/gridworks/io/{FileHistoryEntry.java => FileHistoryEntryManager.java} (94%)

diff --git a/main/src/com/metaweb/gridworks/ProjectManager.java b/main/src/com/metaweb/gridworks/ProjectManager.java
index 1912c6263..224239308 100644
--- a/main/src/com/metaweb/gridworks/ProjectManager.java
+++ b/main/src/com/metaweb/gridworks/ProjectManager.java
@@ -41,8 +41,6 @@ public abstract class ProjectManager {
      */
     transient protected Map<Long, Project> _projects;
 
-    protected HistoryEntryManager _historyEntryManager;
-
     static public ProjectManager singleton;
 
     public InterProjectModel getInterProjectModel() {
@@ -125,9 +123,5 @@ public abstract class ProjectManager {
 
     public abstract void deleteProject(long projectID) ;
 
-    //public abstract HistoryEntry createHistoryEntry(long id, long projectID, String description, AbstractOperation operation, Date time);
-    //public abstract HistoryEntry createHistoryEntry(long id, Project project, String description, AbstractOperation operation, Change change);
-    public HistoryEntryManager getHistoryEntryManager(){
-        return this._historyEntryManager;
-    }
+    public abstract HistoryEntryManager getHistoryEntryManager();
 }
diff --git a/main/src/com/metaweb/gridworks/history/HistoryEntryManager.java b/main/src/com/metaweb/gridworks/history/HistoryEntryManager.java
new file mode 100644
index 000000000..f4915ed19
--- /dev/null
+++ b/main/src/com/metaweb/gridworks/history/HistoryEntryManager.java
@@ -0,0 +1,12 @@
+package com.metaweb.gridworks.history;
+
+import java.io.Writer;
+import java.util.Properties;
+
+
+public interface HistoryEntryManager {
+    public void loadChange(HistoryEntry historyEntry);
+    public void saveChange(HistoryEntry historyEntry) throws Exception;
+    public void save(HistoryEntry historyEntry, Writer writer, Properties options);
+    public void delete(HistoryEntry historyEntry);
+}
diff --git a/main/src/com/metaweb/gridworks/io/FileHistoryEntry.java b/main/src/com/metaweb/gridworks/io/FileHistoryEntryManager.java
similarity index 94%
rename from main/src/com/metaweb/gridworks/io/FileHistoryEntry.java
rename to main/src/com/metaweb/gridworks/io/FileHistoryEntryManager.java
index 3c41d2639..c2b77dc22 100644
--- a/main/src/com/metaweb/gridworks/io/FileHistoryEntry.java
+++ b/main/src/com/metaweb/gridworks/io/FileHistoryEntryManager.java
@@ -19,7 +19,7 @@ import com.metaweb.gridworks.history.HistoryEntryManager;
 import com.metaweb.gridworks.util.Pool;
 
 
-public class FileHistoryEntry implements HistoryEntryManager{
+public class FileHistoryEntryManager implements HistoryEntryManager{
 
     public void delete(HistoryEntry historyEntry) {
         File file = getChangeFile(historyEntry);
@@ -106,4 +106,4 @@ public class FileHistoryEntry implements HistoryEntryManager{
 
         return dir;
     }
-}
+}
\ No newline at end of file
diff --git a/main/src/com/metaweb/gridworks/io/FileProjectManager.java b/main/src/com/metaweb/gridworks/io/FileProjectManager.java
index c3ff3f414..75e6f4d01 100644
--- a/main/src/com/metaweb/gridworks/io/FileProjectManager.java
+++ b/main/src/com/metaweb/gridworks/io/FileProjectManager.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 
 import com.metaweb.gridworks.ProjectManager;
 import com.metaweb.gridworks.ProjectMetadata;
+import com.metaweb.gridworks.history.HistoryEntryManager;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.util.JSONUtilities;
 
@@ -55,8 +56,6 @@ public class FileProjectManager extends ProjectManager{
         _expressions = new LinkedList<String>();
         _projects = new HashMap<Long, Project>();
 
-        _historyEntryManager = new FileHistoryEntry();
-
         load();
     }
 
@@ -445,4 +444,8 @@ public class FileProjectManager extends ProjectManager{
 
         return found;
     }
+
+    public HistoryEntryManager getHistoryEntryManager(){
+        return new FileHistoryEntryManager();
+    }
 }