From acfa19a68301b11f2ac17062e21c86a40c673e13 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Mon, 1 Mar 2010 01:30:31 +0000 Subject: [PATCH] Moved GEL stuff (gridworks expression language) into gel package. git-svn-id: http://google-refine.googlecode.com/svn/trunk@158 7d457c2a-affb-35e4-300a-418c747d4874 --- .../gridworks/browsing/facets/ListFacet.java | 2 +- .../gridworks/browsing/facets/RangeFacet.java | 2 +- .../browsing/facets/TextSearchFacet.java | 2 +- .../GetExpressionLanguageInfoCommand.java | 6 ++--- .../util/PreviewExpressionCommand.java | 2 +- .../metaweb/gridworks/expr/functions/Get.java | 2 +- .../gridworks/expr/functions/Length.java | 4 ++-- .../gridworks/expr/functions/Slice.java | 2 +- .../gridworks/expr/functions/ToDate.java | 2 +- .../gridworks/expr/functions/ToNumber.java | 2 +- .../gridworks/expr/functions/ToString.java | 2 +- .../gridworks/expr/functions/arrays/Join.java | 4 ++-- .../expr/functions/arrays/Reverse.java | 4 ++-- .../gridworks/expr/functions/arrays/Sort.java | 4 ++-- .../expr/functions/booleans/And.java | 2 +- .../expr/functions/booleans/Not.java | 4 ++-- .../gridworks/expr/functions/booleans/Or.java | 2 +- .../gridworks/expr/functions/date/Now.java | 2 +- .../gridworks/expr/functions/math/Ceil.java | 4 ++-- .../gridworks/expr/functions/math/Exp.java | 2 +- .../gridworks/expr/functions/math/Floor.java | 4 ++-- .../gridworks/expr/functions/math/Ln.java | 4 ++-- .../gridworks/expr/functions/math/Log.java | 4 ++-- .../gridworks/expr/functions/math/Max.java | 4 ++-- .../gridworks/expr/functions/math/Min.java | 4 ++-- .../gridworks/expr/functions/math/Mod.java | 4 ++-- .../gridworks/expr/functions/math/Pow.java | 2 +- .../gridworks/expr/functions/math/Round.java | 4 ++-- .../expr/functions/strings/Chomp.java | 2 +- .../expr/functions/strings/Contains.java | 2 +- .../expr/functions/strings/Diff.java | 2 +- .../expr/functions/strings/EndsWith.java | 4 ++-- .../expr/functions/strings/Fingerprint.java | 4 ++-- .../expr/functions/strings/IndexOf.java | 4 ++-- .../expr/functions/strings/LastIndexOf.java | 4 ++-- .../gridworks/expr/functions/strings/MD5.java | 4 ++-- .../expr/functions/strings/Partition.java | 2 +- .../expr/functions/strings/Phonetic.java | 4 ++-- .../expr/functions/strings/RPartition.java | 2 +- .../expr/functions/strings/Reinterpret.java | 4 ++-- .../expr/functions/strings/Replace.java | 4 ++-- .../expr/functions/strings/ReplaceChars.java | 4 ++-- .../expr/functions/strings/ReplaceRegexp.java | 4 ++-- .../expr/functions/strings/SHA1.java | 4 ++-- .../expr/functions/strings/Split.java | 4 ++-- .../functions/strings/SplitByCharType.java | 4 ++-- .../expr/functions/strings/StartsWith.java | 4 ++-- .../expr/functions/strings/ToLowercase.java | 4 ++-- .../expr/functions/strings/ToTitlecase.java | 4 ++-- .../expr/functions/strings/ToUppercase.java | 4 ++-- .../expr/functions/strings/Trim.java | 2 +- .../expr/functions/strings/Unescape.java | 4 ++-- .../expr/functions/strings/Unicode.java | 2 +- .../expr/functions/strings/UnicodeType.java | 2 +- .../gridworks/{expr => gel}/Control.java | 3 ++- .../ControlFunctionRegistry.java | 20 ++++++++--------- .../gridworks/{expr => gel}/Function.java | 2 +- .../gridworks/{expr => gel}/Parser.java | 22 ++++++++++--------- .../gridworks/{expr => gel}/Scanner.java | 2 +- .../{expr => gel}/ast/ControlCallExpr.java | 4 ++-- .../{expr => gel}/ast/FieldAccessorExpr.java | 2 +- .../{expr => gel}/ast/FunctionCallExpr.java | 4 ++-- .../{expr => gel}/ast/LiteralExpr.java | 2 +- .../{expr => gel}/ast/OperatorCallExpr.java | 2 +- .../{expr => gel}/ast/VariableExpr.java | 2 +- .../{expr => gel}/controls/ForEach.java | 8 +++---- .../{expr => gel}/controls/ForNonBlank.java | 8 +++---- .../gridworks/{expr => gel}/controls/If.java | 6 ++--- .../{expr => gel}/controls/IsBlank.java | 2 +- .../{expr => gel}/controls/IsNonBlank.java | 2 +- .../{expr => gel}/controls/IsNotNull.java | 2 +- .../{expr => gel}/controls/IsNull.java | 2 +- .../{expr => gel}/controls/IsNumeric.java | 2 +- .../{expr => gel}/controls/IsTest.java | 6 ++--- .../{expr => gel}/controls/With.java | 8 +++---- .../operations/ColumnAdditionOperation.java | 2 +- .../operations/TextTransformOperation.java | 2 +- 77 files changed, 146 insertions(+), 143 deletions(-) rename src/main/java/com/metaweb/gridworks/{expr => gel}/Control.java (71%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ControlFunctionRegistry.java (93%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/Function.java (79%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/Parser.java (87%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/Scanner.java (94%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ast/ControlCallExpr.java (85%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ast/FieldAccessorExpr.java (92%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ast/FunctionCallExpr.java (88%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ast/LiteralExpr.java (88%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ast/OperatorCallExpr.java (95%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/ast/VariableExpr.java (86%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/ForEach.java (91%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/ForNonBlank.java (90%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/If.java (89%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/IsBlank.java (84%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/IsNonBlank.java (84%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/IsNotNull.java (80%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/IsNull.java (79%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/IsNumeric.java (90%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/IsTest.java (88%) rename src/main/java/com/metaweb/gridworks/{expr => gel}/controls/With.java (89%) diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java index 7a0c77a4c..7d9affbc4 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java @@ -14,7 +14,7 @@ import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.filters.ExpressionEqualRowFilter; import com.metaweb.gridworks.browsing.filters.RowFilter; import com.metaweb.gridworks.expr.Evaluable; -import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.gel.Parser; import com.metaweb.gridworks.model.Project; public class ListFacet implements Facet { diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java index d5960d8d4..61469ef87 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java @@ -10,7 +10,7 @@ import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.filters.ExpressionNumberComparisonRowFilter; import com.metaweb.gridworks.browsing.filters.RowFilter; import com.metaweb.gridworks.expr.Evaluable; -import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.gel.Parser; import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java index 163369b3e..5bebe4089 100644 --- a/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java @@ -10,7 +10,7 @@ import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.filters.ExpressionStringComparisonRowFilter; import com.metaweb.gridworks.browsing.filters.RowFilter; import com.metaweb.gridworks.expr.Evaluable; -import com.metaweb.gridworks.expr.ast.VariableExpr; +import com.metaweb.gridworks.gel.ast.VariableExpr; import com.metaweb.gridworks.model.Project; public class TextSearchFacet implements Facet { diff --git a/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java b/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java index bdd5eeb72..34eca1e31 100644 --- a/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java @@ -11,9 +11,9 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONWriter; import com.metaweb.gridworks.commands.Command; -import com.metaweb.gridworks.expr.Control; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Control; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class GetExpressionLanguageInfoCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java b/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java index 4966b9871..02d896439 100644 --- a/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java @@ -16,8 +16,8 @@ import com.metaweb.gridworks.expr.EvalError; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; import com.metaweb.gridworks.expr.HasFields; -import com.metaweb.gridworks.expr.Parser; import com.metaweb.gridworks.expr.ParsingException; +import com.metaweb.gridworks.gel.Parser; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Get.java b/src/main/java/com/metaweb/gridworks/expr/functions/Get.java index d1f017885..e0d623884 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Get.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Get.java @@ -5,8 +5,8 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.HasFields; +import com.metaweb.gridworks.gel.Function; public class Get implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Length.java b/src/main/java/com/metaweb/gridworks/expr/functions/Length.java index 60765cda0..43cf1f50e 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Length.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Length.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Length implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/Slice.java b/src/main/java/com/metaweb/gridworks/expr/functions/Slice.java index 3e2cb45aa..d02d4d7b9 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/Slice.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Slice.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Slice implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/ToDate.java b/src/main/java/com/metaweb/gridworks/expr/functions/ToDate.java index b1f9c700c..e46203862 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/ToDate.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/ToDate.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.util.CalendarParser; import com.metaweb.gridworks.expr.util.CalendarParserException; +import com.metaweb.gridworks.gel.Function; public class ToDate implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java b/src/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java index 28c56e270..9dc48c3e0 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class ToNumber implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/ToString.java b/src/main/java/com/metaweb/gridworks/expr/functions/ToString.java index 5279ae4f7..51c7b4d6b 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/ToString.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/ToString.java @@ -7,7 +7,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class ToString implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java index b04382f87..823dd1445 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Join implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java index c6f2181e7..03ca446b1 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Reverse implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java index 1835e9aa6..a300167dd 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java @@ -6,9 +6,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Sort implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java index 4411c5464..3608e950c 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class And implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java index 5cac8bf1b..3820ee955 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Not implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java index e9309edb5..2f8a070ea 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Or implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/date/Now.java b/src/main/java/com/metaweb/gridworks/expr/functions/date/Now.java index c5958dea5..0698ec78a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/date/Now.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/date/Now.java @@ -6,7 +6,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Now implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java index ebaa4b6e1..b7f83c016 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Ceil implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Exp.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Exp.java index c60de41b2..3af4b22e0 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Exp.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Exp.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Exp implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java index acd1c8a9d..9d04f3928 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Floor implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java index c1ac28e79..3c9f8f585 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Ln implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java index 2a4904f64..c34a28242 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Log implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java index 991a0653d..7d9dcabd3 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Max implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java index f709838e2..e371372e2 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Min implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java index 7048bda3a..d367e65c8 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Mod implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Pow.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Pow.java index 666f64876..5f679886c 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Pow.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Pow.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Pow implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java b/src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java index fa793fb4e..a2e927308 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Round implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java index 50f3c04e7..463268300 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java @@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Chomp implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java index 2fd637b16..49f17c50e 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Contains implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java index 3ed9a84c7..ca6f02092 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java @@ -7,9 +7,9 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.util.CalendarParser; import com.metaweb.gridworks.expr.util.CalendarParserException; +import com.metaweb.gridworks.gel.Function; public class Diff implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java index cc4bb3163..4ed10317c 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class EndsWith implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java index 117a7067a..a08f4e822 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java @@ -8,9 +8,9 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Fingerprint implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java index 361f25426..1c9ec614d 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class IndexOf implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java index 6c6a201d9..1f68fb964 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class LastIndexOf implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java index 471d70996..0cd29e915 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java @@ -6,9 +6,9 @@ import org.apache.commons.codec.digest.DigestUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class MD5 implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java index 1fa6189ce..0bf7996ac 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Partition implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java index 7ccf39681..f36658aeb 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java @@ -8,9 +8,9 @@ import org.apache.commons.codec.language.Soundex; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Phonetic implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java index 5d716f5fe..15543f887 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class RPartition implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java index d413a0176..57face5a2 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java @@ -6,9 +6,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Reinterpret implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java index 896f9abde..a850ecc9c 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Replace implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java index 76d17bd44..6fbd34840 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java @@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class ReplaceChars implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceRegexp.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceRegexp.java index c85d8a31f..4f025c1ca 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceRegexp.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceRegexp.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class ReplaceRegexp implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java index 62bc3c921..26fcee678 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java @@ -6,9 +6,9 @@ import org.apache.commons.codec.digest.DigestUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class SHA1 implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java index 640c85a5e..a5f66e91a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Split implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java index 4a0efc01b..5e07b08da 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java @@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class SplitByCharType implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java index 12aa39043..7d470c7bb 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class StartsWith implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java index 28d9152ab..604dc72fd 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class ToLowercase implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java index e8829e110..49413aef9 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class ToTitlecase implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java index 1d5cc5ed5..991ade76a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java @@ -5,9 +5,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; -import com.metaweb.gridworks.expr.Function; import com.metaweb.gridworks.expr.EvalError; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class ToUppercase implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java index dfe9ec3b8..bb1ab0398 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Trim implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java index a9ace7e03..dc3279443 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java @@ -8,9 +8,9 @@ import org.apache.commons.lang.StringEscapeUtils; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.Function; public class Unescape implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java index 0c14f3a65..b51c408f1 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class Unicode implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java b/src/main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java index 9ccc73ca9..496127dd6 100644 --- a/src/main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java @@ -5,7 +5,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class UnicodeType implements Function { diff --git a/src/main/java/com/metaweb/gridworks/expr/Control.java b/src/main/java/com/metaweb/gridworks/gel/Control.java similarity index 71% rename from src/main/java/com/metaweb/gridworks/expr/Control.java rename to src/main/java/com/metaweb/gridworks/gel/Control.java index 185e1a403..abc906a29 100644 --- a/src/main/java/com/metaweb/gridworks/expr/Control.java +++ b/src/main/java/com/metaweb/gridworks/gel/Control.java @@ -1,8 +1,9 @@ -package com.metaweb.gridworks.expr; +package com.metaweb.gridworks.gel; import java.util.Properties; import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.expr.Evaluable; public interface Control extends Jsonizable { public Object call(Properties bindings, Evaluable[] args); diff --git a/src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java b/src/main/java/com/metaweb/gridworks/gel/ControlFunctionRegistry.java similarity index 93% rename from src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java rename to src/main/java/com/metaweb/gridworks/gel/ControlFunctionRegistry.java index a5822f312..511c73d35 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ControlFunctionRegistry.java +++ b/src/main/java/com/metaweb/gridworks/gel/ControlFunctionRegistry.java @@ -1,19 +1,10 @@ -package com.metaweb.gridworks.expr; +package com.metaweb.gridworks.gel; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import com.metaweb.gridworks.expr.controls.ForEach; -import com.metaweb.gridworks.expr.controls.ForNonBlank; -import com.metaweb.gridworks.expr.controls.If; -import com.metaweb.gridworks.expr.controls.IsBlank; -import com.metaweb.gridworks.expr.controls.IsNonBlank; -import com.metaweb.gridworks.expr.controls.IsNotNull; -import com.metaweb.gridworks.expr.controls.IsNull; -import com.metaweb.gridworks.expr.controls.IsNumeric; -import com.metaweb.gridworks.expr.controls.With; import com.metaweb.gridworks.expr.functions.Get; import com.metaweb.gridworks.expr.functions.Length; import com.metaweb.gridworks.expr.functions.Slice; @@ -61,6 +52,15 @@ import com.metaweb.gridworks.expr.functions.strings.Trim; import com.metaweb.gridworks.expr.functions.strings.Unescape; import com.metaweb.gridworks.expr.functions.strings.Unicode; import com.metaweb.gridworks.expr.functions.strings.UnicodeType; +import com.metaweb.gridworks.gel.controls.ForEach; +import com.metaweb.gridworks.gel.controls.ForNonBlank; +import com.metaweb.gridworks.gel.controls.If; +import com.metaweb.gridworks.gel.controls.IsBlank; +import com.metaweb.gridworks.gel.controls.IsNonBlank; +import com.metaweb.gridworks.gel.controls.IsNotNull; +import com.metaweb.gridworks.gel.controls.IsNull; +import com.metaweb.gridworks.gel.controls.IsNumeric; +import com.metaweb.gridworks.gel.controls.With; public class ControlFunctionRegistry { diff --git a/src/main/java/com/metaweb/gridworks/expr/Function.java b/src/main/java/com/metaweb/gridworks/gel/Function.java similarity index 79% rename from src/main/java/com/metaweb/gridworks/expr/Function.java rename to src/main/java/com/metaweb/gridworks/gel/Function.java index 4b647c581..139a5a53a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/Function.java +++ b/src/main/java/com/metaweb/gridworks/gel/Function.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr; +package com.metaweb.gridworks.gel; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/Parser.java b/src/main/java/com/metaweb/gridworks/gel/Parser.java similarity index 87% rename from src/main/java/com/metaweb/gridworks/expr/Parser.java rename to src/main/java/com/metaweb/gridworks/gel/Parser.java index 27711cdc2..3c7bfcee8 100644 --- a/src/main/java/com/metaweb/gridworks/expr/Parser.java +++ b/src/main/java/com/metaweb/gridworks/gel/Parser.java @@ -1,17 +1,19 @@ -package com.metaweb.gridworks.expr; +package com.metaweb.gridworks.gel; import java.util.LinkedList; import java.util.List; -import com.metaweb.gridworks.expr.Scanner.NumberToken; -import com.metaweb.gridworks.expr.Scanner.Token; -import com.metaweb.gridworks.expr.Scanner.TokenType; -import com.metaweb.gridworks.expr.ast.ControlCallExpr; -import com.metaweb.gridworks.expr.ast.FieldAccessorExpr; -import com.metaweb.gridworks.expr.ast.FunctionCallExpr; -import com.metaweb.gridworks.expr.ast.LiteralExpr; -import com.metaweb.gridworks.expr.ast.OperatorCallExpr; -import com.metaweb.gridworks.expr.ast.VariableExpr; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.expr.ParsingException; +import com.metaweb.gridworks.gel.Scanner.NumberToken; +import com.metaweb.gridworks.gel.Scanner.Token; +import com.metaweb.gridworks.gel.Scanner.TokenType; +import com.metaweb.gridworks.gel.ast.ControlCallExpr; +import com.metaweb.gridworks.gel.ast.FieldAccessorExpr; +import com.metaweb.gridworks.gel.ast.FunctionCallExpr; +import com.metaweb.gridworks.gel.ast.LiteralExpr; +import com.metaweb.gridworks.gel.ast.OperatorCallExpr; +import com.metaweb.gridworks.gel.ast.VariableExpr; public class Parser { protected Scanner _scanner; diff --git a/src/main/java/com/metaweb/gridworks/expr/Scanner.java b/src/main/java/com/metaweb/gridworks/gel/Scanner.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/expr/Scanner.java rename to src/main/java/com/metaweb/gridworks/gel/Scanner.java index 0d7d238da..5082c1a6e 100644 --- a/src/main/java/com/metaweb/gridworks/expr/Scanner.java +++ b/src/main/java/com/metaweb/gridworks/gel/Scanner.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr; +package com.metaweb.gridworks.gel; public class Scanner { static public enum TokenType { diff --git a/src/main/java/com/metaweb/gridworks/expr/ast/ControlCallExpr.java b/src/main/java/com/metaweb/gridworks/gel/ast/ControlCallExpr.java similarity index 85% rename from src/main/java/com/metaweb/gridworks/expr/ast/ControlCallExpr.java rename to src/main/java/com/metaweb/gridworks/gel/ast/ControlCallExpr.java index 0be9fd6c6..eb9c2f886 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ast/ControlCallExpr.java +++ b/src/main/java/com/metaweb/gridworks/gel/ast/ControlCallExpr.java @@ -1,9 +1,9 @@ -package com.metaweb.gridworks.expr.ast; +package com.metaweb.gridworks.gel.ast; import java.util.Properties; -import com.metaweb.gridworks.expr.Control; import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.gel.Control; public class ControlCallExpr implements Evaluable { final protected Evaluable[] _args; diff --git a/src/main/java/com/metaweb/gridworks/expr/ast/FieldAccessorExpr.java b/src/main/java/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/expr/ast/FieldAccessorExpr.java rename to src/main/java/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java index 7b77dbb31..654b4ebee 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ast/FieldAccessorExpr.java +++ b/src/main/java/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.ast; +package com.metaweb.gridworks.gel.ast; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/ast/FunctionCallExpr.java b/src/main/java/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/ast/FunctionCallExpr.java rename to src/main/java/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java index 6734d7f70..2ecce6df2 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ast/FunctionCallExpr.java +++ b/src/main/java/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java @@ -1,10 +1,10 @@ -package com.metaweb.gridworks.expr.ast; +package com.metaweb.gridworks.gel.ast; import java.util.Properties; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; -import com.metaweb.gridworks.expr.Function; +import com.metaweb.gridworks.gel.Function; public class FunctionCallExpr implements Evaluable { final protected Evaluable[] _args; diff --git a/src/main/java/com/metaweb/gridworks/expr/ast/LiteralExpr.java b/src/main/java/com/metaweb/gridworks/gel/ast/LiteralExpr.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/ast/LiteralExpr.java rename to src/main/java/com/metaweb/gridworks/gel/ast/LiteralExpr.java index 7346b0b8b..f0b6dc939 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ast/LiteralExpr.java +++ b/src/main/java/com/metaweb/gridworks/gel/ast/LiteralExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.ast; +package com.metaweb.gridworks.gel.ast; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/ast/OperatorCallExpr.java b/src/main/java/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/expr/ast/OperatorCallExpr.java rename to src/main/java/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java index ab9a52030..c26abe8cc 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ast/OperatorCallExpr.java +++ b/src/main/java/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.ast; +package com.metaweb.gridworks.gel.ast; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/ast/VariableExpr.java b/src/main/java/com/metaweb/gridworks/gel/ast/VariableExpr.java similarity index 86% rename from src/main/java/com/metaweb/gridworks/expr/ast/VariableExpr.java rename to src/main/java/com/metaweb/gridworks/gel/ast/VariableExpr.java index a50d4bbd2..b5e990088 100644 --- a/src/main/java/com/metaweb/gridworks/expr/ast/VariableExpr.java +++ b/src/main/java/com/metaweb/gridworks/gel/ast/VariableExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.ast; +package com.metaweb.gridworks.gel.ast; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/ForEach.java b/src/main/java/com/metaweb/gridworks/gel/controls/ForEach.java similarity index 91% rename from src/main/java/com/metaweb/gridworks/expr/controls/ForEach.java rename to src/main/java/com/metaweb/gridworks/gel/controls/ForEach.java index e4f2a2216..1d99c302b 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/ForEach.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/ForEach.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Control; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.EvalError; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; -import com.metaweb.gridworks.expr.ast.VariableExpr; +import com.metaweb.gridworks.gel.Control; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.ast.VariableExpr; public class ForEach implements Control { public String checkArguments(Evaluable[] args) { diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/ForNonBlank.java b/src/main/java/com/metaweb/gridworks/gel/controls/ForNonBlank.java similarity index 90% rename from src/main/java/com/metaweb/gridworks/expr/controls/ForNonBlank.java rename to src/main/java/com/metaweb/gridworks/gel/controls/ForNonBlank.java index 085f9b678..b51ed006a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/ForNonBlank.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/ForNonBlank.java @@ -1,15 +1,15 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Control; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; -import com.metaweb.gridworks.expr.ast.VariableExpr; +import com.metaweb.gridworks.gel.Control; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.ast.VariableExpr; public class ForNonBlank implements Control { public String checkArguments(Evaluable[] args) { diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/If.java b/src/main/java/com/metaweb/gridworks/gel/controls/If.java similarity index 89% rename from src/main/java/com/metaweb/gridworks/expr/controls/If.java rename to src/main/java/com/metaweb/gridworks/gel/controls/If.java index dcbfed226..d5f42267a 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/If.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/If.java @@ -1,14 +1,14 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Control; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; +import com.metaweb.gridworks.gel.Control; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; public class If implements Control { public String checkArguments(Evaluable[] args) { diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/IsBlank.java b/src/main/java/com/metaweb/gridworks/gel/controls/IsBlank.java similarity index 84% rename from src/main/java/com/metaweb/gridworks/expr/controls/IsBlank.java rename to src/main/java/com/metaweb/gridworks/gel/controls/IsBlank.java index 00aba58ff..3e7fad2f7 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/IsBlank.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/IsBlank.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import com.metaweb.gridworks.expr.ExpressionUtils; diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/IsNonBlank.java b/src/main/java/com/metaweb/gridworks/gel/controls/IsNonBlank.java similarity index 84% rename from src/main/java/com/metaweb/gridworks/expr/controls/IsNonBlank.java rename to src/main/java/com/metaweb/gridworks/gel/controls/IsNonBlank.java index 9c88c4688..e6fa15076 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/IsNonBlank.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/IsNonBlank.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import com.metaweb.gridworks.expr.ExpressionUtils; diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/IsNotNull.java b/src/main/java/com/metaweb/gridworks/gel/controls/IsNotNull.java similarity index 80% rename from src/main/java/com/metaweb/gridworks/expr/controls/IsNotNull.java rename to src/main/java/com/metaweb/gridworks/gel/controls/IsNotNull.java index 8c6c6de85..eb5fd39df 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/IsNotNull.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/IsNotNull.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; public class IsNotNull extends IsTest { @Override diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/IsNull.java b/src/main/java/com/metaweb/gridworks/gel/controls/IsNull.java similarity index 79% rename from src/main/java/com/metaweb/gridworks/expr/controls/IsNull.java rename to src/main/java/com/metaweb/gridworks/gel/controls/IsNull.java index 9c9ae2222..e6dc9c8f8 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/IsNull.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/IsNull.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; public class IsNull extends IsTest { @Override diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/IsNumeric.java b/src/main/java/com/metaweb/gridworks/gel/controls/IsNumeric.java similarity index 90% rename from src/main/java/com/metaweb/gridworks/expr/controls/IsNumeric.java rename to src/main/java/com/metaweb/gridworks/gel/controls/IsNumeric.java index 6c3714c86..908ddb5fe 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/IsNumeric.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/IsNumeric.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/IsTest.java b/src/main/java/com/metaweb/gridworks/gel/controls/IsTest.java similarity index 88% rename from src/main/java/com/metaweb/gridworks/expr/controls/IsTest.java rename to src/main/java/com/metaweb/gridworks/gel/controls/IsTest.java index ea95b41c6..e02afa8b0 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/IsTest.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/IsTest.java @@ -1,13 +1,13 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Control; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.gel.Control; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; abstract class IsTest implements Control { public String checkArguments(Evaluable[] args) { diff --git a/src/main/java/com/metaweb/gridworks/expr/controls/With.java b/src/main/java/com/metaweb/gridworks/gel/controls/With.java similarity index 89% rename from src/main/java/com/metaweb/gridworks/expr/controls/With.java rename to src/main/java/com/metaweb/gridworks/gel/controls/With.java index d6680cf83..8eafd1319 100644 --- a/src/main/java/com/metaweb/gridworks/expr/controls/With.java +++ b/src/main/java/com/metaweb/gridworks/gel/controls/With.java @@ -1,14 +1,14 @@ -package com.metaweb.gridworks.expr.controls; +package com.metaweb.gridworks.gel.controls; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridworks.expr.Control; -import com.metaweb.gridworks.expr.ControlFunctionRegistry; import com.metaweb.gridworks.expr.Evaluable; -import com.metaweb.gridworks.expr.ast.VariableExpr; +import com.metaweb.gridworks.gel.Control; +import com.metaweb.gridworks.gel.ControlFunctionRegistry; +import com.metaweb.gridworks.gel.ast.VariableExpr; public class With implements Control { public String checkArguments(Evaluable[] args) { diff --git a/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java b/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java index 760f0b83f..07db5097a 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java @@ -13,7 +13,7 @@ import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; -import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.gel.Parser; import com.metaweb.gridworks.history.Change; import com.metaweb.gridworks.history.HistoryEntry; import com.metaweb.gridworks.model.AbstractOperation; diff --git a/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java b/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java index 238b50b4a..d929ed387 100644 --- a/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java @@ -10,7 +10,7 @@ import org.json.JSONWriter; import com.metaweb.gridworks.browsing.RowVisitor; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.ExpressionUtils; -import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.gel.Parser; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Column;