diff --git a/src/java/com/samskivert/depot/impl/expression/AggregateFun.java b/src/java/com/samskivert/depot/impl/expression/AggregateFun.java index bf8ee8c..5868cec 100644 --- a/src/java/com/samskivert/depot/impl/expression/AggregateFun.java +++ b/src/java/com/samskivert/depot/impl/expression/AggregateFun.java @@ -127,6 +127,7 @@ public abstract class AggregateFun extends OneArgFun return _distinct; } + @Override public String toString () { return getCanonicalFunctionName() + "(" + (_distinct ? "distinct " : "") + _arg + ")"; diff --git a/src/java/com/samskivert/depot/impl/expression/Function.java b/src/java/com/samskivert/depot/impl/expression/Function.java index 51b5c9b..71a39f8 100644 --- a/src/java/com/samskivert/depot/impl/expression/Function.java +++ b/src/java/com/samskivert/depot/impl/expression/Function.java @@ -56,6 +56,7 @@ public interface Function return _arg; } + @Override public String toString () { return getCanonicalFunctionName() + "(" + _arg + ")"; @@ -78,6 +79,7 @@ public interface Function _arg2.addClasses(classSet); } + @Override public String toString () { return getCanonicalFunctionName() + "(" + _arg1 + ", " + _arg2 + ")"; @@ -93,6 +95,7 @@ public interface Function super(args); } + @Override public String toString () { return getCanonicalFunctionName() + "(" + StringUtil.join(_args, ", ") + ")"; diff --git a/src/java/com/samskivert/depot/impl/util/SeqImpl.java b/src/java/com/samskivert/depot/impl/util/SeqImpl.java index 8a68a28..d43de74 100644 --- a/src/java/com/samskivert/depot/impl/util/SeqImpl.java +++ b/src/java/com/samskivert/depot/impl/util/SeqImpl.java @@ -49,19 +49,19 @@ public class SeqImpl extends AbstractCollection implements Sequence _func = func; } - // from interface Sequence and Collection + @Override // from interface Sequence and Collection public Iterator iterator () { return Iterators.transform(_source.iterator(), _func); } - // from interface Sequence and Collection + @Override // from interface Sequence and Collection public int size () { return _source.size(); } - // from interface Sequence and Collection + @Override // from interface Sequence and Collection public boolean isEmpty () { return _source.isEmpty(); diff --git a/src/java/com/samskivert/depot/tests/KeyTest.java b/src/java/com/samskivert/depot/tests/KeyTest.java index c0dfb56..cdff30d 100644 --- a/src/java/com/samskivert/depot/tests/KeyTest.java +++ b/src/java/com/samskivert/depot/tests/KeyTest.java @@ -41,7 +41,6 @@ public class KeyTest // make sure that the arguments we passed in got assigned in the right positions ColumnExp[] kfs = DepotUtil.getKeyFields(MonkeyRecord.class); int kspecies = 0, kmonkeyId = 0; - Comparable[] values = new Comparable[kfs.length]; for (int ii = 0; ii < kfs.length; ii++) { if (MonkeyRecord.SPECIES.equals(kfs[ii])) { kspecies = (Integer)(key.getValues()[ii]); @@ -61,7 +60,6 @@ public class KeyTest // make sure that the arguments we passed in got assigned in the right positions ColumnExp[] kfs = DepotUtil.getKeyFields(TestRecord.class); int krecordId = 0; - Comparable[] values = new Comparable[kfs.length]; for (int ii = 0; ii < kfs.length; ii++) { if (TestRecord.RECORD_ID.equals(kfs[ii])) { krecordId = (Integer)(key.getValues()[ii]);