Remove addModifier() methods with setModifiers().

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / CQLProxNode.java

diff --git a/src/org/z3950/zing/cql/CQLProxNode.java b/src/org/z3950/zing/cql/CQLProxNode.java
index 9c7dff9..244cf9c 100644 (file)
--- 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.7 2002-12-05 17:14:52 mike Exp $
+// $Id: CQLProxNode.java,v 1.9 2007-06-27 22:15:04 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.Vector;
@@ -10,7 +10,7 @@ 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.7 2002-12-05 17:14:52 mike Exp $
+ * @version    $Id: CQLProxNode.java,v 1.9 2007-06-27 22:15:04 mike Exp $
  */
 public class CQLProxNode extends CQLBooleanNode {
     ModifierSet ms;
@@ -40,30 +40,20 @@ public class CQLProxNode extends CQLBooleanNode {
     }
 
     /**
-     * Adds a modifier of the specified <TT>type</TT> and
-     * <TT>value</TT> to a proximity node.  Valid types are
-     * <TT>relation</TT>, <TT>distance</TT>, <TT>unit</TT> and
-     * <TT>ordering</TT>.
-     * <P>
-     * For information on the semantics of these paramaters, see
-     * <A href="http://zing.z3950.org/cql/intro.html#3.1"
-     * >section 3.1 (Proximity)</A> of
-     * <I>A Gentle Introduction to CQL</I></A>.
+     * Adds a modifier of the specified <TT>type</TT>,
+     * <TT>comparison</TT> and <TT>value</TT> to a proximity node.
      */
-    public void addModifier(String type, String value) {
-       ms.addModifier(type, value);
+    public void addModifier(String type, String comparison, String value) {
+       ms.addModifier(type, comparison, value);
     }
 
     /**
      * Returns an array of the modifiers associated with a proximity
      * node.
      * @return
-     * An array of modifiers, each represented by a two-element
-     * <TT>Vector</TT>, in which element 0 is the modifier type
-     * (e.g. <TT>distance</TT> or <TT>ordering</TT>) and element 1 is
-     * the associated value (e.g. <TT>3</TT> or <TT>unordered</TT>).
+     * An array of Modifier objects.
      */
-    public Vector[] getModifiers() {
+    public Vector<Modifier> getModifiers() {
        return ms.getModifiers();
     }