Via Charlie Groves, some bits that Eclipse noticed.
This commit is contained in:
@@ -127,6 +127,7 @@ public abstract class AggregateFun extends OneArgFun
|
|||||||
return _distinct;
|
return _distinct;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String toString ()
|
public String toString ()
|
||||||
{
|
{
|
||||||
return getCanonicalFunctionName() + "(" + (_distinct ? "distinct " : "") + _arg + ")";
|
return getCanonicalFunctionName() + "(" + (_distinct ? "distinct " : "") + _arg + ")";
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public interface Function
|
|||||||
return _arg;
|
return _arg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String toString ()
|
public String toString ()
|
||||||
{
|
{
|
||||||
return getCanonicalFunctionName() + "(" + _arg + ")";
|
return getCanonicalFunctionName() + "(" + _arg + ")";
|
||||||
@@ -78,6 +79,7 @@ public interface Function
|
|||||||
_arg2.addClasses(classSet);
|
_arg2.addClasses(classSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String toString ()
|
public String toString ()
|
||||||
{
|
{
|
||||||
return getCanonicalFunctionName() + "(" + _arg1 + ", " + _arg2 + ")";
|
return getCanonicalFunctionName() + "(" + _arg1 + ", " + _arg2 + ")";
|
||||||
@@ -93,6 +95,7 @@ public interface Function
|
|||||||
super(args);
|
super(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public String toString ()
|
public String toString ()
|
||||||
{
|
{
|
||||||
return getCanonicalFunctionName() + "(" + StringUtil.join(_args, ", ") + ")";
|
return getCanonicalFunctionName() + "(" + StringUtil.join(_args, ", ") + ")";
|
||||||
|
|||||||
@@ -49,19 +49,19 @@ public class SeqImpl<F, T> extends AbstractCollection<T> implements Sequence<T>
|
|||||||
_func = func;
|
_func = func;
|
||||||
}
|
}
|
||||||
|
|
||||||
// from interface Sequence<T> and Collection<T>
|
@Override // from interface Sequence<T> and Collection<T>
|
||||||
public Iterator<T> iterator ()
|
public Iterator<T> iterator ()
|
||||||
{
|
{
|
||||||
return Iterators.transform(_source.iterator(), _func);
|
return Iterators.transform(_source.iterator(), _func);
|
||||||
}
|
}
|
||||||
|
|
||||||
// from interface Sequence<T> and Collection<T>
|
@Override // from interface Sequence<T> and Collection<T>
|
||||||
public int size ()
|
public int size ()
|
||||||
{
|
{
|
||||||
return _source.size();
|
return _source.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
// from interface Sequence<T> and Collection<T>
|
@Override // from interface Sequence<T> and Collection<T>
|
||||||
public boolean isEmpty ()
|
public boolean isEmpty ()
|
||||||
{
|
{
|
||||||
return _source.isEmpty();
|
return _source.isEmpty();
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ public class KeyTest
|
|||||||
// make sure that the arguments we passed in got assigned in the right positions
|
// make sure that the arguments we passed in got assigned in the right positions
|
||||||
ColumnExp[] kfs = DepotUtil.getKeyFields(MonkeyRecord.class);
|
ColumnExp[] kfs = DepotUtil.getKeyFields(MonkeyRecord.class);
|
||||||
int kspecies = 0, kmonkeyId = 0;
|
int kspecies = 0, kmonkeyId = 0;
|
||||||
Comparable<?>[] values = new Comparable<?>[kfs.length];
|
|
||||||
for (int ii = 0; ii < kfs.length; ii++) {
|
for (int ii = 0; ii < kfs.length; ii++) {
|
||||||
if (MonkeyRecord.SPECIES.equals(kfs[ii])) {
|
if (MonkeyRecord.SPECIES.equals(kfs[ii])) {
|
||||||
kspecies = (Integer)(key.getValues()[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
|
// make sure that the arguments we passed in got assigned in the right positions
|
||||||
ColumnExp[] kfs = DepotUtil.getKeyFields(TestRecord.class);
|
ColumnExp[] kfs = DepotUtil.getKeyFields(TestRecord.class);
|
||||||
int krecordId = 0;
|
int krecordId = 0;
|
||||||
Comparable<?>[] values = new Comparable<?>[kfs.length];
|
|
||||||
for (int ii = 0; ii < kfs.length; ii++) {
|
for (int ii = 0; ii < kfs.length; ii++) {
|
||||||
if (TestRecord.RECORD_ID.equals(kfs[ii])) {
|
if (TestRecord.RECORD_ID.equals(kfs[ii])) {
|
||||||
krecordId = (Integer)(key.getValues()[ii]);
|
krecordId = (Integer)(key.getValues()[ii]);
|
||||||
|
|||||||
Reference in New Issue
Block a user