Merge branch 'master' of github.com:mysema/querydsl

This commit is contained in:
Timo Westkämper 2013-03-12 11:31:17 +02:00
commit 795ef3457b

View File

@ -73,7 +73,7 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
}
@Nullable
private volatile NumberExpression<T> abs, sum, min, max, floor, ceil;
private volatile NumberExpression<T> abs, sum, min, max, floor, ceil, round;
@Nullable
private volatile NumberExpression<Double> avg, sqrt;
@ -81,9 +81,6 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
@Nullable
private volatile NumberExpression<T> negation;
@Nullable
private volatile NumberExpression<Integer> round;
public NumberExpression(Expression<T> mixin) {
super(mixin);
}
@ -611,9 +608,9 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
* @see java.lang.Math#round(double)
* @see java.lang.Math#round(float)
*/
public NumberExpression<Integer> round() {
public NumberExpression<T> round() {
if (round == null) {
round = NumberOperation.create(Integer.class, MathOps.ROUND, mixin);
round = NumberOperation.create(getType(), MathOps.ROUND, mixin);
}
return round;
}