From bf79b24bf326e898a4c7802a3063e0d20b8c2e27 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Sat, 6 Feb 2010 02:54:01 +0000 Subject: [PATCH] A bit more modeling for the proto-graph. Two spinners to prepare for more async UI indications. git-svn-id: http://google-refine.googlecode.com/svn/trunk@55 7d457c2a-affb-35e4-300a-418c747d4874 --- .../gridworks/protograph/AnonymousNode.java | 6 ++++ .../gridworks/protograph/CellNode.java | 32 ++++++++++++++++++ ...{TopicNode.java => ExistingTopicNode.java} | 4 +-- .../gridworks/protograph/FreebaseTopic.java | 16 +++------ .../gridworks/protograph/FreebaseType.java | 5 ++- .../metaweb/gridworks/protograph/NewNode.java | 18 ---------- src/main/webapp/images/large-spinner.gif | Bin 0 -> 3208 bytes src/main/webapp/images/small-spinner.gif | Bin 0 -> 1849 bytes 8 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/metaweb/gridworks/protograph/CellNode.java rename src/main/java/com/metaweb/gridworks/protograph/{TopicNode.java => ExistingTopicNode.java} (77%) delete mode 100644 src/main/java/com/metaweb/gridworks/protograph/NewNode.java create mode 100644 src/main/webapp/images/large-spinner.gif create mode 100644 src/main/webapp/images/small-spinner.gif diff --git a/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java b/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java index 980c9fe1d..24fca46e6 100644 --- a/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java +++ b/src/main/java/com/metaweb/gridworks/protograph/AnonymousNode.java @@ -7,6 +7,12 @@ import org.json.JSONWriter; public class AnonymousNode extends Node { private static final long serialVersionUID = -6956243664838720646L; + + final public FreebaseType type; + + public AnonymousNode(FreebaseType type) { + this.type = type; + } @Override public void write(JSONWriter writer, Properties options) diff --git a/src/main/java/com/metaweb/gridworks/protograph/CellNode.java b/src/main/java/com/metaweb/gridworks/protograph/CellNode.java new file mode 100644 index 000000000..0a30b7c6d --- /dev/null +++ b/src/main/java/com/metaweb/gridworks/protograph/CellNode.java @@ -0,0 +1,32 @@ +package com.metaweb.gridworks.protograph; + +import java.util.Properties; + +import org.json.JSONException; +import org.json.JSONWriter; + +public class CellNode extends Node { + private static final long serialVersionUID = 5820786756175547307L; + + final public int cellIndex; + final public boolean createUnlessRecon; + final public FreebaseType type; + + public CellNode( + int cellIndex, + boolean createUnlessRecon, + FreebaseType type + ) { + this.cellIndex = cellIndex; + this.createUnlessRecon = createUnlessRecon; + this.type = type; + } + + @Override + public void write(JSONWriter writer, Properties options) + throws JSONException { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/com/metaweb/gridworks/protograph/TopicNode.java b/src/main/java/com/metaweb/gridworks/protograph/ExistingTopicNode.java similarity index 77% rename from src/main/java/com/metaweb/gridworks/protograph/TopicNode.java rename to src/main/java/com/metaweb/gridworks/protograph/ExistingTopicNode.java index 84d436a18..1e96c9be5 100644 --- a/src/main/java/com/metaweb/gridworks/protograph/TopicNode.java +++ b/src/main/java/com/metaweb/gridworks/protograph/ExistingTopicNode.java @@ -5,12 +5,12 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -public class TopicNode extends Node { +public class ExistingTopicNode extends Node { private static final long serialVersionUID = 8418548867745587387L; final protected FreebaseTopic _topic; - public TopicNode(FreebaseTopic topic) { + public ExistingTopicNode(FreebaseTopic topic) { _topic = topic; } diff --git a/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java b/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java index f4b4ee051..cd379f03e 100644 --- a/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java +++ b/src/main/java/com/metaweb/gridworks/protograph/FreebaseTopic.java @@ -11,22 +11,14 @@ import com.metaweb.gridworks.Jsonizable; public class FreebaseTopic implements Serializable, Jsonizable { private static final long serialVersionUID = -3427885694129112432L; - final protected String _id; - final protected String _name; + final public String id; + final public String name; public FreebaseTopic(String id, String name) { - _id = id; - _name = name; + this.id = id; + this.name = name; } - public String getID() { - return _id; - } - - public String getName() { - return _name; - } - @Override public void write(JSONWriter writer, Properties options) throws JSONException { diff --git a/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java b/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java index 4b6abd9ca..89329e8ca 100644 --- a/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java +++ b/src/main/java/com/metaweb/gridworks/protograph/FreebaseType.java @@ -2,9 +2,12 @@ package com.metaweb.gridworks.protograph; public class FreebaseType extends FreebaseTopic { private static final long serialVersionUID = -3070300264980791404L; + + final public boolean compoundValueType; - public FreebaseType(String id, String name) { + public FreebaseType(String id, String name, boolean compoundValueType) { super(id, name); + this.compoundValueType = compoundValueType; } } diff --git a/src/main/java/com/metaweb/gridworks/protograph/NewNode.java b/src/main/java/com/metaweb/gridworks/protograph/NewNode.java deleted file mode 100644 index b0deca256..000000000 --- a/src/main/java/com/metaweb/gridworks/protograph/NewNode.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.metaweb.gridworks.protograph; - -import java.util.Properties; - -import org.json.JSONException; -import org.json.JSONWriter; - -public class NewNode extends Node { - private static final long serialVersionUID = 5820786756175547307L; - - @Override - public void write(JSONWriter writer, Properties options) - throws JSONException { - // TODO Auto-generated method stub - - } - -} diff --git a/src/main/webapp/images/large-spinner.gif b/src/main/webapp/images/large-spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..3288d1035d70bb86517e2c233f1a904e41f06b29 GIT binary patch literal 3208 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 EAHN$8j{pDw literal 0 HcmV?d00001