From: mike <mike>
Date: Fri, 29 Jun 2007 10:24:03 +0000 (+0000)
Subject: Removed ModifierSet, since base class now has this.
X-Git-Tag: v1.5~94
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=b53fe47e0bd5f0825b0d8ceeb33538e714bf9e7e;p=cql-java-moved-to-github.git

Removed ModifierSet, since base class now has this.
Removed opXCQL() method, as base class does this for us.
---

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, <I>incomplete</I>, 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'.