[Mulgara-svn] r410 - branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2007-09-10 03:59:57 -0500 (Mon, 10 Sep 2007)
New Revision: 410

Modified:
   branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java
   branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
Log:
More steps towards making LocalQuery completely redundant - collapsing functions
at the moment, and removing unnecessary (historical) coupling with other files.



Modified: branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java
===================================================================
--- branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java	2007-09-10 07:41:30 UTC (rev 409)
+++ branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQuery.java	2007-09-10 08:59:57 UTC (rev 410)
@@ -213,11 +213,8 @@
         logger.debug("Stacktrace: ", new Throwable());
       }
 
-      ConstraintExpression tmpConstraint = new ConstraintConjunction(
-          new ConstraintConjunction(new ArrayList()), constraintExpression);
+      Tuples result = resolveMECE(modelExpression, constraintExpression);
 
-      Tuples result = resolveMECE(modelExpression, tmpConstraint);
-
       if (logger.isDebugEnabled()) {
         logger.debug("Tuples result = " + TuplesOperations.formatTuplesTree(result));
       }
@@ -232,12 +229,6 @@
       return result;
     } catch (TuplesException et) {
       throw new QueryException("Failed to resolve query", et);
-//    } catch (QueryException eq) {
-//      logger.warn("QueryException thrown in resolve: ", eq);
-//      throw eq;
-//    } catch (Exception e) {
-//      logger.warn("Exception thrown in resolve: ", e);
-//      throw new QueryException("Exception thrown in resolve", e);
     }
   }
 

Modified: branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java
===================================================================
--- branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java	2007-09-10 07:41:30 UTC (rev 409)
+++ branches/mgr-69/src/jar/resolver/java/org/mulgara/resolver/LocalQueryResolver.java	2007-09-10 08:59:57 UTC (rev 410)
@@ -477,7 +477,7 @@
 
 
   public Tuples resolve(ModelExpression modelExpression, ConstraintExpression constraintExpression) throws QueryException {
-    return localQuery.resolveMECE(modelExpression, constraintExpression);
+    return ConstraintOperations.resolveConstraintExpression(this, modelExpression, constraintExpression);
   }