[Mulgara-svn] r2049 - in trunk/src/jar/query/java/org/mulgara/query: filter/arithmetic functions xpath
alexhall at mulgara.org
alexhall at mulgara.org
Tue Sep 27 19:31:18 UTC 2011
Author: alexhall
Date: 2011-09-27 19:31:17 +0000 (Tue, 27 Sep 2011)
New Revision: 2049
Modified:
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java
trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinus.java
trunk/src/jar/query/java/org/mulgara/query/functions/MulgaraFunction.java
trunk/src/jar/query/java/org/mulgara/query/xpath/SparqlFunctionGroup.java
Log:
Fix some Java generics warnings.
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/AddOperation.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -40,8 +40,7 @@
* @param right The second addend
* @return The sum of left and right
*/
- @SuppressWarnings("unchecked")
- Number doOperation(NumberOps ops, Number left, Number right) {
+ <L extends Number, R extends Number> Number doOperation(NumberOps<L,R> ops, L left, R right) {
return ops.sum(left, right);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/BinaryOperation.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -74,7 +74,8 @@
public Number getNumber() throws QueryException {
Number left = lhs.getNumber();
Number right = rhs.getNumber();
- NumberOps<? extends Number, ? extends Number> op = opMap.get(new ClassPair(left, right));
+ @SuppressWarnings("unchecked")
+ NumberOps<Number, Number> op = (NumberOps<Number, Number>)opMap.get(new ClassPair(left, right));
if (op == null) throw new AssertionError("Missing entry in operation map");
return doOperation(op, left, right);
}
@@ -86,7 +87,7 @@
* @param right The second operand
* @return The arithmetic result of applying the operation to the parameters
*/
- abstract Number doOperation(NumberOps<? extends Number, ? extends Number> ops, Number left, Number right);
+ abstract <L extends Number, R extends Number> Number doOperation(NumberOps<L,R> ops, L left, R right);
/** Stores classes as an integrated pair for mapping pairs of Numbers to their appropriate functions */
static class ClassPair {
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/DivideOperation.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -40,8 +40,7 @@
* @param right The divisor
* @return The quotient of dividing right into left
*/
- @SuppressWarnings("unchecked")
- Number doOperation(NumberOps ops, Number left, Number right) {
+ <L extends Number, R extends Number> Number doOperation(NumberOps<L,R> ops, L left, R right) {
return ops.divide(left, right);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MinusOperation.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -40,8 +40,7 @@
* @param right The subtrahend
* @return The difference between left and right
*/
- @SuppressWarnings("unchecked")
- Number doOperation(NumberOps ops, Number left, Number right) {
+ <L extends Number, R extends Number> Number doOperation(NumberOps<L,R> ops, L left, R right) {
return ops.subtract(left, right);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/MultiplyOperation.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -40,8 +40,7 @@
* @param right The second operand
* @return The product of left and right
*/
- @SuppressWarnings("unchecked")
- Number doOperation(NumberOps ops, Number left, Number right) {
+ <L extends Number, R extends Number> Number doOperation(NumberOps<L,R> ops, L left, R right) {
return ops.product(left, right);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinus.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinus.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/arithmetic/UnaryMinus.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -65,7 +65,7 @@
@SuppressWarnings("unchecked")
public Number getNumber() throws QueryException {
Number n = operand.getNumber();
- InversionOp op = opMap.get(n.getClass());
+ InversionOp<Number> op = (InversionOp<Number>)opMap.get(n.getClass());
if (op == null) throw new AssertionError("Missing entry in negation operation map");
return op.invert(n);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/functions/MulgaraFunction.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/functions/MulgaraFunction.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/functions/MulgaraFunction.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -32,13 +32,13 @@
* @author Paul Gearon
* @copyright © 2009 <a href="http://www.duraspace.org/">DuraSpace</a>
*/
- at SuppressWarnings("unchecked")
public abstract class MulgaraFunction implements XPathFunction {
/**
* Evaluate the method represented by this class, using the supplied arguments.
* @see javax.xml.xpath.XPathFunction#evaluate(java.util.List)
*/
+ @SuppressWarnings("rawtypes")
public Object evaluate(List args) throws XPathFunctionException {
checkArgs(getArity(), args);
try {
@@ -54,7 +54,7 @@
* @param args The list of arguments.
* @throws XPathFunctionException Thrown if the argument list is the wrong length.
*/
- protected void checkArgs(int expected, List args) throws XPathFunctionException {
+ protected void checkArgs(int expected, List<?> args) throws XPathFunctionException {
if (expected >= 0 && args.size() != expected) {
throw new XPathFunctionException("Incorrect number of parameters. Should be " + expected + ", but was: " + args.size());
}
Modified: trunk/src/jar/query/java/org/mulgara/query/xpath/SparqlFunctionGroup.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/xpath/SparqlFunctionGroup.java 2011-09-27 17:53:34 UTC (rev 2048)
+++ trunk/src/jar/query/java/org/mulgara/query/xpath/SparqlFunctionGroup.java 2011-09-27 19:31:17 UTC (rev 2049)
@@ -37,7 +37,6 @@
* @author Paul Gearon
* @copyright © 2009 <a href="http://www.duraspace.org/">DuraSpace</a>
*/
- at SuppressWarnings("unchecked")
public class SparqlFunctionGroup implements MulgaraFunctionGroup {
/** The prefix for the sparql: namespace */
@@ -84,27 +83,27 @@
/** Function to evaluate if a parameter is bound. */
static private class Bound extends MulgaraFunction {
- public Object eval(List args) { return args.get(0) != null; }
+ public Object eval(List<?> args) { return args.get(0) != null; }
}
/** Function to evaluate if a parameter is an IRI. */
static private class IsIRI extends MulgaraFunction {
- public Object eval(List args) { return args.get(0) instanceof URI; }
+ public Object eval(List<?> args) { return args.get(0) instanceof URI; }
}
/** Function to evaluate if a parameter is a URI. */
static private class IsURI extends MulgaraFunction {
- public Object eval(List args) { return args.get(0) instanceof URI; }
+ public Object eval(List<?> args) { return args.get(0) instanceof URI; }
}
/** Function to evaluate if a parameter is a blank node. */
static private class IsBlank extends MulgaraFunction {
- public Object eval(List args) { return args.get(0) instanceof BlankNode; }
+ public Object eval(List<?> args) { return args.get(0) instanceof BlankNode; }
}
/** Function to evaluate if a parameter is a literal. */
static private class IsLiteral extends MulgaraFunction {
- public Object eval(List args) {
+ public Object eval(List<?> args) {
Object o = args.get(0);
return o instanceof Literal || o instanceof String || o instanceof Number;
}
@@ -112,12 +111,12 @@
/** Function to convert a value to a string. */
static private class Str extends MulgaraFunction {
- public Object eval(List args) { return args.get(0).toString(); }
+ public Object eval(List<?> args) { return args.get(0).toString(); }
}
/** Function to get the language of a literal. This information is probably not available for this implementation. */
static private class Lang extends MulgaraFunction {
- public Object eval(List args) {
+ public Object eval(List<?> args) {
Object o = args.get(0);
return o instanceof Literal ? ((Literal)o).getLanguage() : "";
}
@@ -125,7 +124,7 @@
/** Function to get the datatype of a literal. This information is probably not available for this implementation. */
static private class Datatype extends MulgaraFunction {
- public Object eval(List args) {
+ public Object eval(List<?> args) {
Object o = args.get(0);
return o instanceof Literal ? ((Literal)o).getDatatype() : null;
}
@@ -137,7 +136,7 @@
*/
static private class LangMatches extends MulgaraFunction {
protected int getArity() { return 2; }
- public Object eval(List args) throws XPathFunctionException {
+ public Object eval(List<?> args) throws XPathFunctionException {
Object o = args.get(0);
if (o instanceof Literal) {
Literal l = (Literal)o;
@@ -157,7 +156,7 @@
static private abstract class LogicOp extends MulgaraFunction {
protected int getArity() { return 2; }
protected abstract boolean op(Object left, Object right) throws XPathFunctionException;
- public Object eval(List args) throws XPathFunctionException {
+ public Object eval(List<?> args) throws XPathFunctionException {
return op(args.get(0), args.get(1));
}
}
More information about the Mulgara-svn
mailing list