[Mulgara-svn] r2045 - trunk/src/jar/resolver/java/org/mulgara/resolver

alexhall at mulgara.org alexhall at mulgara.org
Tue Sep 27 16:39:58 UTC 2011


Author: alexhall
Date: 2011-09-27 16:39:58 +0000 (Tue, 27 Sep 2011)
New Revision: 2045

Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
Log:
Fix Java generics warnings.

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java	2011-09-26 22:50:53 UTC (rev 2044)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java	2011-09-27 16:39:58 UTC (rev 2045)
@@ -95,7 +95,7 @@
   static void initializeModelResolutionHandlers() {
     ConstraintOperations.addModelResolutionHandlers(new NVPair[]
       {
-        new NVPair(GraphUnion.class, new GraphResolutionHandler() {
+        new NVPair<Class<GraphUnion>, GraphResolutionHandler>(GraphUnion.class, new GraphResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr,
                                 Constraint constraint) throws Exception {
             Tuples lhs = ConstraintOperations.
@@ -118,7 +118,7 @@
             }
           }
         }),
-        new NVPair(GraphIntersection.class, new GraphResolutionHandler() {
+        new NVPair<Class<GraphIntersection>, GraphResolutionHandler>(GraphIntersection.class, new GraphResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr,
                                 Constraint constraint) throws Exception {
             Tuples lhs = ConstraintOperations.
@@ -141,13 +141,13 @@
             }
           }
         }),
-        new NVPair(GraphResource.class, new GraphResolutionHandler() {
+        new NVPair<Class<GraphResource>, GraphResolutionHandler>(GraphResource.class, new GraphResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr,
                                 Constraint constraint) throws Exception {
             return context.resolve((GraphResource)modelExpr, (Constraint)constraint);
           }
         }),
-        new NVPair(GraphVariable.class, new GraphResolutionHandler() {
+        new NVPair<Class<GraphVariable>, GraphResolutionHandler>(GraphVariable.class, new GraphResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr,
                                 Constraint constraint) throws Exception {
             Variable modelVar = ((GraphVariable)modelExpr).getVariable();
@@ -173,36 +173,36 @@
   static void initializeConstraintResolutionHandlers() {
     ConstraintOperations.addConstraintResolutionHandlers(new NVPair[]
       {
-        new NVPair(ConstraintConjunction.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintConjunction>, ConstraintResolutionHandler>(ConstraintConjunction.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
-            List l =
+            List<Tuples> l =
                 context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr);
             try {
               return TuplesOperations.join(l);
             } finally {
-              Iterator i = l.iterator();
+              Iterator<?> i = l.iterator();
               while (i.hasNext()) {
                 ((Tuples)i.next()).close();
               }
             }
           }
         }),
-        new NVPair(ConstraintDisjunction.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintDisjunction>, ConstraintResolutionHandler>(ConstraintDisjunction.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
-            List l =
+            List<Tuples> l =
                 context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr);
             try {
               if (context.isDistinctQuery()) return TuplesOperations.append(l);
               else return TuplesOperations.unorderedAppend(l);
             } finally {
-              Iterator i = l.iterator();
+              Iterator<?> i = l.iterator();
               while (i.hasNext()) {
                 ((Tuples)i.next()).close();
               }
             }
           }
         }),
-        new NVPair(ConstraintDifference.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintDifference>, ConstraintResolutionHandler>(ConstraintDifference.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             List<ConstraintExpression> constraints = ((ConstraintOperation)constraintExpr).getElements();
             assert constraints.size() == 2;
@@ -228,7 +228,7 @@
             }
           }
         }),
-        new NVPair(ConstraintOptionalJoin.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintOptionalJoin>, ConstraintResolutionHandler>(ConstraintOptionalJoin.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             List<Tuples> args = context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr);
             assert args.size() == 2;
@@ -248,21 +248,21 @@
             }
           }
         }),
-        new NVPair(ConstraintIs.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintIs>, ConstraintResolutionHandler>(ConstraintIs.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression 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(ConstraintAssignment.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintAssignment>, ConstraintResolutionHandler>(ConstraintAssignment.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             ConstraintAssignment assignment = (ConstraintAssignment)constraintExpr;
             Tuples arg = ConstraintOperations.resolveConstraintExpression(context, modelExpr, assignment.getContextConstraint());
             return TuplesOperations.assign(arg, assignment.getVariable(), assignment.getExpression(), context);
           }
         }),
-        new NVPair(ConstraintImpl.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintImpl>, ConstraintResolutionHandler>(ConstraintImpl.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             ConstraintImpl constraint = (ConstraintImpl)constraintExpr;
             ConstraintElement constraintElem = constraint.getModel();
@@ -287,12 +287,12 @@
             }
           }
         }),
-        new NVPair(WalkConstraint.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<WalkConstraint>, ConstraintResolutionHandler>(WalkConstraint.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             return WalkFunction.walk(context, (WalkConstraint)constraintExpr, modelExpr, context.getResolverSession());
           }
         }),
