Move JavaDocs around

diff --git a/pom.xml b/pom.xml
index 53a1e90..8c518c6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,14 @@
   <version>1.8</version>
   <name>cql-java</name>
   <url>http://maven.apache.org</url>
-    <build>
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>1.0-beta-6</version>
+      </extension>
+    </extensions>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -33,7 +40,7 @@
       <uniqueVersion>false</uniqueVersion>
       <id>id-maven-repo</id>
       <name>Index Data Maven Repository</name>
-      <url>scp://maven.indexdata.com/var/www/maven/repository</url>
+      <url>scp://maven.indexdata.com:222/var/www/maven/repository</url>
     </repository>
   </distributionManagement>
   <repositories>

diff --git a/src/main/java/org/z3950/zing/cql/CQLBooleanNode.java b/src/main/java/org/z3950/zing/cql/CQLBooleanNode.java
index f30dd78..06a9bc9 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/main/java/org/z3950/zing/cql/CQLBooleanNode.java
@@ -30,6 +30,7 @@ public abstract class CQLBooleanNode extends CQLNode {
     }
 
     ModifierSet ms;
+
     /**
      * The set of modifiers that are applied to this boolean.
      */

diff --git a/src/main/java/org/z3950/zing/cql/CQLNode.java b/src/main/java/org/z3950/zing/cql/CQLNode.java
index 4ba6649..fa263ae 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/CQLNode.java
+++ b/src/main/java/org/z3950/zing/cql/CQLNode.java
@@ -14,7 +14,6 @@ import java.util.Properties;
  * @version    $Id: CQLNode.java,v 1.26 2007-07-03 13:36:03 mike Exp $
  */
 public abstract class CQLNode {
-    CQLNode() {}               // prevent javadoc from documenting this
 
     /**
      * Returns the name of the result-set to which this query is a
@@ -31,11 +30,6 @@ public abstract class CQLNode {
     /**
      * Translates a parse-tree into an XCQL document.
      * <P>
-     * @param level
-     * The number of levels to indent the top element of the XCQL
-     * document.  This will typically be 0 when invoked by an
-     * application; it takes higher values when this method is
-     * invoked recursively for nodes further down the tree.
      * @return
      * A String containing an XCQL document equivalent to the
      * parse-tree whose root is this node.

diff --git a/src/main/java/org/z3950/zing/cql/CQLPrefix.java b/src/main/java/org/z3950/zing/cql/CQLPrefix.java
index fac6503..cb3043f 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/CQLPrefix.java
+++ b/src/main/java/org/z3950/zing/cql/CQLPrefix.java
@@ -8,24 +8,26 @@ package org.z3950.zing.cql;
  * @version    $Id: CQLPrefix.java,v 1.5 2007-06-27 22:39:55 mike Exp $
  */
 public class CQLPrefix {
+
+    String name;
+
     /**
      * The short name of the prefix mapping.  That is, the prefix
      * itself, such as <TT>dc</TT>, as it might be used in an index
      * like <TT>dc.title</TT>.
      */
-    String name;
-
     public String getName() {
         return name;
     }
 
+ 
+    String identifier;
+
     /**
      * The full identifier name of the prefix mapping.  That is,
      * typically, a URI permanently allocated to a specific index
      * set, such as <TT>http://zthes.z3950.org/cql/1.0<TT>.
      */
-    String identifier;
-
     public String getIdentifier() {
         return identifier;
     }

diff --git a/src/main/java/org/z3950/zing/cql/CQLPrefixNode.java b/src/main/java/org/z3950/zing/cql/CQLPrefixNode.java
index eed3d34..656f6e6 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/CQLPrefixNode.java
+++ b/src/main/java/org/z3950/zing/cql/CQLPrefixNode.java
@@ -12,21 +12,22 @@ import java.util.Properties;
  * @version    $Id: CQLPrefixNode.java,v 1.10 2007-07-03 16:40:11 mike Exp $
  */
 public class CQLPrefixNode extends CQLNode {
+
+    private CQLPrefix prefix;
+
     /**
      * The prefix definition that governs the subtree.
      */
-    private CQLPrefix prefix;
-
     public CQLPrefix getPrefix() {
         return prefix;
     }
 
+    private CQLNode subtree;
+
     /**
      * The root of a parse-tree representing the part of the query
      * that is governed by this prefix definition.
-     */ 
-    private CQLNode subtree;
-
+     */
     public CQLNode getSubtree() {
       return subtree;
     }