From 08122cda8bb45317e0a31834b7bd1f5dae4b05a9 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 29 May 2009 21:04:26 +0000 Subject: [PATCH] Nixed a bit more unneeded parameterized typing. --- src/java/com/samskivert/depot/Key.java | 16 ++++++++-------- src/java/com/samskivert/depot/KeySet.java | 2 +- .../com/samskivert/depot/impl/BuildVisitor.java | 6 +++--- .../depot/impl/ExpressionEvaluator.java | 6 +++--- .../samskivert/depot/impl/ExpressionVisitor.java | 6 +++--- .../com/samskivert/depot/impl/MySQLBuilder.java | 2 +- .../depot/impl/clause/DropIndexClause.java | 2 +- .../com/samskivert/depot/operator/Exists.java | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/java/com/samskivert/depot/Key.java b/src/java/com/samskivert/depot/Key.java index 51768e5..64de941 100644 --- a/src/java/com/samskivert/depot/Key.java +++ b/src/java/com/samskivert/depot/Key.java @@ -47,13 +47,13 @@ public class Key extends WhereClause { /** Handles the matching of the key columns to its bound values. This is needed so that we can * combine a bunch of keys into a {@link KeySet}. */ - public static class Expression implements SQLExpression + public static class Expression implements SQLExpression { - public Expression (Class pClass, Comparable[] values) { + public Expression (Class pClass, Comparable[] values) { _pClass = pClass; _values = values; } - public Class getPersistentClass () { + public Class getPersistentClass () { return _pClass; } public Comparable[] getValues () { @@ -65,7 +65,7 @@ public class Key extends WhereClause public void addClasses (Collection> classSet) { classSet.add(getPersistentClass()); } - protected Class _pClass; + protected Class _pClass; protected Comparable[] _values; } @@ -167,11 +167,10 @@ public class Key extends WhereClause return _values; } - // from WhereClause - @Override + @Override // from WhereClause public SQLExpression getWhereExpression () { - return new Expression(_pClass, _values); + return new Expression(_pClass, _values); } // from SQLExpression @@ -204,7 +203,8 @@ public class Key extends WhereClause if (!pClass.equals(_pClass)) { throw new IllegalArgumentException( "Class mismatch between persistent record and cache invalidator " + - "[record=" + pClass.getSimpleName() + ", invtype=" + _pClass.getSimpleName() + "]."); + "[record=" + pClass.getSimpleName() + + ", invtype=" + _pClass.getSimpleName() + "]."); } } diff --git a/src/java/com/samskivert/depot/KeySet.java b/src/java/com/samskivert/depot/KeySet.java index 3399c4f..3ce7b1c 100644 --- a/src/java/com/samskivert/depot/KeySet.java +++ b/src/java/com/samskivert/depot/KeySet.java @@ -224,7 +224,7 @@ public abstract class KeySet extends WhereClause SQLExpression[] keyexps = new SQLExpression[_keys.length]; int ii = 0; for (Comparable[] kvals : _keys) { - keyexps[ii++] = new Key.Expression(_pClass, kvals); + keyexps[ii++] = new Key.Expression(_pClass, kvals); } return new Or(keyexps); } diff --git a/src/java/com/samskivert/depot/impl/BuildVisitor.java b/src/java/com/samskivert/depot/impl/BuildVisitor.java index 7b251a8..da730e6 100644 --- a/src/java/com/samskivert/depot/impl/BuildVisitor.java +++ b/src/java/com/samskivert/depot/impl/BuildVisitor.java @@ -117,7 +117,7 @@ public abstract class BuildVisitor implements ExpressionVisitor return null; } - public Void visit (Key.Expression key) + public Void visit (Key.Expression key) { Class pClass = key.getPersistentClass(); String[] keyFields = DepotUtil.getKeyFields(pClass); @@ -327,7 +327,7 @@ public abstract class BuildVisitor implements ExpressionVisitor return null; } - public Void visit (Exists exists) + public Void visit (Exists exists) { _builder.append("exists "); exists.getSubClause().accept(this); @@ -555,7 +555,7 @@ public abstract class BuildVisitor implements ExpressionVisitor return null; } - public Void visit (DropIndexClause dropIndexClause) + public Void visit (DropIndexClause dropIndexClause) { _builder.append("drop index "); appendIdentifier(dropIndexClause.getName()); diff --git a/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java b/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java index eb08b61..e83c593 100644 --- a/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java +++ b/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java @@ -229,7 +229,7 @@ public class ExpressionEvaluator return new NoValue("Non-boolean result from Where expression: " + result); } - public Object visit (Key.Expression key) + public Object visit (Key.Expression key) { Class pClass = key.getPersistentClass(); if (pClass != _pClass) { @@ -259,7 +259,7 @@ public class ExpressionEvaluator return true; } - public Object visit (Exists exists) + public Object visit (Exists exists) { throw new IllegalArgumentException("Can't evaluate expression: " + exists); } @@ -324,7 +324,7 @@ public class ExpressionEvaluator throw new IllegalArgumentException("Can't evaluate expression: " + createIndexClause); } - public Object visit (DropIndexClause dropIndexClause) + public Object visit (DropIndexClause dropIndexClause) { throw new IllegalArgumentException("Can't evaluate expression: " + dropIndexClause); } diff --git a/src/java/com/samskivert/depot/impl/ExpressionVisitor.java b/src/java/com/samskivert/depot/impl/ExpressionVisitor.java index 2bdf829..5053c9b 100644 --- a/src/java/com/samskivert/depot/impl/ExpressionVisitor.java +++ b/src/java/com/samskivert/depot/impl/ExpressionVisitor.java @@ -81,13 +81,13 @@ public interface ExpressionVisitor public T visit (ValueExp value); public T visit (IntervalExp interval); public T visit (WhereClause where); - public T visit (Key.Expression key); - public T visit (Exists exists); + public T visit (Key.Expression key); + public T visit (Exists exists); public T visit (SelectClause selectClause); public T visit (UpdateClause updateClause); public T visit (DeleteClause deleteClause); public T visit (InsertClause insertClause); public T visit (CreateIndexClause createIndexClause); - public T visit (DropIndexClause dropIndexClause); + public T visit (DropIndexClause dropIndexClause); public T visit (Case caseExp); } diff --git a/src/java/com/samskivert/depot/impl/MySQLBuilder.java b/src/java/com/samskivert/depot/impl/MySQLBuilder.java index f42a84f..0b855ab 100644 --- a/src/java/com/samskivert/depot/impl/MySQLBuilder.java +++ b/src/java/com/samskivert/depot/impl/MySQLBuilder.java @@ -116,7 +116,7 @@ public class MySQLBuilder } @Override - public Void visit (DropIndexClause dropIndexClause) + public Void visit (DropIndexClause dropIndexClause) { // MySQL's indexes are scoped on the table, not on the database, and the // SQL syntax reflects it: DROP INDEX fooIx on fooTable diff --git a/src/java/com/samskivert/depot/impl/clause/DropIndexClause.java b/src/java/com/samskivert/depot/impl/clause/DropIndexClause.java index 359a022..8241c3c 100644 --- a/src/java/com/samskivert/depot/impl/clause/DropIndexClause.java +++ b/src/java/com/samskivert/depot/impl/clause/DropIndexClause.java @@ -30,7 +30,7 @@ import com.samskivert.depot.impl.ExpressionVisitor; /** * Represents an DROP INDEX instruction to the database. */ -public class DropIndexClause +public class DropIndexClause implements QueryClause { public DropIndexClause (Class pClass, String name) diff --git a/src/java/com/samskivert/depot/operator/Exists.java b/src/java/com/samskivert/depot/operator/Exists.java index bc253f0..a6d2b37 100644 --- a/src/java/com/samskivert/depot/operator/Exists.java +++ b/src/java/com/samskivert/depot/operator/Exists.java @@ -29,7 +29,7 @@ import com.samskivert.depot.impl.ExpressionVisitor; /** * The SQL 'exists' operator. */ -public class Exists +public class Exists implements SQLOperator { public Exists (SelectClause clause)