[Mulgara-svn] r361 - branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver
pag at mulgara.org
pag at mulgara.org
Tue Aug 21 05:41:09 UTC 2007
Author: pag
Date: 2007-08-21 00:41:09 -0500 (Tue, 21 Aug 2007)
New Revision: 361
Modified:
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AppendAggregateTuples.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
Log:
Changed most untyped code over to using generics
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AppendAggregateTuples.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AppendAggregateTuples.java 2007-08-21 05:39:11 UTC (rev 360)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AppendAggregateTuples.java 2007-08-21 05:41:09 UTC (rev 361)
@@ -307,8 +307,8 @@
return cache[index];
}
- private Map createBindingMap(Tuples tuples) throws TuplesException {
- Map bindings = new HashMap();
+ private Map<Variable,Value> createBindingMap(Tuples tuples) throws TuplesException {
+ Map<Variable,Value> bindings = new HashMap<Variable,Value>();
Variable[] vars = tuples.getVariables();
for (int i = 0; i < columnIsLocalQuery.length; i++) {
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java 2007-08-21 05:39:11 UTC (rev 360)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/ConstraintOperations.java 2007-08-21 05:41:09 UTC (rev 361)
@@ -36,20 +36,15 @@
// Third party packages
import org.apache.log4j.Logger;
-import org.jrdf.graph.Node;
-import org.jrdf.graph.URIReference;
// Local packages
import org.mulgara.query.*;
-import org.mulgara.query.rdf.LiteralImpl;
-import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.ConstraintBindingHandler;
import org.mulgara.resolver.spi.ConstraintLocalization;
import org.mulgara.resolver.spi.ConstraintModelRewrite;
import org.mulgara.resolver.spi.ConstraintResolutionHandler;
import org.mulgara.resolver.spi.ModelResolutionHandler;
import org.mulgara.resolver.spi.QueryEvaluationContext;
-import org.mulgara.resolver.spi.ResolverSession;
import org.mulgara.store.tuples.Tuples;
import org.mulgara.util.NVPair;
@@ -74,50 +69,55 @@
/** Logger. */
private static final Logger logger = Logger.getLogger(ConstraintOperations.class.getName());
- static Map modelResolutionHandlers = new HashMap();
- static Map constraintResolutionHandlers = new HashMap();
- static Map constraintBindingHandlers = new HashMap();
- static Map constraintLocalizations = new HashMap();
- static Map constraintModelRewrites = new HashMap();
+ static Map<Class<? extends ConstraintExpression>,Object> modelResolutionHandlers =
+ new HashMap<Class<? extends ConstraintExpression>,Object>();
+ static Map<Class<? extends ConstraintExpression>,Object> constraintResolutionHandlers =
+ new HashMap<Class<? extends ConstraintExpression>,Object>();
+ static Map<Class<? extends ConstraintExpression>,Object> constraintBindingHandlers =
+ new HashMap<Class<? extends ConstraintExpression>,Object>();
+ static Map<Class<? extends ConstraintExpression>,Object> constraintLocalizations =
+ new HashMap<Class<? extends ConstraintExpression>,Object>();
+ static Map<Class<? extends ConstraintExpression>,Object> constraintModelRewrites =
+ new HashMap<Class<? extends ConstraintExpression>,Object>();
- static void addConstraintResolutionHandlers(NVPair[] resolutionHandlers) throws RuntimeException {
+ static void addConstraintResolutionHandlers(NVPair<Class<? extends ConstraintExpression>,Object>[] resolutionHandlers) throws RuntimeException {
addToMap(resolutionHandlers, constraintResolutionHandlers,
ConstraintExpression.class, ConstraintResolutionHandler.class);
}
- static void addConstraintBindingHandlers(NVPair[] bindingHandlers) throws RuntimeException {
+ static void addConstraintBindingHandlers(NVPair<Class<? extends ConstraintExpression>,Object>[] bindingHandlers) throws RuntimeException {
addToMap(bindingHandlers, constraintBindingHandlers,
ConstraintExpression.class, ConstraintBindingHandler.class);
}
- static void addModelResolutionHandlers(NVPair[] resolutionHandlers) throws RuntimeException {
+ static void addModelResolutionHandlers(NVPair<Class<? extends ConstraintExpression>,Object>[] resolutionHandlers) throws RuntimeException {
addToMap(resolutionHandlers, modelResolutionHandlers,
ModelExpression.class, ModelResolutionHandler.class);
}
- static void addConstraintModelRewrites(NVPair[] resolutionHandlers) throws RuntimeException {
+ static void addConstraintModelRewrites(NVPair<Class<? extends ConstraintExpression>,Object>[] resolutionHandlers) throws RuntimeException {
addToMap(resolutionHandlers, constraintModelRewrites,
ConstraintExpression.class, ConstraintModelRewrite.class);
}
- static void addConstraintLocalizations(NVPair[] resolutionHandlers) throws RuntimeException {
+ static void addConstraintLocalizations(NVPair<Class<? extends ConstraintExpression>,Object>[] resolutionHandlers) throws RuntimeException {
addToMap(resolutionHandlers, constraintLocalizations,
Constraint.class, ConstraintLocalization.class);
}
- static boolean constraintRegistered(Class constraintClass) {
+ static boolean constraintRegistered(Class<? extends ConstraintExpression> constraintClass) {
return modelResolutionHandlers.containsKey(constraintClass) ||
constraintResolutionHandlers.containsKey(constraintClass) ||
constraintLocalizations.containsKey(constraintClass) ||
constraintModelRewrites.containsKey(constraintClass);
}
- static void addToMap(NVPair[] pairs, Map dest, Class keyClass, Class valueClass) throws ClassCastException {
+ static void addToMap(NVPair<Class<? extends ConstraintExpression>,Object>[] pairs, Map<Class<? extends ConstraintExpression>,Object> dest, Class<?> keyClass, Class<?> valueClass) throws ClassCastException {
// Type check array.
for (int i = 0; i < pairs.length; i++) {
- Class key = (Class)pairs[i].getName();
+ Class<?> key = pairs[i].getName();
Object value = pairs[i].getValue();
if (!keyClass.isAssignableFrom(key)) {
throw new ClassCastException(key + " is not assignable to " + keyClass);
@@ -186,7 +186,7 @@
}
- public static ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws QueryException {
+ public static ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws QueryException {
try {
if (logger.isDebugEnabled()) {
logger.debug("Binding Variables in ConstraintExpression[" + constraintExpr.getClass() + "]");
@@ -260,7 +260,7 @@
}
- public static Constraint replace(Map bindings, Constraint constraint) throws QueryException {
+ public static Constraint replace(Map<Variable,Value> bindings, Constraint constraint) throws QueryException {
return ConstraintFactory.newConstraint(replace(bindings, constraint.getElement(0)),
replace(bindings, constraint.getElement(1)),
replace(bindings, constraint.getElement(2)),
@@ -268,7 +268,7 @@
}
- public static ConstraintElement replace(Map bindings, ConstraintElement element) {
+ public static ConstraintElement replace(Map<Variable,Value> bindings, ConstraintElement element) {
if (element instanceof Variable && bindings.containsKey(element)) {
return (ConstraintElement)bindings.get(element);
} else {
@@ -276,11 +276,10 @@
}
}
- public static List replaceOperationArgs(Map bindings, ConstraintOperation constraint) throws QueryException {
- List newArgs = new ArrayList();
- Iterator i = constraint.getElements().iterator();
- while (i.hasNext()) {
- newArgs.add(bindVariables(bindings, (ConstraintExpression)i.next()));
+ public static List<ConstraintExpression> replaceOperationArgs(Map<Variable,Value> bindings, ConstraintOperation constraint) throws QueryException {
+ List<ConstraintExpression> newArgs = new ArrayList<ConstraintExpression>();
+ for (ConstraintExpression expr: constraint.getElements()) {
+ newArgs.add(bindVariables(bindings, expr));
}
return newArgs;
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java 2007-08-21 05:39:11 UTC (rev 360)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java 2007-08-21 05:41:09 UTC (rev 361)
@@ -187,7 +187,7 @@
return false;
}
- Tuples resolve(Map outerBindings) throws QueryException
+ Tuples resolve(Map<Variable,Value> outerBindings) throws QueryException
{
try {
return context.innerCount(new LocalQuery(this,
@@ -201,16 +201,14 @@
// FIXME: This method should be using a LiteralTuples. Also I believe MULGARA_IS is now preallocated.
// Someone needs to try making the change and testing.
- private ConstraintExpression constrainBindings(Map bindings) throws LocalizeException {
- List args = new ArrayList();
- Iterator i = bindings.entrySet().iterator();
+ private ConstraintExpression constrainBindings(Map<Variable,Value> bindings) throws LocalizeException {
+ List<ConstraintExpression> args = new ArrayList<ConstraintExpression>();
logger.info("FIXME:localize should be lookup, need to preallocate MULGARA_IS");
- while (i.hasNext()) {
- Map.Entry entry = (Map.Entry)i.next();
+ for (Map.Entry<Variable,Value> entry: bindings.entrySet()) {
args.add(ConstraintIs.newLocalConstraintIs(
- (Variable)entry.getKey(),
+ entry.getKey(),
new LocalNode(resolverSession.localize(ConstraintIs.MULGARA_IS)),
- (Value)entry.getValue(),
+ entry.getValue(),
null));
}
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java 2007-08-21 05:39:11 UTC (rev 360)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java 2007-08-21 05:41:09 UTC (rev 361)
@@ -49,7 +49,7 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Logger;
+// import org.apache.log4j.Logger;
import org.jrdf.graph.Node;
import org.jrdf.graph.URIReference;
@@ -67,7 +67,6 @@
import org.mulgara.resolver.spi.ModelResolutionHandler;
import org.mulgara.resolver.spi.QueryEvaluationContext;
import org.mulgara.resolver.spi.ResolverSession;
-import org.mulgara.store.tuples.RestrictPredicateFactory;
import org.mulgara.store.tuples.Tuples;
import org.mulgara.store.tuples.TuplesOperations;
import org.mulgara.util.NVPair;
@@ -88,10 +87,10 @@
* Technology, Inc</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class LocalQueryResolver implements QueryEvaluationContext
-{
- /** Logger. */
- private static final Logger logger = Logger.getLogger(LocalQueryResolver.class.getName());
+ at SuppressWarnings({ "unchecked", "unchecked", "unchecked" })
+class LocalQueryResolver implements QueryEvaluationContext {
+ // /** Logger. */
+ // private static final Logger logger = Logger.getLogger(LocalQueryResolver.class.getName());
private LocalQuery localQuery;
@@ -122,11 +121,10 @@
this.resolverSession = resolverSession;
}
-
static {
ConstraintOperations.addModelResolutionHandlers(new NVPair[]
{
- new NVPair(ModelUnion.class, new ModelResolutionHandler() {
+ new NVPair<Class<? extends ModelExpression>,Object>(ModelUnion.class, new ModelResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr,
Constraint constraint) throws Exception {
return TuplesOperations.append(
@@ -134,7 +132,7 @@
ConstraintOperations.resolveModelExpression(context, ((ModelOperation)modelExpr).getRHS(), constraint));
}
}),
- new NVPair(ModelIntersection.class, new ModelResolutionHandler() {
+ new NVPair<Class<? extends ModelExpression>,Object>(ModelIntersection.class, new ModelResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr,
Constraint constraint) throws Exception {
return TuplesOperations.join(
@@ -142,7 +140,7 @@
ConstraintOperations.resolveModelExpression(context, ((ModelOperation)modelExpr).getRHS(), constraint));
}
}),
- new NVPair(ModelResource.class, new ModelResolutionHandler() {
+ new NVPair<Class<? extends ModelExpression>,Object>(ModelResource.class, new ModelResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr,
Constraint constraint) throws Exception {
return context.resolve((ModelResource)modelExpr, (Constraint)constraint);
@@ -151,37 +149,36 @@
});
}
-
static {
ConstraintOperations.addConstraintResolutionHandlers(new NVPair[]
{
- new NVPair(ConstraintConjunction.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintConjunction.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
return TuplesOperations.join(
context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr));
}
}),
- new NVPair(ConstraintDisjunction.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintDisjunction.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
return TuplesOperations.append(
context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr));
}
}),
- new NVPair(ConstraintDifference.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintDifference.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
- List args = context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr);
+ List<Tuples> args = context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr);
assert args.size() == 2;
- return TuplesOperations.subtract((Tuples)args.get(0), (Tuples)args.get(1));
+ return TuplesOperations.subtract(args.get(0), args.get(1));
}
}),
- new NVPair(ConstraintIs.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintIs.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
ConstraintIs constraint = (ConstraintIs)constraintExpr;
return TuplesOperations.assign((Variable)context.localize(constraint.getVariable()),
((LocalNode)context.localize(constraint.getValueNode())).getValue());
}
}),
- new NVPair(ConstraintImpl.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintImpl.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
ConstraintElement constraintElem =
((ConstraintImpl) constraintExpr).getModel();
@@ -203,7 +200,7 @@
}
}
}),
- new NVPair(ConstraintNegation.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintNegation.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
if (((ConstraintNegation)constraintExpr).getModel().equals(Variable.FROM)) {
return ConstraintOperations.resolveModelExpression(context, modelExpr, (Constraint)constraintExpr);
@@ -217,12 +214,12 @@
}
}
}),
- new NVPair(WalkConstraint.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(WalkConstraint.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
return WalkFunction.walk(context, (WalkConstraint)constraintExpr, modelExpr, context.getResolverSession());
}
}),
- new NVPair(SingleTransitiveConstraint.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(SingleTransitiveConstraint.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
SingleTransitiveConstraint constraint = (SingleTransitiveConstraint)constraintExpr;
if (constraint.isAnchored()) {
@@ -232,7 +229,7 @@
}
}
}),
- new NVPair(TransitiveConstraint.class, new ConstraintResolutionHandler() {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(TransitiveConstraint.class, new ConstraintResolutionHandler() {
public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
return ExhaustiveTransitiveFunction.infer(context, (TransitiveConstraint)constraintExpr, modelExpr, context.getResolverSession());
}
@@ -243,62 +240,62 @@
static {
ConstraintOperations.addConstraintBindingHandlers(new NVPair[]
{
- new NVPair(ConstraintTrue.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintTrue.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return constraintExpr;
}
}),
- new NVPair(ConstraintFalse.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintFalse.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return constraintExpr;
}
}),
- new NVPair(ConstraintImpl.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintImpl.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return ConstraintOperations.replace(bindings, (Constraint)constraintExpr);
}
}),
- new NVPair(ConstraintIs.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintIs.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return ConstraintOperations.replace(bindings, (Constraint)constraintExpr);
}
}),
- new NVPair(SingleTransitiveConstraint.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(SingleTransitiveConstraint.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return new SingleTransitiveConstraint(ConstraintOperations.replace(bindings, (Constraint)constraintExpr));
}
}),
- new NVPair(TransitiveConstraint.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(TransitiveConstraint.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
TransitiveConstraint tc = (TransitiveConstraint)constraintExpr;
return new TransitiveConstraint(ConstraintOperations.replace(bindings, tc.getAnchoredConstraint()),
ConstraintOperations.replace(bindings, tc.getUnanchoredConstraint()));
}
}),
- new NVPair(WalkConstraint.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(WalkConstraint.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
WalkConstraint wc = (WalkConstraint)constraintExpr;
return new WalkConstraint(ConstraintOperations.replace(bindings, wc.getAnchoredConstraint()),
ConstraintOperations.replace(bindings, wc.getUnanchoredConstraint()));
}
}),
- new NVPair(ConstraintNegation.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintNegation.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return new ConstraintNegation(ConstraintOperations.replace(bindings, (Constraint)constraintExpr));
}
}),
- new NVPair(ConstraintConjunction.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintConjunction.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return new ConstraintConjunction(ConstraintOperations.replaceOperationArgs(bindings, (ConstraintOperation)constraintExpr));
}
}),
- new NVPair(ConstraintDisjunction.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintDisjunction.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
return new ConstraintDisjunction(ConstraintOperations.replaceOperationArgs(bindings, (ConstraintOperation)constraintExpr));
}
}),
- new NVPair(ConstraintDifference.class, new ConstraintBindingHandler() {
- public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+ new NVPair<Class<? extends ConstraintExpression>,Object>(ConstraintDifference.class, new ConstraintBindingHandler() {
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings, ConstraintExpression constraintExpr) throws Exception {
List args = ConstraintOperations.replaceOperationArgs(bindings, (ConstraintOperation)constraintExpr);
return new ConstraintDifference((ConstraintExpression)args.get(0), (ConstraintExpression)args.get(1));
}
@@ -310,12 +307,12 @@
static {
ConstraintOperations.addConstraintModelRewrites(new NVPair[]
{
- new NVPair(ConstraintImpl.class, new ConstraintModelRewrite() {
+ new NVPair<Class<? extends Constraint>,Object>(ConstraintImpl.class, new ConstraintModelRewrite() {
public Constraint rewrite(ConstraintElement newModel, Constraint constraint) throws Exception {
return new ConstraintImpl(constraint.getElement(0), constraint.getElement(1), constraint.getElement(2), newModel);
}
}),
- new NVPair(ConstraintNegation.class, new ConstraintModelRewrite() {
+ new NVPair<Class<? extends Constraint>,Object>(ConstraintNegation.class, new ConstraintModelRewrite() {
public Constraint rewrite(ConstraintElement newModel, Constraint constraint) throws Exception {
return new ConstraintNegation(new ConstraintImpl(constraint.getElement(0), constraint.getElement(1), constraint.getElement(2), newModel));
}
@@ -326,7 +323,7 @@
static {
ConstraintOperations.addConstraintLocalizations(new NVPair[]
{
- new NVPair(ConstraintImpl.class, new ConstraintLocalization() {
+ new NVPair<Class<? extends Constraint>,Object>(ConstraintImpl.class, new ConstraintLocalization() {
public Constraint localize(QueryEvaluationContext context, Constraint constraint) throws Exception {
return new ConstraintImpl(context.localize(constraint.getElement(0)),
context.localize(constraint.getElement(1)),
@@ -334,7 +331,7 @@
context.localize(constraint.getElement(3)));
}
}),
- new NVPair(ConstraintNegation.class, new ConstraintLocalization() {
+ new NVPair<Class<? extends Constraint>,Object>(ConstraintNegation.class, new ConstraintLocalization() {
public Constraint localize(QueryEvaluationContext context, Constraint constraint) throws Exception {
return new ConstraintNegation(new ConstraintImpl(
context.localize(constraint.getElement(0)),
More information about the Mulgara-svn
mailing list