diff --git a/external-src/com/thoughtworks/sql/Constants.java b/external-src/com/thoughtworks/sql/Constants.java deleted file mode 100644 index f24107289..000000000 --- a/external-src/com/thoughtworks/sql/Constants.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.thoughtworks.sql; - -@SuppressWarnings("nls") -public class Constants { - static final String SELECT = "SELECT"; - static final String SPACE = " "; - static final String AS = "AS"; - static final String COMMA = ","; - static final String FROM = "FROM"; - static final String ON = "ON"; - static final String JOIN = "JOIN"; - static final String ALL = "*"; - static final String LEFT_PARENTHESIS = "("; - static final String RIGHT_PARENTHESIS = ")"; - static final String AND = "AND"; - static final String BETWEEN = "BETWEEN"; - static final String LIKE = "LIKE"; - static final String OR = "OR"; - static final String ORDER_BY = "ORDER BY"; - static final String GROUP_BY = "GROUP BY"; - static final String WHERE = "WHERE"; - public static final String EXISTS = "EXISTS"; - public static final String NOT = "NOT"; -} diff --git a/external-src/com/thoughtworks/sql/Criterion.java b/external-src/com/thoughtworks/sql/Criterion.java deleted file mode 100644 index f5b77bd34..000000000 --- a/external-src/com/thoughtworks/sql/Criterion.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.AND; -import static com.thoughtworks.sql.Constants.EXISTS; -import static com.thoughtworks.sql.Constants.LEFT_PARENTHESIS; -import static com.thoughtworks.sql.Constants.NOT; -import static com.thoughtworks.sql.Constants.OR; -import static com.thoughtworks.sql.Constants.RIGHT_PARENTHESIS; -import static com.thoughtworks.sql.Constants.SPACE; - -public abstract class Criterion { - protected final Operator operator; - - Criterion(Operator operator) { - this.operator = operator; - } - - public static Criterion and(final Criterion criterion, final Criterion... criterions) { - return new Criterion(Operator.and) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(criterion); - for (Criterion c : criterions) { - sb.append(SPACE).append(AND).append(SPACE).append(c); - } - } - }; - } - - public static Criterion or(final Criterion criterion, final Criterion... criterions) { - return new Criterion(Operator.or) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(criterion); - for (Criterion c : criterions) { - sb.append(SPACE).append(OR).append(SPACE).append(c.toString()); - } - } - }; - } - - public static Criterion exists(final Query query) { - return new Criterion(Operator.exists) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(EXISTS).append(SPACE).append(LEFT_PARENTHESIS).append(query).append(RIGHT_PARENTHESIS); - } - }; - } - - public static Criterion not(final Criterion criterion) { - return new Criterion(Operator.not) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(NOT).append(SPACE); - criterion.populate(sb); - } - }; - } - - protected abstract void populate(StringBuilder sb); - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(LEFT_PARENTHESIS); - populate(builder); - builder.append(RIGHT_PARENTHESIS); - return builder.toString(); - } - -} diff --git a/external-src/com/thoughtworks/sql/DBObject.java b/external-src/com/thoughtworks/sql/DBObject.java deleted file mode 100644 index a786b9a3d..000000000 --- a/external-src/com/thoughtworks/sql/DBObject.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.AS; -import static com.thoughtworks.sql.Constants.SPACE; - -public abstract class DBObject> { - protected String alias; - protected final String expression; - - protected DBObject(String expression){ - this.expression = expression; - } - - public T as(String newAlias) { - this.alias = newAlias; - return (T) this; - } - - public boolean hasAlias() { - return alias != null; - } - - @SuppressWarnings("unchecked") - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - DBObject dbObject = (DBObject) o; - - if (alias != null ? !alias.equals(dbObject.alias) : dbObject.alias != null) return false; - if (expression != null ? !expression.equals(dbObject.expression) : dbObject.expression != null) return false; - - return true; - } - - @Override - public int hashCode() { - int result = alias != null ? alias.hashCode() : 0; - result = 31 * result + (expression != null ? expression.hashCode() : 0); - return result; - } - - @Override - public final String toString() { - StringBuilder sb = new StringBuilder(expression); - if (hasAlias()) { - sb.append(SPACE).append(AS).append(SPACE).append(alias); - } - return sb.toString(); - } -} diff --git a/external-src/com/thoughtworks/sql/EqCriterion.java b/external-src/com/thoughtworks/sql/EqCriterion.java deleted file mode 100644 index b58d48fb8..000000000 --- a/external-src/com/thoughtworks/sql/EqCriterion.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thoughtworks.sql; - -public class EqCriterion extends UnaryCriterion { - EqCriterion(Field field, Object value) { - super(field, Operator.eq, value); - } -} diff --git a/external-src/com/thoughtworks/sql/Field.java b/external-src/com/thoughtworks/sql/Field.java deleted file mode 100644 index 369338be2..000000000 --- a/external-src/com/thoughtworks/sql/Field.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.AND; -import static com.thoughtworks.sql.Constants.BETWEEN; -import static com.thoughtworks.sql.Constants.COMMA; -import static com.thoughtworks.sql.Constants.LEFT_PARENTHESIS; -import static com.thoughtworks.sql.Constants.RIGHT_PARENTHESIS; -import static com.thoughtworks.sql.Constants.SPACE; - -public class Field extends DBObject { - - protected Field(String expression) { - super(expression); - } - - public static Field field(String expression) { - return new Field(expression); - } - - public Criterion eq(Object value) { - return UnaryCriterion.eq(this, value); - } - - public Criterion neq(Object value) { - return UnaryCriterion.neq(this, value); - } - - public Criterion gt(Object value) { - return UnaryCriterion.gt(this, value); - } - - public Criterion lt(final Object value) { - return UnaryCriterion.lt(this, value); - } - - public Criterion isNull() { - return UnaryCriterion.isNull(this); - } - - public Criterion isNotNull() { - return UnaryCriterion.isNotNull(this); - } - - public Criterion between(final Object lower, final Object upper) { - final Field field = this; - return new Criterion(null) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(field).append(SPACE).append(BETWEEN).append(SPACE).append(lower).append(SPACE).append(AND) - .append(SPACE).append(upper); - } - }; - } - - public Criterion like(final String value) { - return UnaryCriterion.like(this, value); - } - - public Criterion in(final T... value) { - final Field field = this; - return new Criterion(Operator.in) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(field).append(SPACE).append(Operator.in).append(SPACE).append(LEFT_PARENTHESIS); - for (T t : value) { - sb.append(t.toString()).append(COMMA); - } - sb.deleteCharAt(sb.length() - 1).append(RIGHT_PARENTHESIS); - } - }; - } - - public Criterion in(final Query query) { - final Field field = this; - return new Criterion(Operator.in) { - - @Override - protected void populate(StringBuilder sb) { - sb.append(field).append(SPACE).append(Operator.in).append(SPACE).append(LEFT_PARENTHESIS).append(query) - .append(RIGHT_PARENTHESIS); - } - }; - } -} diff --git a/external-src/com/thoughtworks/sql/GroupBy.java b/external-src/com/thoughtworks/sql/GroupBy.java deleted file mode 100644 index 620262f83..000000000 --- a/external-src/com/thoughtworks/sql/GroupBy.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thoughtworks.sql; - -import java.util.List; -import java.util.ArrayList; - -public class GroupBy { - private List fields = new ArrayList(); - - public static GroupBy groupBy(Field field) { - GroupBy groupBy = new GroupBy(); - groupBy.fields.add(field); - return groupBy; - } -} diff --git a/external-src/com/thoughtworks/sql/Join.java b/external-src/com/thoughtworks/sql/Join.java deleted file mode 100644 index 975236776..000000000 --- a/external-src/com/thoughtworks/sql/Join.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.SPACE; -import static com.thoughtworks.sql.Constants.JOIN; -import static com.thoughtworks.sql.Constants.ON; - -public class Join { - private final Table joinTable; - private final JoinType joinType; - private final Criterion[] criterions; - - private Join(Table table, JoinType joinType, Criterion... criterions) { - joinTable = table; - this.joinType = joinType; - this.criterions = criterions; - } - - public static Join inner(Table expression, Criterion... criterions) { - return new Join(expression, JoinType.INNER, criterions); - } - - public static Join left(Table table, Criterion... criterions) { - return new Join(table, JoinType.LEFT, criterions); - } - - public static Join right(Table table, Criterion... criterions) { - return new Join(table, JoinType.RIGHT, criterions); - } - - public static Join out(Table table, Criterion... criterions) { - return new Join(table, JoinType.OUT, criterions); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(joinType).append(SPACE).append(JOIN).append(SPACE).append(joinTable).append(SPACE).append(ON); - for (Criterion criterion : criterions) { - sb.append(SPACE).append(criterion); - } - return sb.toString(); - } -} diff --git a/external-src/com/thoughtworks/sql/JoinType.java b/external-src/com/thoughtworks/sql/JoinType.java deleted file mode 100644 index 77b094306..000000000 --- a/external-src/com/thoughtworks/sql/JoinType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.thoughtworks.sql; - -public enum JoinType { - INNER, LEFT, RIGHT, OUT -} diff --git a/external-src/com/thoughtworks/sql/Operator.java b/external-src/com/thoughtworks/sql/Operator.java deleted file mode 100644 index 61508b933..000000000 --- a/external-src/com/thoughtworks/sql/Operator.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.SPACE; - -import java.util.HashMap; -import java.util.Map; - -@SuppressWarnings("nls") -public final class Operator { - - private final String operator; - public static final Operator eq = new Operator("="); - public static final Operator neq = new Operator("<>"); - public static final Operator isNull = new Operator("IS NULL"); - public static final Operator isNotNull = new Operator("IS NOT NULL"); - public static final Operator gt = new Operator(">"); - public static final Operator lt = new Operator("<"); - public static final Operator gte = new Operator(">="); - public static final Operator lte = new Operator("<="); - public static final Operator and = new Operator("AND"); - public static final Operator or = new Operator("OR"); - public static final Operator not = new Operator("NOT"); - public static final Operator exists = new Operator("EXISTS"); - public static final Operator like = new Operator("LIKE"); - public static final Operator in = new Operator("IN"); - - private static final Map contraryRegistry = new HashMap(); - - static { - contraryRegistry.put(eq, neq); - contraryRegistry.put(neq, eq); - contraryRegistry.put(isNull, isNotNull); - contraryRegistry.put(isNotNull, isNull); - contraryRegistry.put(gt, lte); - contraryRegistry.put(lte, gt); - contraryRegistry.put(lt, gte); - contraryRegistry.put(gte, lt); - } - - private Operator(String operator) { - this.operator = operator; - } - - public Operator getContrary() { - if(!contraryRegistry.containsKey(this)){ - Operator opposite = new Operator(not.toString() + SPACE + this.toString()); - contraryRegistry.put(this, opposite); - contraryRegistry.put(opposite, this); - } - return contraryRegistry.get(this); - } - - @Override - public String toString() { - return this.operator.toString(); - } -} diff --git a/external-src/com/thoughtworks/sql/Order.java b/external-src/com/thoughtworks/sql/Order.java deleted file mode 100644 index 67e1aa0ab..000000000 --- a/external-src/com/thoughtworks/sql/Order.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.SPACE; - -public class Order { - private final Field expression; - private final OrderType orderType; - - private Order(Field expression) { - this(expression, OrderType.ASC); - } - - private Order(Field expression, OrderType orderType) { - this.expression = expression; - this.orderType = orderType; - } - - public static Order asc(Field expression) { - return new Order(expression); - } - - public static Order desc(Field expression) { - return new Order(expression, OrderType.DESC); - } - - @Override - public String toString() { - return expression + SPACE + orderType; - } -} diff --git a/external-src/com/thoughtworks/sql/OrderType.java b/external-src/com/thoughtworks/sql/OrderType.java deleted file mode 100644 index d907270c9..000000000 --- a/external-src/com/thoughtworks/sql/OrderType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.thoughtworks.sql; - -public enum OrderType { - DESC, ASC -} diff --git a/external-src/com/thoughtworks/sql/Query.java b/external-src/com/thoughtworks/sql/Query.java deleted file mode 100644 index f56fa06f1..000000000 --- a/external-src/com/thoughtworks/sql/Query.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.ALL; -import static com.thoughtworks.sql.Constants.COMMA; -import static com.thoughtworks.sql.Constants.FROM; -import static com.thoughtworks.sql.Constants.GROUP_BY; -import static com.thoughtworks.sql.Constants.LEFT_PARENTHESIS; -import static com.thoughtworks.sql.Constants.ORDER_BY; -import static com.thoughtworks.sql.Constants.RIGHT_PARENTHESIS; -import static com.thoughtworks.sql.Constants.SELECT; -import static com.thoughtworks.sql.Constants.SPACE; -import static com.thoughtworks.sql.Constants.WHERE; -import static com.thoughtworks.sql.Table.table; -import static java.util.Arrays.asList; - -import java.util.ArrayList; -import java.util.List; - -public class Query { - - private Table table; - private List criterions = new ArrayList(); - private List fields = new ArrayList(); - private List joins = new ArrayList(); - private List groupBies = new ArrayList(); - private List orders = new ArrayList(); - private List havings = new ArrayList(); - - private Query(Field... fields) { - this.fields.addAll(asList(fields)); - } - - public static Query select(Field... fields) { - return new Query(fields); - } - - public Query from(Table fromTable) { - this.table = fromTable; - return this; - } - - public Query join(Join... join) { - joins.addAll(asList(join)); - return this; - } - - public Query where(Criterion criterion) { - criterions.add(criterion); - return this; - } - - public Query groupBy(Field... groupBy) { - groupBies.addAll(asList(groupBy)); - return this; - } - - public Query orderBy(Order... order) { - orders.addAll(asList(order)); - return this; - } - - public Query appendSelectFields(Field... selectFields) { - this.fields.addAll(asList(selectFields)); - return this; - } - - @Override - public boolean equals(Object o) { - return this == o || !(o == null || getClass() != o.getClass()) && this.toString().equals(o.toString()); - } - - @Override - public int hashCode() { - return toString().hashCode(); - } - - @Override - public String toString() { - StringBuilder sql = new StringBuilder(); - visitSelectClause(sql); - visitFromClause(sql); - visitJoinClause(sql); - visitWhereClause(sql); - visitGroupByClause(sql); - visitOrderByClause(sql); - return sql.toString(); - } - - private void visitOrderByClause(StringBuilder sql) { - if (orders.isEmpty()) { - return; - } - sql.append(ORDER_BY); - for (Order order : orders) { - sql.append(SPACE).append(order).append(COMMA); - } - sql.deleteCharAt(sql.length() - 1).append(SPACE); - } - - @SuppressWarnings("nls") - private void visitGroupByClause(StringBuilder sql) { - if (groupBies.isEmpty()) { - return; - } - sql.append(GROUP_BY); - for (Field groupBy : groupBies) { - sql.append(SPACE).append(groupBy).append(COMMA); - } - sql.deleteCharAt(sql.length() - 1).append(SPACE); - if (havings.isEmpty()) { - return; - } - sql.append("HAVING"); - for (Criterion havingCriterion : havings) { - sql.append(SPACE).append(havingCriterion).append(COMMA); - } - sql.deleteCharAt(sql.length() - 1).append(SPACE); - } - - private void visitWhereClause(StringBuilder sql) { - if (criterions.isEmpty()) { - return; - } - sql.append(WHERE); - for (Criterion criterion : criterions) { - sql.append(SPACE).append(criterion).append(SPACE); - } - } - - private void visitJoinClause(StringBuilder sql) { - for (Join join : joins) { - sql.append(join).append(SPACE); - } - } - - private void visitFromClause(StringBuilder sql) { - if (table == null) { - return; - } - sql.append(FROM).append(SPACE).append(table).append(SPACE); - } - - private void visitSelectClause(StringBuilder sql) { - sql.append(SELECT).append(SPACE); - if (fields.isEmpty()) { - sql.append(ALL).append(SPACE); - return; - } - for (Field field : fields) { - sql.append(field).append(COMMA); - } - sql.deleteCharAt(sql.length() - 1).append(SPACE); - } - - public Table as(String alias) { - return table(LEFT_PARENTHESIS + this.toString() + RIGHT_PARENTHESIS).as(alias); - } - - public Query having(Criterion criterion) { - this.havings.add(criterion); - return this; - } -} diff --git a/external-src/com/thoughtworks/sql/Table.java b/external-src/com/thoughtworks/sql/Table.java deleted file mode 100644 index 73a9c6087..000000000 --- a/external-src/com/thoughtworks/sql/Table.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.thoughtworks.sql; - -public class Table extends DBObject { - - protected Table(String expression) { - super(expression); - } - - public static Table table(String table) { - return new Table(table); - } - - @SuppressWarnings("nls") - protected String fieldExpression(String fieldName) { - if (hasAlias()) { - return alias + "." + fieldName; - } - return expression+"."+fieldName; - } -} diff --git a/external-src/com/thoughtworks/sql/UnaryCriterion.java b/external-src/com/thoughtworks/sql/UnaryCriterion.java deleted file mode 100644 index 7d1ad45d7..000000000 --- a/external-src/com/thoughtworks/sql/UnaryCriterion.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thoughtworks.sql; - -import static com.thoughtworks.sql.Constants.SPACE; - -public class UnaryCriterion extends Criterion { - protected final Field expression; - protected final Object value; - - UnaryCriterion(Field expression, Operator operator, Object value) { - super(operator); - this.expression = expression; - this.value = value; - } - - @Override - protected void populate(StringBuilder sb) { - beforePopulateOperator(sb); - populateOperator(sb); - afterPopulateOperator(sb); - } - - public static Criterion eq(Field expression, Object value) { - return new UnaryCriterion(expression, Operator.eq, value); - } - - protected void beforePopulateOperator(StringBuilder sb) { - sb.append(expression); - } - - protected void populateOperator(StringBuilder sb) { - sb.append(operator); - } - - @SuppressWarnings("nls") - protected void afterPopulateOperator(StringBuilder sb) { - if(value == null) - return; - else if(value instanceof String) - sb.append("'").append(sanitize((String) value)).append("'"); - else - sb.append(value); - } - - /** - * Sanitize the given input for SQL - * @param input - * @return - */ - @SuppressWarnings("nls") - public static String sanitize(String input) { - return input.replace("\\", "\\\\").replace("'", "\\'"); - } - - public static Criterion neq(Field field, Object value) { - return new UnaryCriterion(field, Operator.neq, value); - } - - public static Criterion gt(Field field, Object value) { - return new UnaryCriterion(field, Operator.gt, value); - } - - public static Criterion lt(Field field, Object value) { - return new UnaryCriterion(field, Operator.lt, value); - } - - public static Criterion isNull(Field field) { - return new UnaryCriterion(field, Operator.isNull, null) { - @Override - protected void populateOperator(StringBuilder sb) { - sb.append(SPACE).append(operator); - } - }; - } - - public static Criterion isNotNull(Field field) { - return new UnaryCriterion(field, Operator.isNotNull, null) { - @Override - protected void populateOperator(StringBuilder sb) { - sb.append(SPACE).append(operator); - } - }; - } - - public static Criterion like(Field field, String value) { - return new UnaryCriterion(field, Operator.like, value) { - @Override - protected void populateOperator(StringBuilder sb) { - sb.append(SPACE).append(operator).append(SPACE); - } - }; - } -} diff --git a/plugin-src/com/todoroo/astrid/tags/DataService.java b/plugin-src/com/todoroo/astrid/tags/DataService.java index 740ee0691..accb49a7b 100644 --- a/plugin-src/com/todoroo/astrid/tags/DataService.java +++ b/plugin-src/com/todoroo/astrid/tags/DataService.java @@ -114,9 +114,13 @@ public class DataService { */ public String getTagsAsString(long taskId) { StringBuilder tagBuilder = new StringBuilder(); - String[] tags = getTags(taskId); - for (int i = 0; i < tags.length; i++) { - tagBuilder.append(tags[i]); + TodorooCursor tags = getTags(taskId); + int length = tags.getCount(); + Metadata metadata = new Metadata(); + for (int i = 0; i < length; i++) { + tags.moveToNext(); + metadata.readFromCursor(tags, PROP) + tagBuilder.append(]); if (i < tags.length - 1) tagBuilder.append(", "); } diff --git a/plugin-src/com/todoroo/astrid/tagsold/TagService.java b/plugin-src/com/todoroo/astrid/tagsold/TagService.java index 3baa54639..43a022abd 100644 --- a/plugin-src/com/todoroo/astrid/tagsold/TagService.java +++ b/plugin-src/com/todoroo/astrid/tagsold/TagService.java @@ -21,11 +21,11 @@ package com.todoroo.astrid.tagsold; import android.database.SQLException; -import com.thoughtworks.sql.Join; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.GenericDao; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; +import com.todoroo.andlib.data.sql.Join; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.astrid.model.Task; /** diff --git a/src/com/todoroo/astrid/dao/MetadataDao.java b/src/com/todoroo/astrid/dao/MetadataDao.java index ad393971e..1eafee625 100644 --- a/src/com/todoroo/astrid/dao/MetadataDao.java +++ b/src/com/todoroo/astrid/dao/MetadataDao.java @@ -7,12 +7,12 @@ package com.todoroo.astrid.dao; import android.database.Cursor; -import com.thoughtworks.sql.Criterion; -import com.thoughtworks.sql.Join; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.GenericDao; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; +import com.todoroo.andlib.data.sql.Criterion; +import com.todoroo.andlib.data.sql.Join; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.model.Metadata; diff --git a/src/com/todoroo/astrid/dao/TaskDao.java b/src/com/todoroo/astrid/dao/TaskDao.java index 266d7b4f5..8417bae19 100644 --- a/src/com/todoroo/astrid/dao/TaskDao.java +++ b/src/com/todoroo/astrid/dao/TaskDao.java @@ -9,8 +9,8 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; -import com.thoughtworks.sql.Criterion; import com.todoroo.andlib.data.GenericDao; +import com.todoroo.andlib.data.sql.Criterion; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/src/com/todoroo/astrid/service/MetadataService.java b/src/com/todoroo/astrid/service/MetadataService.java index dfc2db744..e7c087faf 100644 --- a/src/com/todoroo/astrid/service/MetadataService.java +++ b/src/com/todoroo/astrid/service/MetadataService.java @@ -1,11 +1,11 @@ package com.todoroo.astrid.service; -import com.thoughtworks.sql.Criterion; -import com.thoughtworks.sql.Order; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.Property.CountProperty; +import com.todoroo.andlib.data.sql.Criterion; +import com.todoroo.andlib.data.sql.Order; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.dao.MetadataDao; diff --git a/src/com/todoroo/astrid/service/TaskService.java b/src/com/todoroo/astrid/service/TaskService.java index 9de0d12a5..b245280e4 100644 --- a/src/com/todoroo/astrid/service/TaskService.java +++ b/src/com/todoroo/astrid/service/TaskService.java @@ -1,8 +1,8 @@ package com.todoroo.astrid.service; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DateUtilities; diff --git a/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java b/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java index 19baafc19..a7899b1a8 100644 --- a/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java +++ b/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java @@ -1,8 +1,8 @@ package com.todoroo.astrid.dao; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.andlib.service.Autowired; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.model.Metadata; diff --git a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java b/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java index abfc6f9d2..4ed60d1f0 100644 --- a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java +++ b/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java @@ -1,9 +1,9 @@ package com.todoroo.astrid.dao; -import com.thoughtworks.sql.Order; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; +import com.todoroo.andlib.data.sql.Order; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; diff --git a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java index 532ae89c9..167c7c06b 100644 --- a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java +++ b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java @@ -2,8 +2,8 @@ package com.todoroo.astrid.upgrade; import java.util.Date; -import com.thoughtworks.sql.Query; import com.todoroo.andlib.data.TodorooCursor; +import com.todoroo.andlib.data.sql.Query; import com.todoroo.andlib.service.Autowired; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.legacy.data.enums.Importance;