-        new NVPair(SingleTransitiveConstraint.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<SingleTransitiveConstraint>, ConstraintResolutionHandler>(SingleTransitiveConstraint.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             SingleTransitiveConstraint constraint = (SingleTransitiveConstraint)constraintExpr;
             if (constraint.isAnchored()) {
@@ -302,12 +302,12 @@
             }
           }
         }),
-        new NVPair(TransitiveConstraint.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<TransitiveConstraint>, ConstraintResolutionHandler>(TransitiveConstraint.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             return ExhaustiveTransitiveFunction.infer(context, (TransitiveConstraint)constraintExpr, modelExpr, context.getResolverSession());
           }
         }),
-        new NVPair(ConstraintFilter.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintFilter>, ConstraintResolutionHandler>(ConstraintFilter.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             Tuples unfiltered = ConstraintOperations.resolveConstraintExpression(context, modelExpr, ((ConstraintFilter)constraintExpr).getUnfilteredConstraint());
             Tuples result = null;
@@ -322,7 +322,7 @@
             }
           }
         }),
-        new NVPair(ConstraintIn.class, new ConstraintResolutionHandler() {
+        new NVPair<Class<ConstraintIn>, ConstraintResolutionHandler>(ConstraintIn.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, GraphExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             ConstraintIn constraint = (ConstraintIn)constraintExpr;
             GraphExpression graph;
@@ -342,63 +342,63 @@
   static void initializeConstraintBindingHandlers() {
     ConstraintOperations.addConstraintBindingHandlers(new NVPair[]
       {
-        new NVPair(ConstraintTrue.class, new ConstraintBindingHandler() {
-          public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+        new NVPair<Class<ConstraintTrue>, ConstraintBindingHandler>(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<ConstraintFalse>, ConstraintBindingHandler>(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<ConstraintImpl>, ConstraintBindingHandler>(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<ConstraintIs>, ConstraintBindingHandler>(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<SingleTransitiveConstraint>, ConstraintBindingHandler>(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<TransitiveConstraint>, ConstraintBindingHandler>(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<WalkConstraint>, ConstraintBindingHandler>(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(ConstraintFilter.class, new ConstraintBindingHandler() {
-          public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+        new NVPair<Class<ConstraintFilter>, ConstraintBindingHandler>(ConstraintFilter.class, new ConstraintBindingHandler() {
+          public ConstraintExpression bindVariables(Map<Variable, Value> bindings, ConstraintExpression constraintExpr) throws Exception {
             return new ConstraintFilter(ConstraintOperations.replace(bindings, (Constraint)constraintExpr), ((ConstraintFilter)constraintExpr).getFilter());
           }
         }),
-        new NVPair(ConstraintConjunction.class, new ConstraintBindingHandler() {
-          public ConstraintExpression bindVariables(Map bindings, ConstraintExpression constraintExpr) throws Exception {
+        new NVPair<Class<ConstraintConjunction>, ConstraintBindingHandler>(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<ConstraintDisjunction>, ConstraintBindingHandler>(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 {
-            List args = ConstraintOperations.replaceOperationArgs(bindings, (ConstraintOperation)constraintExpr);
+        new NVPair<Class<ConstraintDifference>, ConstraintBindingHandler>(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));
           }
         }),
@@ -409,7 +409,7 @@
   static void initializeConstraintModelRewrites() {
     ConstraintOperations.addConstraintModelRewrites(new NVPair[]
       {
-        new NVPair(ConstraintImpl.class, new ConstraintGraphRewrite() {
+        new NVPair<Class<ConstraintImpl>, ConstraintGraphRewrite>(ConstraintImpl.class, new ConstraintGraphRewrite() {
           public Constraint rewrite(ConstraintElement newModel, Constraint constraint) throws Exception {
             return new ConstraintImpl(constraint.getElement(0), constraint.getElement(1), constraint.getElement(2), newModel);
           }
@@ -421,7 +421,7 @@
   static void initializeConstraintVariableRewrites() {
     ConstraintOperations.addConstraintVariableRewrites(new NVPair[]
       {
-        new NVPair(ConstraintImpl.class, new ConstraintVariableRewrite() {
+        new NVPair<Class<ConstraintImpl>, ConstraintVariableRewrite>(ConstraintImpl.class, new ConstraintVariableRewrite() {
           public Constraint rewrite(Variable modelVar, Variable newVar, Constraint constraint) throws Exception {
             ConstraintElement[] ce = new ConstraintElement[3];
             for (int e = 0; e < ce.length; e++) {
@@ -440,7 +440,7 @@
   static void initializeConstraintLocalizations() {
     ConstraintOperations.addConstraintLocalizations(new NVPair[]
       {
-        new NVPair(ConstraintImpl.class, new ConstraintLocalization() {
+        new NVPair<Class<ConstraintImpl>, ConstraintLocalization>(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)),



More information about the Mulgara-svn mailing list