projects
/
cql-java-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment.
[cql-java-moved-to-github.git]
/
src
/
org
/
z3950
/
zing
/
cql
/
CQLNode.java
diff --git
a/src/org/z3950/zing/cql/CQLNode.java
b/src/org/z3950/zing/cql/CQLNode.java
index
cfc6e29
..
4a11592
100644
(file)
--- a/
src/org/z3950/zing/cql/CQLNode.java
+++ b/
src/org/z3950/zing/cql/CQLNode.java
@@
-1,4
+1,4
@@
-// $Id: CQLNode.java,v 1.21 2002-12-12 10:24:25 mike Exp $
+// $Id: CQLNode.java,v 1.24 2007-06-06 13:19:28 mike Exp $
package org.z3950.zing.cql;
import java.util.Properties;
package org.z3950.zing.cql;
import java.util.Properties;
@@
-8,7
+8,7
@@
import java.util.Vector;
/**
* Represents a node in a CQL parse-tree.
*
/**
* Represents a node in a CQL parse-tree.
*
- * @version $Id: CQLNode.java,v 1.21 2002-12-12 10:24:25 mike Exp $
+ * @version $Id: CQLNode.java,v 1.24 2007-06-06 13:19:28 mike Exp $
*/
public abstract class CQLNode {
CQLNode() {} // prevent javadoc from documenting this
*/
public abstract class CQLNode {
CQLNode() {} // prevent javadoc from documenting this
@@
-21,7
+21,9
@@
public abstract class CQLNode {
* else, then null is returned instead.
* @return the name of the referenced result-set
*/
* else, then null is returned instead.
* @return the name of the referenced result-set
*/
- public String getResultSetName() { return null; }
+ public String getResultSetName() {
+ return null;
+ }
/**
* Translates a parse-tree into an XCQL document.
/**
* Translates a parse-tree into an XCQL document.
@@
-36,10
+38,10
@@
public abstract class CQLNode {
* parse-tree whose root is this node.
*/
public String toXCQL(int level) {
* parse-tree whose root is this node.
*/
public String toXCQL(int level) {
- return toXCQL(level, new Vector());
+ return toXCQL(level, new Vector<CQLPrefix>());
}
}
- abstract public String toXCQL(int level, Vector prefixes);
+ abstract public String toXCQL(int level, Vector<CQLPrefix> prefixes);
protected static String renderPrefixes(int level, Vector prefixes) {
if (prefixes.size() == 0)
protected static String renderPrefixes(int level, Vector prefixes) {
if (prefixes.size() == 0)
@@
-169,7
+171,7
@@
public abstract class CQLNode {
/**
* Put a length directly into a BER record.
*
/**
* Put a length directly into a BER record.
*
- * @param length length to put into record
+ * @param len length to put into record
* @return the new, incremented value of the offset parameter.
*/
public // ### shouldn't this be protected?
* @return the new, incremented value of the offset parameter.
*/
public // ### shouldn't this be protected?
@@
-208,7
+210,7
@@
public abstract class CQLNode {
/**
* Get the length needed to represent the given number.
*
/**
* Get the length needed to represent the given number.
*
- * @param number determine length needed to encode this
+ * @param num determine length needed to encode this
* @return length needed to encode given number
*/
protected static final int numLen(long num) {
* @return length needed to encode given number
*/
protected static final int numLen(long num) {
@@
-243,8
+245,8
@@
public abstract class CQLNode {
}
// Used only by the makeOID() method
}
// Used only by the makeOID() method
- private static final java.util.Hashtable madeOIDs =
- new java.util.Hashtable(10);
+ private static final java.util.Hashtable<String, byte[]> madeOIDs =
+ new java.util.Hashtable<String, byte[]>(10);
protected static final byte[] makeOID(String oid) {
byte[] o;
protected static final byte[] makeOID(String oid) {
byte[] o;