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

Allowed a single operation class to be registered under several names, so that we can rename operations (to better names) while maintaining backward compatibility.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1443 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-10-07 05:42:01 +00:00
parent 1de5e7c00e
commit 9ea477c80d
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main/src/com/google/refine/operations/OperationRegistry.java
View File

@ -2,6 +2,8 @@ package com.google.refine.operations;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map; import java.util.Map;
import org.json.JSONObject; import org.json.JSONObject;
@ -13,14 +15,23 @@ import edu.mit.simile.butterfly.ButterflyModule;
public abstract class OperationRegistry { public abstract class OperationRegistry {
static final public Map<String, Class<? extends AbstractOperation>> s_opNameToClass = new HashMap<String, Class<? extends AbstractOperation>>(); static final public Map<String, List<Class<? extends AbstractOperation>>> s_opNameToClass =
static final public Map<Class<? extends AbstractOperation>, String> s_opClassToName = new HashMap<Class<? extends AbstractOperation>, String>(); new HashMap<String, List<Class<? extends AbstractOperation>>>();
static final public Map<Class<? extends AbstractOperation>, String> s_opClassToName =
new HashMap<Class<? extends AbstractOperation>, String>();
static public void registerOperation(ButterflyModule module, String name, Class<? extends AbstractOperation> klass) { static public void registerOperation(ButterflyModule module, String name, Class<? extends AbstractOperation> klass) {
String key = module.getName() + "/" + name; String key = module.getName() + "/" + name;
s_opNameToClass.put(key, klass);
s_opClassToName.put(klass, key); s_opClassToName.put(klass, key);
List<Class<? extends AbstractOperation>> classes = s_opNameToClass.get(key);
if (classes == null) {
classes = new LinkedList<Class<? extends AbstractOperation>>();
s_opNameToClass.put(key, classes);
}
classes.add(klass);
} }
static public AbstractOperation reconstruct(Project project, JSONObject obj) { static public AbstractOperation reconstruct(Project project, JSONObject obj) {
@ -30,8 +41,10 @@ public abstract class OperationRegistry {
op = "core/" + op; // backward compatible op = "core/" + op; // backward compatible
} }
Class<? extends AbstractOperation> klass = OperationRegistry.s_opNameToClass.get(op); List<Class<? extends AbstractOperation>> classes = s_opNameToClass.get(op);
if (klass != null) { if (classes != null && classes.size() > 0) {
Class<? extends AbstractOperation> klass = classes.get(classes.size() - 1);
Method reconstruct = klass.getMethod("reconstruct", Project.class, JSONObject.class); Method reconstruct = klass.getMethod("reconstruct", Project.class, JSONObject.class);
if (reconstruct != null) { if (reconstruct != null) {
return (AbstractOperation) reconstruct.invoke(null, project, obj); return (AbstractOperation) reconstruct.invoke(null, project, obj);

10
main/src/com/google/refine/operations/SaveProtographOperation.java
View File

@ -35,22 +35,20 @@ public class SaveProtographOperation extends AbstractOperation {
writer.object(); writer.object();
writer.key("op"); writer.value(OperationRegistry.s_opClassToName.get(this.getClass())); writer.key("op"); writer.value(OperationRegistry.s_opClassToName.get(this.getClass()));
writer.key("description"); writer.value("Save protograph"); writer.key("description"); writer.value(getBriefDescription());
writer.key("protograph"); _protograph.write(writer, options); writer.key("protograph"); _protograph.write(writer, options);
writer.endObject(); writer.endObject();
} }
protected String getBriefDescription(Project project) { protected String getBriefDescription() {
return "Save schema skeleton"; return "Save schema alignment skeleton";
} }
@Override @Override
protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception { protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {
String description = "Save schema-alignment protograph";
Change change = new ProtographChange(_protograph); Change change = new ProtographChange(_protograph);
return new HistoryEntry(historyEntryID, project, description, SaveProtographOperation.this, change); return new HistoryEntry(historyEntryID, project, getBriefDescription(), SaveProtographOperation.this, change);
} }
static public class ProtographChange implements Change { static public class ProtographChange implements Change {

2
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -139,7 +139,9 @@ function registerOperations() {
OR.registerOperation(module, "recon-judge-similar-cells", Packages.com.google.refine.operations.recon.ReconJudgeSimilarCellsOperation); OR.registerOperation(module, "recon-judge-similar-cells", Packages.com.google.refine.operations.recon.ReconJudgeSimilarCellsOperation);
OR.registerOperation(module, "import-qa-data", Packages.com.google.refine.operations.recon.ImportQADataOperation); OR.registerOperation(module, "import-qa-data", Packages.com.google.refine.operations.recon.ImportQADataOperation);
// for backward compatibility
OR.registerOperation(module, "save-protograph", Packages.com.google.refine.operations.SaveProtographOperation); OR.registerOperation(module, "save-protograph", Packages.com.google.refine.operations.SaveProtographOperation);
OR.registerOperation(module, "save-schema-alignment-skeleton", Packages.com.google.refine.operations.SaveProtographOperation);
} }
/* /*