[Mulgara-svn] r462 - branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational

[pag at mulgara.org]

Author: pag
Date: 2007-10-03 17:05:54 -0500 (Wed, 03 Oct 2007)
New Revision: 462

Modified:
   branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
Log:
Don't know what I was thinking when I keyed predConstraints on URIReference instead of ConstraintElement (thereby preventing Variables being in keys).  Fixed now.

Modified: branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
===================================================================
--- branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java	2007-10-02 17:41:13 UTC (rev 461)
+++ branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java	2007-10-03 22:05:54 UTC (rev 462)
@@ -98,7 +98,7 @@
 
   private Set<ConstraintExpression> rdfTypeConstraints;
 
-  private Map<URIReference,List<Constraint>> predConstraints;
+  private Map<ConstraintElement,List<Constraint>> predConstraints;
 
   private ConstraintElement model;
 
@@ -120,7 +120,7 @@
   public RelationalConstraint() {
     this.rdfTypeConstraints = new HashSet<ConstraintExpression>();
     this.variables = new HashSet<Variable>();
-    this.predConstraints = new HashMap<URIReference,List<Constraint>>();
+    this.predConstraints = new HashMap<ConstraintElement,List<Constraint>>();
   }
 
   public RelationalConstraint(ConstraintImpl constraint) {
@@ -134,7 +134,7 @@
 
     rdfTypeConstraints.addAll(constraint.rdfTypeConstraints);
 
-    for (URIReference key: constraint.predConstraints.keySet()) {
+    for (ConstraintElement key: constraint.predConstraints.keySet()) {
       List<Constraint> lhs = constraint.predConstraints.get(key);
       List<Constraint> rhs = predConstraints.get(key);
       if (rhs == null) {
@@ -155,7 +155,7 @@
       List<Constraint> preds = predConstraints.get(constraint.getElement(0));
       if (preds == null) {
         preds = new ArrayList<Constraint>();
-        predConstraints.put((URIReference)constraint.getElement(0), preds);
+        predConstraints.put((ConstraintElement)constraint.getElement(0), preds);
       }
       preds.add(constraint);
     }
@@ -219,7 +219,7 @@
       bound.rdfTypeConstraints.add(ConstraintOperations.bindVariables(bindings, c));
     }
 
-    for (URIReference key: constraint.predConstraints.keySet()) {
+    for (ConstraintElement key: constraint.predConstraints.keySet()) {
       List<Constraint> entry = constraint.predConstraints.get(key);
       List<Constraint> bentry = new ArrayList<Constraint>();
       for (Constraint jc: entry) {