diff --git a/src/java/com/samskivert/depot/KeySet.java b/src/java/com/samskivert/depot/KeySet.java index 796d29d..1a83409 100644 --- a/src/java/com/samskivert/depot/KeySet.java +++ b/src/java/com/samskivert/depot/KeySet.java @@ -39,8 +39,8 @@ import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.DepotUtil; import com.samskivert.depot.impl.ExpressionVisitor; import com.samskivert.depot.impl.expression.LiteralExp; -import com.samskivert.depot.operator.In; -import com.samskivert.depot.operator.Or; +import com.samskivert.depot.impl.operator.In; +import com.samskivert.depot.impl.operator.Or; /** * Contains a set of primary keys that match a set of persistent records. This is used internally diff --git a/src/java/com/samskivert/depot/Ops.java b/src/java/com/samskivert/depot/Ops.java index 61f1e53..ace3376 100644 --- a/src/java/com/samskivert/depot/Ops.java +++ b/src/java/com/samskivert/depot/Ops.java @@ -25,13 +25,13 @@ import java.util.Collection; import com.samskivert.depot.clause.SelectClause; import com.samskivert.depot.expression.FluentExp; import com.samskivert.depot.expression.SQLExpression; -import com.samskivert.depot.operator.Add; -import com.samskivert.depot.operator.And; -import com.samskivert.depot.operator.Exists; -import com.samskivert.depot.operator.Like; -import com.samskivert.depot.operator.Mul; -import com.samskivert.depot.operator.Not; -import com.samskivert.depot.operator.Or; +import com.samskivert.depot.impl.operator.Add; +import com.samskivert.depot.impl.operator.And; +import com.samskivert.depot.impl.operator.Exists; +import com.samskivert.depot.impl.operator.Like; +import com.samskivert.depot.impl.operator.Mul; +import com.samskivert.depot.impl.operator.Not; +import com.samskivert.depot.impl.operator.Or; /** * Provides static methods for operator construction that don't fit nicely into the fluent style. diff --git a/src/java/com/samskivert/depot/clause/Join.java b/src/java/com/samskivert/depot/clause/Join.java index 79c3f04..a6a7305 100644 --- a/src/java/com/samskivert/depot/clause/Join.java +++ b/src/java/com/samskivert/depot/clause/Join.java @@ -27,7 +27,7 @@ import com.samskivert.depot.expression.ColumnExp; import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.DepotUtil; import com.samskivert.depot.impl.ExpressionVisitor; -import com.samskivert.depot.operator.Equals; +import com.samskivert.depot.impl.operator.Equals; /** * Represents a JOIN. diff --git a/src/java/com/samskivert/depot/clause/Where.java b/src/java/com/samskivert/depot/clause/Where.java index aa732dd..6ad8978 100644 --- a/src/java/com/samskivert/depot/clause/Where.java +++ b/src/java/com/samskivert/depot/clause/Where.java @@ -27,9 +27,9 @@ import com.samskivert.depot.expression.ColumnExp; import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; import com.samskivert.depot.impl.expression.ValueExp; -import com.samskivert.depot.operator.And; -import com.samskivert.depot.operator.Equals; -import com.samskivert.depot.operator.IsNull; +import com.samskivert.depot.impl.operator.And; +import com.samskivert.depot.impl.operator.Equals; +import com.samskivert.depot.impl.operator.IsNull; /** * Represents a where clause: the condition can be any comparison operator or logical combination diff --git a/src/java/com/samskivert/depot/expression/ColumnExp.java b/src/java/com/samskivert/depot/expression/ColumnExp.java index aba761e..2ede2a9 100644 --- a/src/java/com/samskivert/depot/expression/ColumnExp.java +++ b/src/java/com/samskivert/depot/expression/ColumnExp.java @@ -25,9 +25,9 @@ import java.util.Collection; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.clause.Join; import com.samskivert.depot.impl.ExpressionVisitor; -import com.samskivert.depot.operator.In; -import com.samskivert.depot.operator.IsNull; -import com.samskivert.depot.operator.Like; +import com.samskivert.depot.impl.operator.In; +import com.samskivert.depot.impl.operator.IsNull; +import com.samskivert.depot.impl.operator.Like; /** * An expression that unambiguously identifies a field of a class, e.g. GameRecord.itemId. diff --git a/src/java/com/samskivert/depot/expression/FluentExp.java b/src/java/com/samskivert/depot/expression/FluentExp.java index b69c314..252bc84 100644 --- a/src/java/com/samskivert/depot/expression/FluentExp.java +++ b/src/java/com/samskivert/depot/expression/FluentExp.java @@ -20,20 +20,20 @@ package com.samskivert.depot.expression; -import com.samskivert.depot.operator.Add; -import com.samskivert.depot.operator.And; -import com.samskivert.depot.operator.BitAnd; -import com.samskivert.depot.operator.BitOr; -import com.samskivert.depot.operator.Div; -import com.samskivert.depot.operator.Equals; -import com.samskivert.depot.operator.GreaterThan; -import com.samskivert.depot.operator.GreaterThanEquals; -import com.samskivert.depot.operator.LessThan; -import com.samskivert.depot.operator.LessThanEquals; -import com.samskivert.depot.operator.Mul; -import com.samskivert.depot.operator.NotEquals; -import com.samskivert.depot.operator.Or; -import com.samskivert.depot.operator.Sub; +import com.samskivert.depot.impl.operator.Add; +import com.samskivert.depot.impl.operator.And; +import com.samskivert.depot.impl.operator.BitAnd; +import com.samskivert.depot.impl.operator.BitOr; +import com.samskivert.depot.impl.operator.Div; +import com.samskivert.depot.impl.operator.Equals; +import com.samskivert.depot.impl.operator.GreaterThan; +import com.samskivert.depot.impl.operator.GreaterThanEquals; +import com.samskivert.depot.impl.operator.LessThan; +import com.samskivert.depot.impl.operator.LessThanEquals; +import com.samskivert.depot.impl.operator.Mul; +import com.samskivert.depot.impl.operator.NotEquals; +import com.samskivert.depot.impl.operator.Or; +import com.samskivert.depot.impl.operator.Sub; /** * A base class for {@link SQLExpression} implementations that provides a plethora of combinators diff --git a/src/java/com/samskivert/depot/impl/BuildVisitor.java b/src/java/com/samskivert/depot/impl/BuildVisitor.java index 1f123e7..5d8fc45 100644 --- a/src/java/com/samskivert/depot/impl/BuildVisitor.java +++ b/src/java/com/samskivert/depot/impl/BuildVisitor.java @@ -50,13 +50,7 @@ import com.samskivert.depot.clause.SelectClause; import com.samskivert.depot.clause.WhereClause; import com.samskivert.depot.expression.*; import com.samskivert.depot.operator.Case; -import com.samskivert.depot.operator.Exists; import com.samskivert.depot.operator.FullText; -import com.samskivert.depot.operator.In; -import com.samskivert.depot.operator.IsNull; -import com.samskivert.depot.operator.Not; -import com.samskivert.depot.operator.SQLOperator.BinaryOperator; -import com.samskivert.depot.operator.SQLOperator.MultiOperator; import com.samskivert.depot.impl.clause.CreateIndexClause; import com.samskivert.depot.impl.clause.DeleteClause; @@ -97,6 +91,12 @@ import com.samskivert.depot.impl.expression.StringFun.Position; import com.samskivert.depot.impl.expression.StringFun.Substring; import com.samskivert.depot.impl.expression.StringFun.Trim; import com.samskivert.depot.impl.expression.StringFun.Upper; +import com.samskivert.depot.impl.operator.Exists; +import com.samskivert.depot.impl.operator.In; +import com.samskivert.depot.impl.operator.IsNull; +import com.samskivert.depot.impl.operator.Not; +import com.samskivert.depot.impl.operator.SQLOperator.BinaryOperator; +import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator; /** * Implements the base functionality of the SQL-building pass of {@link SQLBuilder}. Dialectal diff --git a/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java b/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java index ee2bc7a..d69db92 100644 --- a/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java +++ b/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java @@ -41,13 +41,7 @@ import com.samskivert.depot.expression.SQLExpression.NoValue; import com.samskivert.depot.operator.Case; -import com.samskivert.depot.operator.Exists; import com.samskivert.depot.operator.FullText; -import com.samskivert.depot.operator.In; -import com.samskivert.depot.operator.IsNull; -import com.samskivert.depot.operator.Not; -import com.samskivert.depot.operator.SQLOperator.BinaryOperator; -import com.samskivert.depot.operator.SQLOperator.MultiOperator; import com.samskivert.depot.impl.clause.CreateIndexClause; import com.samskivert.depot.impl.clause.DeleteClause; @@ -87,6 +81,12 @@ import com.samskivert.depot.impl.expression.StringFun.Position; import com.samskivert.depot.impl.expression.StringFun.Substring; import com.samskivert.depot.impl.expression.StringFun.Trim; import com.samskivert.depot.impl.expression.StringFun.Upper; +import com.samskivert.depot.impl.operator.Exists; +import com.samskivert.depot.impl.operator.In; +import com.samskivert.depot.impl.operator.IsNull; +import com.samskivert.depot.impl.operator.Not; +import com.samskivert.depot.impl.operator.SQLOperator.BinaryOperator; +import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator; import com.samskivert.util.ArrayUtil; import com.samskivert.util.Tuple; diff --git a/src/java/com/samskivert/depot/impl/ExpressionVisitor.java b/src/java/com/samskivert/depot/impl/ExpressionVisitor.java index 53d4282..115af2a 100644 --- a/src/java/com/samskivert/depot/impl/ExpressionVisitor.java +++ b/src/java/com/samskivert/depot/impl/ExpressionVisitor.java @@ -35,13 +35,7 @@ import com.samskivert.depot.clause.WhereClause; import com.samskivert.depot.expression.*; import com.samskivert.depot.operator.Case; -import com.samskivert.depot.operator.Exists; import com.samskivert.depot.operator.FullText; -import com.samskivert.depot.operator.In; -import com.samskivert.depot.operator.IsNull; -import com.samskivert.depot.operator.Not; -import com.samskivert.depot.operator.SQLOperator.BinaryOperator; -import com.samskivert.depot.operator.SQLOperator.MultiOperator; import com.samskivert.depot.impl.clause.CreateIndexClause; import com.samskivert.depot.impl.clause.DeleteClause; @@ -81,6 +75,12 @@ import com.samskivert.depot.impl.expression.StringFun.Position; import com.samskivert.depot.impl.expression.StringFun.Substring; import com.samskivert.depot.impl.expression.StringFun.Trim; import com.samskivert.depot.impl.expression.StringFun.Upper; +import com.samskivert.depot.impl.operator.Exists; +import com.samskivert.depot.impl.operator.In; +import com.samskivert.depot.impl.operator.IsNull; +import com.samskivert.depot.impl.operator.Not; +import com.samskivert.depot.impl.operator.SQLOperator.BinaryOperator; +import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator; /** * Enumerates visitation methods for every possible SQL expression type. diff --git a/src/java/com/samskivert/depot/impl/FindAllQuery.java b/src/java/com/samskivert/depot/impl/FindAllQuery.java index 162abde..81a44a1 100644 --- a/src/java/com/samskivert/depot/impl/FindAllQuery.java +++ b/src/java/com/samskivert/depot/impl/FindAllQuery.java @@ -50,7 +50,7 @@ import com.samskivert.depot.XList; import com.samskivert.depot.clause.FieldOverride; import com.samskivert.depot.clause.QueryClause; import com.samskivert.depot.clause.SelectClause; -import com.samskivert.depot.operator.In; +import com.samskivert.depot.impl.operator.In; import static com.samskivert.depot.Log.log; diff --git a/src/java/com/samskivert/depot/impl/HSQLBuilder.java b/src/java/com/samskivert/depot/impl/HSQLBuilder.java index a9e104f..ab0ec7e 100644 --- a/src/java/com/samskivert/depot/impl/HSQLBuilder.java +++ b/src/java/com/samskivert/depot/impl/HSQLBuilder.java @@ -44,18 +44,18 @@ import com.samskivert.depot.annotation.FullTextIndex; import com.samskivert.depot.annotation.GeneratedValue; import com.samskivert.depot.clause.OrderBy.Order; import com.samskivert.depot.expression.*; -import com.samskivert.depot.operator.BitAnd; -import com.samskivert.depot.operator.BitOr; import com.samskivert.depot.operator.FullText; -import com.samskivert.depot.operator.Like; -import com.samskivert.depot.operator.Or; -import com.samskivert.depot.operator.SQLOperator.MultiOperator; import com.samskivert.depot.impl.clause.CreateIndexClause; import com.samskivert.depot.impl.expression.DateFun.DatePart; import com.samskivert.depot.impl.expression.DateFun.DateTruncate; import com.samskivert.depot.impl.expression.DateFun.DatePart.Part; import com.samskivert.depot.impl.expression.StringFun.Lower; +import com.samskivert.depot.impl.operator.BitAnd; +import com.samskivert.depot.impl.operator.BitOr; +import com.samskivert.depot.impl.operator.Like; +import com.samskivert.depot.impl.operator.Or; +import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator; public class HSQLBuilder extends SQLBuilder diff --git a/src/java/com/samskivert/depot/impl/PostgreSQL4Builder.java b/src/java/com/samskivert/depot/impl/PostgreSQL4Builder.java index c3077e5..58663e2 100644 --- a/src/java/com/samskivert/depot/impl/PostgreSQL4Builder.java +++ b/src/java/com/samskivert/depot/impl/PostgreSQL4Builder.java @@ -28,7 +28,7 @@ import java.sql.Timestamp; import com.samskivert.depot.DatabaseException; import com.samskivert.depot.impl.expression.ValueExp; -import com.samskivert.depot.operator.In; +import com.samskivert.depot.impl.operator.In; import com.samskivert.util.ByteEnum; /** diff --git a/src/java/com/samskivert/depot/operator/Add.java b/src/java/com/samskivert/depot/impl/operator/Add.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Add.java rename to src/java/com/samskivert/depot/impl/operator/Add.java index 9ea9cbe..20f8914 100644 --- a/src/java/com/samskivert/depot/operator/Add.java +++ b/src/java/com/samskivert/depot/impl/operator/Add.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/And.java b/src/java/com/samskivert/depot/impl/operator/And.java similarity index 97% rename from src/java/com/samskivert/depot/operator/And.java rename to src/java/com/samskivert/depot/impl/operator/And.java index cb78230..40335ee 100644 --- a/src/java/com/samskivert/depot/operator/And.java +++ b/src/java/com/samskivert/depot/impl/operator/And.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/Arithmetic.java b/src/java/com/samskivert/depot/impl/operator/Arithmetic.java similarity index 94% rename from src/java/com/samskivert/depot/operator/Arithmetic.java rename to src/java/com/samskivert/depot/impl/operator/Arithmetic.java index 72f8ae3..91d99aa 100644 --- a/src/java/com/samskivert/depot/operator/Arithmetic.java +++ b/src/java/com/samskivert/depot/impl/operator/Arithmetic.java @@ -18,11 +18,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.expression.ValueExp; -import com.samskivert.depot.operator.SQLOperator.MultiOperator; +import com.samskivert.depot.impl.operator.SQLOperator.MultiOperator; /** * A convenient container for implementations of arithmetic operators. diff --git a/src/java/com/samskivert/depot/operator/BitAnd.java b/src/java/com/samskivert/depot/impl/operator/BitAnd.java similarity index 97% rename from src/java/com/samskivert/depot/operator/BitAnd.java rename to src/java/com/samskivert/depot/impl/operator/BitAnd.java index 7aff68e..8358ddd 100644 --- a/src/java/com/samskivert/depot/operator/BitAnd.java +++ b/src/java/com/samskivert/depot/impl/operator/BitAnd.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/BitOr.java b/src/java/com/samskivert/depot/impl/operator/BitOr.java similarity index 97% rename from src/java/com/samskivert/depot/operator/BitOr.java rename to src/java/com/samskivert/depot/impl/operator/BitOr.java index 86823b5..bdf9360 100644 --- a/src/java/com/samskivert/depot/operator/BitOr.java +++ b/src/java/com/samskivert/depot/impl/operator/BitOr.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Div.java b/src/java/com/samskivert/depot/impl/operator/Div.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Div.java rename to src/java/com/samskivert/depot/impl/operator/Div.java index 7b1985e..d48ebb6 100644 --- a/src/java/com/samskivert/depot/operator/Div.java +++ b/src/java/com/samskivert/depot/impl/operator/Div.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.util.StringUtil; diff --git a/src/java/com/samskivert/depot/operator/Equals.java b/src/java/com/samskivert/depot/impl/operator/Equals.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Equals.java rename to src/java/com/samskivert/depot/impl/operator/Equals.java index 7bd3725..efbc9ac 100644 --- a/src/java/com/samskivert/depot/operator/Equals.java +++ b/src/java/com/samskivert/depot/impl/operator/Equals.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Exists.java b/src/java/com/samskivert/depot/impl/operator/Exists.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Exists.java rename to src/java/com/samskivert/depot/impl/operator/Exists.java index a6d2b37..bc67193 100644 --- a/src/java/com/samskivert/depot/operator/Exists.java +++ b/src/java/com/samskivert/depot/impl/operator/Exists.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/GreaterThan.java b/src/java/com/samskivert/depot/impl/operator/GreaterThan.java similarity index 97% rename from src/java/com/samskivert/depot/operator/GreaterThan.java rename to src/java/com/samskivert/depot/impl/operator/GreaterThan.java index a5817e1..e7130ea 100644 --- a/src/java/com/samskivert/depot/operator/GreaterThan.java +++ b/src/java/com/samskivert/depot/impl/operator/GreaterThan.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/GreaterThanEquals.java b/src/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java similarity index 97% rename from src/java/com/samskivert/depot/operator/GreaterThanEquals.java rename to src/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java index 827f51e..fcc7a31 100644 --- a/src/java/com/samskivert/depot/operator/GreaterThanEquals.java +++ b/src/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/In.java b/src/java/com/samskivert/depot/impl/operator/In.java similarity index 98% rename from src/java/com/samskivert/depot/operator/In.java rename to src/java/com/samskivert/depot/impl/operator/In.java index 24a04ad..10a7b35 100644 --- a/src/java/com/samskivert/depot/operator/In.java +++ b/src/java/com/samskivert/depot/impl/operator/In.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/IsNull.java b/src/java/com/samskivert/depot/impl/operator/IsNull.java similarity index 97% rename from src/java/com/samskivert/depot/operator/IsNull.java rename to src/java/com/samskivert/depot/impl/operator/IsNull.java index c824765..7f3d937 100644 --- a/src/java/com/samskivert/depot/operator/IsNull.java +++ b/src/java/com/samskivert/depot/impl/operator/IsNull.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/LessThan.java b/src/java/com/samskivert/depot/impl/operator/LessThan.java similarity index 97% rename from src/java/com/samskivert/depot/operator/LessThan.java rename to src/java/com/samskivert/depot/impl/operator/LessThan.java index 2636def..5b9a377 100644 --- a/src/java/com/samskivert/depot/operator/LessThan.java +++ b/src/java/com/samskivert/depot/impl/operator/LessThan.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/LessThanEquals.java b/src/java/com/samskivert/depot/impl/operator/LessThanEquals.java similarity index 97% rename from src/java/com/samskivert/depot/operator/LessThanEquals.java rename to src/java/com/samskivert/depot/impl/operator/LessThanEquals.java index ee24ab5..e5dc9fd 100644 --- a/src/java/com/samskivert/depot/operator/LessThanEquals.java +++ b/src/java/com/samskivert/depot/impl/operator/LessThanEquals.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Like.java b/src/java/com/samskivert/depot/impl/operator/Like.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Like.java rename to src/java/com/samskivert/depot/impl/operator/Like.java index 053b745..a57e357 100644 --- a/src/java/com/samskivert/depot/operator/Like.java +++ b/src/java/com/samskivert/depot/impl/operator/Like.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Mul.java b/src/java/com/samskivert/depot/impl/operator/Mul.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Mul.java rename to src/java/com/samskivert/depot/impl/operator/Mul.java index 4a80aa8..a727b4e 100644 --- a/src/java/com/samskivert/depot/operator/Mul.java +++ b/src/java/com/samskivert/depot/impl/operator/Mul.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Not.java b/src/java/com/samskivert/depot/impl/operator/Not.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Not.java rename to src/java/com/samskivert/depot/impl/operator/Not.java index 735ecd4..e7e7587 100644 --- a/src/java/com/samskivert/depot/operator/Not.java +++ b/src/java/com/samskivert/depot/impl/operator/Not.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/NotEquals.java b/src/java/com/samskivert/depot/impl/operator/NotEquals.java similarity index 97% rename from src/java/com/samskivert/depot/operator/NotEquals.java rename to src/java/com/samskivert/depot/impl/operator/NotEquals.java index 3b35b99..1f5cc88 100644 --- a/src/java/com/samskivert/depot/operator/NotEquals.java +++ b/src/java/com/samskivert/depot/impl/operator/NotEquals.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Or.java b/src/java/com/samskivert/depot/impl/operator/Or.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Or.java rename to src/java/com/samskivert/depot/impl/operator/Or.java index 31f8efd..f11512d 100644 --- a/src/java/com/samskivert/depot/operator/Or.java +++ b/src/java/com/samskivert/depot/impl/operator/Or.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/SQLOperator.java b/src/java/com/samskivert/depot/impl/operator/SQLOperator.java similarity index 99% rename from src/java/com/samskivert/depot/operator/SQLOperator.java rename to src/java/com/samskivert/depot/impl/operator/SQLOperator.java index 9d82b7c..bea0594 100644 --- a/src/java/com/samskivert/depot/operator/SQLOperator.java +++ b/src/java/com/samskivert/depot/impl/operator/SQLOperator.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import java.util.Arrays; import java.util.Collection; diff --git a/src/java/com/samskivert/depot/operator/Sub.java b/src/java/com/samskivert/depot/impl/operator/Sub.java similarity index 97% rename from src/java/com/samskivert/depot/operator/Sub.java rename to src/java/com/samskivert/depot/impl/operator/Sub.java index 8dacadb..9328174 100644 --- a/src/java/com/samskivert/depot/operator/Sub.java +++ b/src/java/com/samskivert/depot/impl/operator/Sub.java @@ -18,7 +18,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.samskivert.depot.operator; +package com.samskivert.depot.impl.operator; import com.samskivert.depot.expression.SQLExpression; diff --git a/src/java/com/samskivert/depot/operator/Case.java b/src/java/com/samskivert/depot/operator/Case.java index ef14bb3..d309296 100644 --- a/src/java/com/samskivert/depot/operator/Case.java +++ b/src/java/com/samskivert/depot/operator/Case.java @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.expression.SQLExpression; import com.samskivert.depot.impl.ExpressionVisitor; +import com.samskivert.depot.impl.operator.SQLOperator; import com.samskivert.util.Tuple; /** diff --git a/src/java/com/samskivert/depot/operator/FullText.java b/src/java/com/samskivert/depot/operator/FullText.java index f4782e2..9a5bc3b 100644 --- a/src/java/com/samskivert/depot/operator/FullText.java +++ b/src/java/com/samskivert/depot/operator/FullText.java @@ -25,6 +25,7 @@ import java.util.Collection; import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.expression.FluentExp; import com.samskivert.depot.impl.ExpressionVisitor; +import com.samskivert.depot.impl.operator.SQLOperator; /** * An attempt at a dialect-agnostic full-text search condition, such as MySQL's MATCH() and diff --git a/src/java/com/samskivert/depot/tests/TestRepository.java b/src/java/com/samskivert/depot/tests/TestRepository.java index cfcadd8..96d1cc6 100644 --- a/src/java/com/samskivert/depot/tests/TestRepository.java +++ b/src/java/com/samskivert/depot/tests/TestRepository.java @@ -40,8 +40,8 @@ import com.samskivert.depot.SchemaMigration; import com.samskivert.depot.annotation.Computed; import com.samskivert.depot.clause.Where; import com.samskivert.depot.impl.expression.LiteralExp; -import com.samskivert.depot.operator.GreaterThan; -import com.samskivert.depot.operator.LessThan; +import com.samskivert.depot.impl.operator.GreaterThan; +import com.samskivert.depot.impl.operator.LessThan; /** * A test tool for the Depot repository services.