s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More functionality which didn't need to be moved to FileProjectManager, as it wasn't file system specific, has been moved back to ProjectManager.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@992 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Iain Sproat 2010-06-18 20:47:15 +00:00
parent c72b4571a5
commit 0af7e5fcf5
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main/src/com/metaweb/gridworks/ProjectManager.java
View File

@ -86,10 +86,33 @@ public abstract class ProjectManager {
public abstract void exportProject(long projectId, TarOutputStream tos) throws IOException; public abstract void exportProject(long projectId, TarOutputStream tos) throws IOException;
/** /**
* * Saves a project and its metadata to the data store
* @param id * @param id
*/ */
public abstract void ensureProjectSaved(long id); public void ensureProjectSaved(long id) {
synchronized(this){
ProjectMetadata metadata = _projectsMetadata.get(id);
if (metadata != null) {
try {
saveMetadata(metadata, id);
} catch (Exception e) {
e.printStackTrace();
}
}
Project project = _projects.get(id);
if (project != null && metadata.getModified().after(project.lastSave)) {
try {
saveProject(project);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
protected abstract void saveMetadata(ProjectMetadata metadata, long projectId) throws Exception;
protected abstract void saveProject(Project project);
public ProjectMetadata getProjectMetadata(long id) { public ProjectMetadata getProjectMetadata(long id) {
return _projectsMetadata.get(id); return _projectsMetadata.get(id);

36
main/src/com/metaweb/gridworks/io/FileProjectManager.java
View File

@ -179,37 +179,17 @@ public class FileProjectManager extends ProjectManager {
} }
} }
/** @Override
* Make sure that a project's metadata and data are saved to file. For example, protected void saveMetadata(ProjectMetadata metadata, long projectId) throws Exception {
* this method is called before the project is exported to a .tar file. File projectDir = getProjectDir(projectId);
* ProjectMetadataUtilities.save(metadata, projectDir);
* @param id
*/
public void ensureProjectSaved(long id) {
synchronized (this) {
File projectDir = getProjectDir(id);
ProjectMetadata metadata = _projectsMetadata.get(id);
if (metadata != null) {
try {
ProjectMetadataUtilities.save(metadata, projectDir);
} catch (Exception e) {
e.printStackTrace();
}
}
Project project = _projects.get(id);
if (project != null && metadata.getModified().after(project.lastSave)) {
try {
ProjectUtilities.save(project);
} catch (Exception e) {
e.printStackTrace();
}
}
}
} }
@Override @Override
protected void saveProject(Project project){
ProjectUtilities.save(project);
}
public Project loadProject(long id) { public Project loadProject(long id) {
return ProjectUtilities.load(getProjectDir(id), id); return ProjectUtilities.load(getProjectDir(id), id);
} }