From b53fe47e0bd5f0825b0d8ceeb33538e714bf9e7e Mon Sep 17 00:00:00 2001 From: mike Date: Fri, 29 Jun 2007 10:24:03 +0000 Subject: [PATCH] Removed ModifierSet, since base class now has this. Removed opXCQL() method, as base class does this for us. --- src/org/z3950/zing/cql/CQLProxNode.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/org/z3950/zing/cql/CQLProxNode.java b/src/org/z3950/zing/cql/CQLProxNode.java index 244cf9c..23eab22 100644 --- a/src/org/z3950/zing/cql/CQLProxNode.java +++ b/src/org/z3950/zing/cql/CQLProxNode.java @@ -1,4 +1,4 @@ -// $Id: CQLProxNode.java,v 1.9 2007-06-27 22:15:04 mike Exp $ +// $Id: CQLProxNode.java,v 1.10 2007-06-29 10:24:03 mike Exp $ package org.z3950.zing.cql; import java.util.Vector; @@ -10,11 +10,9 @@ import java.util.Vector; * candidate records which are sufficiently close to each other, as * specified by a set of proximity parameters. * - * @version $Id: CQLProxNode.java,v 1.9 2007-06-27 22:15:04 mike Exp $ + * @version $Id: CQLProxNode.java,v 1.10 2007-06-29 10:24:03 mike Exp $ */ public class CQLProxNode extends CQLBooleanNode { - ModifierSet ms; - /** * Creates a new, incomplete, proximity node with the * specified left-hand side. No right-hand side is specified at @@ -26,8 +24,7 @@ public class CQLProxNode extends CQLBooleanNode { * the right-hand-side sub-tree is added. */ public CQLProxNode(CQLNode left) { - ms = new ModifierSet("prox"); - this.left = left; + super(left, null, new ModifierSet("prox")); // this.right left unresolved for now ... } @@ -61,10 +58,6 @@ public class CQLProxNode extends CQLBooleanNode { return ms.toCQL(); } - String opXCQL(int level) { - return ms.toXCQL(level, "boolean"); - } - /* * proximity ::= exclusion distance ordered relation which-code unit-code. * exclusion ::= '1' | '0' | 'void'. -- 1.7.10.4