[Mulgara-svn] r671 - in trunk: jxdata/iTQL src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2008-03-07 10:16:37 -0800 (Fri, 07 Mar 2008)
New Revision: 671

Removed:
   trunk/jxdata/iTQL/exclude_queries/
Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
Log:
Removed support for exclude() constraint.

If you think you need this, you don't - talk to us about how you actually want
to be using minus instead.

This has been done by commenting out the relevant constraint handler, so there
remains some cleanup to be done.



Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java	2008-03-07 06:37:30 UTC (rev 670)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java	2008-03-07 18:16:37 UTC (rev 671)
@@ -201,6 +201,7 @@
             }
           }
         }),
+/*
         new NVPair(ConstraintNegation.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             if (((ConstraintNegation)constraintExpr).getModel().equals(Variable.FROM)) {
@@ -215,6 +216,7 @@
             }
           }
         }),
+*/
         new NVPair(WalkConstraint.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             return WalkFunction.walk(context, (WalkConstraint)constraintExpr, modelExpr, context.getResolverSession());
@@ -280,11 +282,13 @@
                                       ConstraintOperations.replace(bindings, wc.getUnanchoredConstraint()));
           }
         }),
+/*
         new NVPair(ConstraintNegation.class, new ConstraintBindingHandler() {
           public ConstraintExpression bindVariables(Map 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 {
             return new ConstraintConjunction(ConstraintOperations.replaceOperationArgs(bindings, (ConstraintOperation)constraintExpr));
@@ -312,11 +316,13 @@
             return new ConstraintImpl(constraint.getElement(0), constraint.getElement(1), constraint.getElement(2), newModel);
           }
         }),
+/*
         new NVPair(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));
           }
         }),
+*/
       });
   }
 
@@ -331,6 +337,7 @@
                 context.localize(constraint.getElement(3)));
           }
         }),
+/*
         new NVPair(ConstraintNegation.class, new ConstraintLocalization() {
           public Constraint localize(QueryEvaluationContext context, Constraint constraint) throws Exception {
             return new ConstraintNegation(new ConstraintImpl(
@@ -340,6 +347,7 @@
                 context.localize(constraint.getElement(3))));
           }
         }),
+*/
       });
   }
 }