jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r156190 [2/3] - in incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ./ fs/ fs/local/ jndi/ jndi/provider/ nodetype/ observation/ search/ search/lucene/ security/ state/ state/mem/ state/xml/ util/ version/ version/persistence/ xml/
Date Fri, 04 Mar 2005 18:00:17 GMT
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java Fri Mar  4 09:59:44 2005
@@ -21,7 +21,15 @@
 import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
 import org.apache.log4j.Logger;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
 
 /**
  * A <code>LocalFileSystem</code> ...
@@ -78,7 +86,7 @@
 
     //-----------------------------------------------------------< FileSystem >
     /**
-     * @see FileSystem#init()
+     * {@inheritDoc}
      */
     public void init() throws FileSystemException {
         if (root == null) {
@@ -103,14 +111,14 @@
     }
 
     /**
-     * @see FileSystem#close
+     * {@inheritDoc}
      */
     public void close() throws FileSystemException {
         root = null;
     }
 
     /**
-     * @see FileSystem#copy(String, String)
+     * {@inheritDoc}
      */
     public void copy(String srcPath, String destPath) throws FileSystemException {
         File src = new File(root, osPath(srcPath));
@@ -125,7 +133,7 @@
     }
 
     /**
-     * @see FileSystem#createFolder(String)
+     * {@inheritDoc}
      */
     public void createFolder(String folderPath) throws FileSystemException {
         File f = new File(root, osPath(folderPath));
@@ -142,7 +150,7 @@
     }
 
     /**
-     * @see FileSystem#deleteFile(String)
+     * {@inheritDoc}
      */
     public void deleteFile(String filePath) throws FileSystemException {
         File f = new File(root, osPath(filePath));
@@ -159,7 +167,7 @@
     }
 
     /**
-     * @see FileSystem#deleteFolder(String)
+     * {@inheritDoc}
      */
     public void deleteFolder(String folderPath) throws FileSystemException {
         File f = new File(root, osPath(folderPath));
@@ -178,7 +186,7 @@
     }
 
     /**
-     * @see FileSystem#exists(String)
+     * {@inheritDoc}
      */
     public boolean exists(String path) throws FileSystemException {
         File f = new File(root, osPath(path));
@@ -186,7 +194,7 @@
     }
 
     /**
-     * @see FileSystem#getInputStream(String)
+     * {@inheritDoc}
      */
     public InputStream getInputStream(String filePath) throws FileSystemException {
         File f = new File(root, osPath(filePath));
@@ -200,7 +208,7 @@
     }
 
     /**
-     * @see FileSystem#getOutputStream(String)
+     * {@inheritDoc}
      */
     public OutputStream getOutputStream(String filePath) throws FileSystemException {
         File f = new File(root, osPath(filePath));
@@ -214,7 +222,7 @@
     }
 
     /**
-     * @see FileSystem#getRandomAccessOutputStream(String)
+     * {@inheritDoc}
      */
     public RandomAccessOutputStream getRandomAccessOutputStream(String filePath)
             throws FileSystemException {
@@ -229,7 +237,7 @@
     }
 
     /**
-     * @see FileSystem#hasChildren(String)
+     * {@inheritDoc}
      */
     public boolean hasChildren(String path) throws FileSystemException {
         File f = new File(root, osPath(path));
@@ -245,7 +253,7 @@
     }
 
     /**
-     * @see FileSystem#isFile(String)
+     * {@inheritDoc}
      */
     public boolean isFile(String path) throws FileSystemException {
         File f = new File(root, osPath(path));
@@ -253,7 +261,7 @@
     }
 
     /**
-     * @see FileSystem#isFolder(String)
+     * {@inheritDoc}
      */
     public boolean isFolder(String path) throws FileSystemException {
         File f = new File(root, osPath(path));
@@ -261,7 +269,7 @@
     }
 
     /**
-     * @see FileSystem#lastModified(String)
+     * {@inheritDoc}
      */
     public long lastModified(String path) throws FileSystemException {
         File f = new File(root, osPath(path));
@@ -269,7 +277,7 @@
     }
 
     /**
-     * @see FileSystem#length(String)
+     * {@inheritDoc}
      */
     public long length(String filePath) throws FileSystemException {
         File f = new File(root, osPath(filePath));
@@ -280,7 +288,7 @@
     }
 
     /**
-     * @see FileSystem#touch(String)
+     * {@inheritDoc}
      */
     public void touch(String filePath) throws FileSystemException {
         File f = new File(root, osPath(filePath));
@@ -288,7 +296,7 @@
     }
 
     /**
-     * @see FileSystem#list(String)
+     * {@inheritDoc}
      */
     public String[] list(String folderPath) throws FileSystemException {
         File f = new File(root, osPath(folderPath));
@@ -302,7 +310,7 @@
     }
 
     /**
-     * @see FileSystem#listFiles(String)
+     * {@inheritDoc}
      */
     public String[] listFiles(String folderPath) throws FileSystemException {
         File folder = new File(root, osPath(folderPath));
@@ -324,7 +332,7 @@
     }
 
     /**
-     * @see FileSystem#listFolders(String)
+     * {@inheritDoc}
      */
     public String[] listFolders(String folderPath) throws FileSystemException {
         File file = new File(root, osPath(folderPath));
@@ -346,7 +354,7 @@
     }
 
     /**
-     * @see FileSystem#move(String, String)
+     * {@inheritDoc}
      */
     public void move(String srcPath, String destPath) throws FileSystemException {
         File src = new File(root, osPath(srcPath));

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java Fri Mar  4 09:59:44 2005
@@ -79,7 +79,26 @@
     }
 
     /**
-     * @see java.io.OutputStream#write(int)
+     * Returns the current filepointer
+     *
+     * @return the current filepointer
+     */
+    public long getFilePointer() {
+        return bufferStart + bufferEnd;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void seek(long position) throws IOException {
+        flush();
+        raf.seek(position);
+        bufferStart = position;
+    }
+
+    //---------------------------------------------------------< OutputStream >
+    /**
+     * {@inheritDoc}
      */
     public void write(int b) throws IOException {
         one[0] = (byte) b;
@@ -87,14 +106,14 @@
     }
 
     /**
-     * @see java.io.OutputStream#write(byte[])
+     * {@inheritDoc}
      */
     public void write(byte b[]) throws IOException {
         write(b, 0, b.length);
     }
 
     /**
-     * @see java.io.OutputStream#write(byte[], int, int)
+     * {@inheritDoc}
      */
     public void write(byte b[], int off, int len) throws IOException {
         if (len > buffer.length - bufferEnd) {
@@ -107,7 +126,7 @@
     }
 
     /**
-     * @see java.io.OutputStream#flush()
+     * {@inheritDoc}
      */
     public void flush() throws IOException {
         raf.write(buffer, 0, bufferEnd);
@@ -117,31 +136,12 @@
 
     /**
      * This method also closes the underlying <code>RandomAccessFile</code>.
-     *
-     * @see java.io.OutputStream#close()
+     * <p/>
+     * {@inheritDoc}
      */
     public void close() throws IOException {
         flush();
         raf.close();
         raf = null;
     }
-
-    /**
-     * @see RandomAccessOutputStream#seek(long)
-     */
-    public void seek(long position) throws IOException {
-        flush();
-        raf.seek(position);
-        bufferStart = position;
-    }
-
-    /**
-     * Returns the current filepointer
-     *
-     * @return the current filepointer
-     */
-    public long getFilePointer() {
-        return bufferStart + bufferEnd;
-    }
-
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepository.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepository.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepository.java Fri Mar  4 09:59:44 2005
@@ -19,12 +19,20 @@
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 
-import javax.jcr.*;
+import javax.jcr.Credentials;
+import javax.jcr.LoginException;
+import javax.jcr.NoSuchWorkspaceException;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
 import javax.naming.StringRefAddr;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * <code>BindableRepository</code> ...
@@ -73,7 +81,7 @@
 
     //-----------------------------------------------------------< Repository >
     /**
-     * @see Repository#login(Credentials, String)
+     * {@inheritDoc}
      */
     public Session login(Credentials credentials, String workspaceName)
             throws LoginException, NoSuchWorkspaceException, RepositoryException {
@@ -81,7 +89,7 @@
     }
 
     /**
-     * @see Repository#login(String)
+     * {@inheritDoc}
      */
     public Session login(String workspaceName)
             throws LoginException, NoSuchWorkspaceException, RepositoryException {
@@ -89,14 +97,14 @@
     }
 
     /**
-     * @see Repository#login()
+     * {@inheritDoc}
      */
     public Session login() throws LoginException, RepositoryException {
         return delegatee.login();
     }
 
     /**
-     * @see Repository#login(Credentials)
+     * {@inheritDoc}
      */
     public Session login(Credentials credentials)
             throws LoginException, RepositoryException {
@@ -104,14 +112,14 @@
     }
 
     /**
-     * @see Repository#getDescriptor(String)
+     * {@inheritDoc}
      */
     public String getDescriptor(String key) {
         return delegatee.getDescriptor(key);
     }
 
     /**
-     * @see Repository#getDescriptorKeys()
+     * {@inheritDoc}
      */
     public String[] getDescriptorKeys() {
         return delegatee.getDescriptorKeys();
@@ -119,7 +127,7 @@
 
     //--------------------------------------------------------< Referenceable >
     /**
-     * @see Referenceable#getReference()
+     * {@inheritDoc}
      */
     public Reference getReference() throws NamingException {
         Reference ref = new Reference(BindableRepository.class.getName(),
@@ -136,7 +144,8 @@
         out.defaultWriteObject();
     }
 
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    private void readObject(ObjectInputStream in)
+            throws IOException, ClassNotFoundException {
         // delegate deserialization to default implementation
         in.defaultReadObject();
         // initialize reconstructed instance

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepositoryFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepositoryFactory.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepositoryFactory.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepositoryFactory.java Fri Mar  4 09:59:44 2005
@@ -46,7 +46,7 @@
 
     //--------------------------------------------------------< ObjectFactory >
     /**
-     * @see ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)
+     * {@inheritDoc}
      */
     public Object getObjectInstance(Object obj, Name name, Context nameCtx,
                                     Hashtable environment)

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyContext.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyContext.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyContext.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyContext.java Fri Mar  4 09:59:44 2005
@@ -16,7 +16,20 @@
  */
 package org.apache.jackrabbit.core.jndi.provider;
 
-import javax.naming.*;
+import javax.naming.Binding;
+import javax.naming.CompositeName;
+import javax.naming.CompoundName;
+import javax.naming.Context;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameClassPair;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NotContextException;
+import javax.naming.OperationNotSupportedException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
@@ -81,7 +94,7 @@
 
     //--------------------------------------------------------------< Context >
     /**
-     * @see Context#bind(Name, Object)
+     * {@inheritDoc}
      */
     public void bind(Name name, Object obj) throws NamingException {
         if (name.isEmpty()) {
@@ -95,20 +108,20 @@
     }
 
     /**
-     * @see Context#bind(String, Object)
+     * {@inheritDoc}
      */
     public void bind(String name, Object obj) throws NamingException {
         bind(new CompositeName(name), obj);
     }
 
     /**
-     * @see Context#close()
+     * {@inheritDoc}
      */
     public void close() throws NamingException {
     }
 
     /**
-     * @see Context#composeName(Name, Name)
+     * {@inheritDoc}
      */
     public Name composeName(Name name, Name prefix) throws NamingException {
         Name newName = (Name) prefix.clone();
@@ -116,70 +129,70 @@
     }
 
     /**
-     * @see Context#composeName(String, String)
+     * {@inheritDoc}
      */
     public String composeName(String name, String prefix) throws NamingException {
         return composeName(new CompositeName(name), new CompositeName(prefix)).toString();
     }
 
     /**
-     * @see Context#createSubcontext(Name)
+     * {@inheritDoc}
      */
     public Context createSubcontext(Name name) throws NamingException {
         throw new OperationNotSupportedException("subcontexts are not supported");
     }
 
     /**
-     * @see Context#createSubcontext(String)
+     * {@inheritDoc}
      */
     public Context createSubcontext(String name) throws NamingException {
         return createSubcontext(new CompositeName(name));
     }
 
     /**
-     * @see Context#destroySubcontext(Name)
+     * {@inheritDoc}
      */
     public void destroySubcontext(Name name) throws NamingException {
         throw new OperationNotSupportedException("subcontexts are not supported");
     }
 
     /**
-     * @see Context#destroySubcontext(String)
+     * {@inheritDoc}
      */
     public void destroySubcontext(String name) throws NamingException {
         destroySubcontext(new CompositeName(name));
     }
 
     /**
-     * @see Context#getEnvironment()
+     * {@inheritDoc}
      */
     public Hashtable getEnvironment() throws NamingException {
         return (Hashtable) environment.clone();
     }
 
     /**
-     * @see Context#getNameInNamespace()
+     * {@inheritDoc}
      */
     public String getNameInNamespace() throws NamingException {
         throw new OperationNotSupportedException();
     }
 
     /**
-     * @see Context#getNameParser(Name)
+     * {@inheritDoc}
      */
     public NameParser getNameParser(Name name) throws NamingException {
         return nameParser;
     }
 
     /**
-     * @see Context#getNameParser(String)
+     * {@inheritDoc}
      */
     public NameParser getNameParser(String name) throws NamingException {
         return nameParser;
     }
 
     /**
-     * @see Context#list(Name)
+     * {@inheritDoc}
      */
     public NamingEnumeration list(Name name) throws NamingException {
         if (name.isEmpty()) {
@@ -195,14 +208,14 @@
     }
 
     /**
-     * @see Context#list(String)
+     * {@inheritDoc}
      */
     public NamingEnumeration list(String name) throws NamingException {
         return list(new CompositeName(name));
     }
 
     /**
-     * @see Context#listBindings(Name)
+     * {@inheritDoc}
      */
     public NamingEnumeration listBindings(Name name) throws NamingException {
         if (name.isEmpty()) {
@@ -218,14 +231,14 @@
     }
 
     /**
-     * @see Context#listBindings(String)
+     * {@inheritDoc}
      */
     public NamingEnumeration listBindings(String name) throws NamingException {
         return listBindings(new CompositeName(name));
     }
 
     /**
-     * @see Context#lookup(Name)
+     * {@inheritDoc}
      */
     public Object lookup(Name name) throws NamingException {
         if (name.isEmpty()) {
@@ -236,14 +249,14 @@
     }
 
     /**
-     * @see Context#lookup(String)
+     * {@inheritDoc}
      */
     public Object lookup(String name) throws NamingException {
         return lookup(new CompositeName(name));
     }
 
     /**
-     * @see Context#lookupLink(Name)
+     * {@inheritDoc}
      */
     public Object lookupLink(Name name) throws NamingException {
         // no special handling of links, delegate to lookup(Name)
@@ -251,14 +264,14 @@
     }
 
     /**
-     * @see Context#lookupLink(String)
+     * {@inheritDoc}
      */
     public Object lookupLink(String name) throws NamingException {
         return lookupLink(new CompositeName(name));
     }
 
     /**
-     * @see Context#rebind(Name, Object)
+     * {@inheritDoc}
      */
     public void rebind(Name name, Object obj) throws NamingException {
         if (name.isEmpty()) {
@@ -269,21 +282,21 @@
     }
 
     /**
-     * @see Context#rebind(String, Object)
+     * {@inheritDoc}
      */
     public void rebind(String name, Object obj) throws NamingException {
         rebind(new CompositeName(name), obj);
     }
 
     /**
-     * @see Context#removeFromEnvironment(String)
+     * {@inheritDoc}
      */
     public Object removeFromEnvironment(String propName) throws NamingException {
         return environment.remove(propName);
     }
 
     /**
-     * @see Context#rename(Name, Name)
+     * {@inheritDoc}
      */
     public void rename(Name oldName, Name newName) throws NamingException {
         if (oldName.isEmpty() || newName.isEmpty()) {
@@ -296,14 +309,14 @@
     }
 
     /**
-     * @see Context#rename(String, String)
+     * {@inheritDoc}
      */
     public void rename(String oldName, String newName) throws NamingException {
         rename(new CompositeName(oldName), new CompositeName(newName));
     }
 
     /**
-     * @see Context#unbind(Name)
+     * {@inheritDoc}
      */
     public void unbind(Name name) throws NamingException {
         if (name.isEmpty()) {
@@ -314,14 +327,14 @@
     }
 
     /**
-     * @see Context#unbind(String)
+     * {@inheritDoc}
      */
     public void unbind(String name) throws NamingException {
         unbind(new CompositeName(name));
     }
 
     /**
-     * @see Context#addToEnvironment(String, Object)
+     * {@inheritDoc}
      */
     public Object addToEnvironment(String propName, Object propVal) throws NamingException {
         return environment.put(propName, propVal);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyInitialContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyInitialContextFactory.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyInitialContextFactory.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyInitialContextFactory.java Fri Mar  4 09:59:44 2005
@@ -33,7 +33,7 @@
     private static HashMap contexts = new HashMap();
 
     /**
-     * @see InitialContextFactory#getInitialContext(java.util.Hashtable)
+     * {@inheritDoc}
      */
     public Context getInitialContext(Hashtable environment) throws NamingException {
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java Fri Mar  4 09:59:44 2005
@@ -59,7 +59,7 @@
 
     //--------------------------------------------------------------< ItemDef >
     /**
-     * @see ItemDef#getDeclaringNodeType
+     * {@inheritDoc}
      */
     public NodeType getDeclaringNodeType() {
         try {
@@ -72,7 +72,7 @@
     }
 
     /**
-     * @see ItemDef#getName
+     * {@inheritDoc}
      */
     public String getName() {
         if (itemDef.definesResidual()) {
@@ -90,28 +90,28 @@
     }
 
     /**
-     * @see ItemDef#getOnParentVersion()
+     * {@inheritDoc}
      */
     public int getOnParentVersion() {
         return itemDef.getOnParentVersion();
     }
 
     /**
-     * @see ItemDef#isAutoCreate
+     * {@inheritDoc}
      */
     public boolean isAutoCreate() {
         return itemDef.isAutoCreate();
     }
 
     /**
-     * @see ItemDef#isMandatory
+     * {@inheritDoc}
      */
     public boolean isMandatory() {
         return itemDef.isMandatory();
     }
 
     /**
-     * @see ItemDef#isProtected
+     * {@inheritDoc}
      */
     public boolean isProtected() {
         return itemDef.isProtected();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java Fri Mar  4 09:59:44 2005
@@ -53,7 +53,7 @@
 
     //--------------------------------------------------------------< NodeDef >
     /**
-     * @see NodeDef#getDefaultPrimaryType
+     * {@inheritDoc}
      */
     public NodeType getDefaultPrimaryType() {
         QName ntName = nodeDef.getDefaultPrimaryType();
@@ -70,7 +70,7 @@
     }
 
     /**
-     * @see NodeDef#getRequiredPrimaryTypes
+     * {@inheritDoc}
      */
     public NodeType[] getRequiredPrimaryTypes() {
         QName[] ntNames = nodeDef.getRequiredPrimaryTypes();
@@ -93,7 +93,7 @@
     }
 
     /**
-     * @see NodeDef#allowSameNameSibs
+     * {@inheritDoc}
      */
     public boolean allowSameNameSibs() {
         return nodeDef.allowSameNameSibs();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java Fri Mar  4 09:59:44 2005
@@ -16,14 +16,24 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.*;
+import org.apache.jackrabbit.core.BaseException;
+import org.apache.jackrabbit.core.IllegalNameException;
+import org.apache.jackrabbit.core.InternalValue;
+import org.apache.jackrabbit.core.NamespaceResolver;
+import org.apache.jackrabbit.core.NoPrefixDeclaredException;
+import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.core.UnknownPrefixException;
 import org.apache.log4j.Logger;
 
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.ValueFormatException;
-import javax.jcr.nodetype.*;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.PropertyDef;
 import java.util.ArrayList;
 import java.util.HashSet;
 
@@ -276,7 +286,7 @@
 
     //-------------------------------------------------------------< NodeType >
     /**
-     * @see NodeType#getName
+     * {@inheritDoc}
      */
     public String getName() {
         try {
@@ -289,7 +299,7 @@
     }
 
     /**
-     * @see NodeType#getPrimaryItemName
+     * {@inheritDoc}
      */
     public String getPrimaryItemName() {
         try {
@@ -303,14 +313,14 @@
     }
 
     /**
-     * @see NodeType#isMixin
+     * {@inheritDoc}
      */
     public boolean isMixin() {
         return ntd.isMixin();
     }
 
     /**
-     * @see NodeType#isNodeType(String)
+     * {@inheritDoc}
      */
     public boolean isNodeType(String nodeTypeName) {
         QName ntName;
@@ -331,14 +341,14 @@
     }
 
     /**
-     * @see NodeType#hasOrderableChildNodes
+     * {@inheritDoc}
      */
     public boolean hasOrderableChildNodes() {
         return ntd.hasOrderableChildNodes();
     }
 
     /**
-     * @see NodeType#getSupertypes
+     * {@inheritDoc}
      */
     public NodeType[] getSupertypes() {
         QName[] ntNames = ent.getInheritedNodeTypes();
@@ -356,7 +366,7 @@
     }
 
     /**
-     * @see NodeType#getChildNodeDefs
+     * {@inheritDoc}
      */
     public NodeDef[] getChildNodeDefs() {
         ChildNodeDef[] cnda = ent.getAllNodeDefs();
@@ -368,7 +378,7 @@
     }
 
     /**
-     * @see NodeType#getPropertyDefs
+     * {@inheritDoc}
      */
     public PropertyDef[] getPropertyDefs() {
         PropDef[] pda = ent.getAllPropDefs();
@@ -380,7 +390,7 @@
     }
 
     /**
-     * @see NodeType#getDeclaredSupertypes
+     * {@inheritDoc}
      */
     public NodeType[] getDeclaredSupertypes() {
         QName[] ntNames = ntd.getSupertypes();
@@ -398,7 +408,7 @@
     }
 
     /**
-     * @see NodeType#getDeclaredChildNodeDefs
+     * {@inheritDoc}
      */
     public NodeDef[] getDeclaredChildNodeDefs() {
         ChildNodeDef[] cnda = ntd.getChildNodeDefs();
@@ -410,7 +420,7 @@
     }
 
     /**
-     * @see NodeType#canSetProperty(String, Value)
+     * {@inheritDoc}
      */
     public boolean canSetProperty(String propertyName, Value value) {
         if (value == null) {
@@ -439,7 +449,7 @@
     }
 
     /**
-     * @see NodeType#canSetProperty(String, Value[])
+     * {@inheritDoc}
      */
     public boolean canSetProperty(String propertyName, Value[] values) {
         if (values == null) {
@@ -476,7 +486,7 @@
     }
 
     /**
-     * @see NodeType#canAddChildNode(String)
+     * {@inheritDoc}
      */
     public boolean canAddChildNode(String childNodeName) {
         try {
@@ -491,7 +501,7 @@
     }
 
     /**
-     * @see NodeType#canAddChildNode(String, String)
+     * {@inheritDoc}
      */
     public boolean canAddChildNode(String childNodeName, String nodeTypeName) {
         try {
@@ -506,7 +516,7 @@
     }
 
     /**
-     * @see NodeType#canRemoveItem(String)
+     * {@inheritDoc}
      */
     public boolean canRemoveItem(String itemName) {
         try {
@@ -521,7 +531,7 @@
     }
 
     /**
-     * @see NodeType#getDeclaredPropertyDefs
+     * {@inheritDoc}
      */
     public PropertyDef[] getDeclaredPropertyDefs() {
         PropDef[] pda = ntd.getPropertyDefs();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Fri Mar  4 09:59:44 2005
@@ -25,7 +25,10 @@
 import org.apache.log4j.Logger;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.*;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.NodeTypeIterator;
+import javax.jcr.nodetype.NodeTypeManager;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -123,14 +126,14 @@
 
     //---------------------------------------------< NodeTypeRegistryListener >
     /**
-     * @see NodeTypeRegistryListener#nodeTypeRegistered(QName)
+     * {@inheritDoc}
      */
     public void nodeTypeRegistered(QName ntName) {
         // ignore
     }
 
     /**
-     * @see NodeTypeRegistryListener#nodeTypeReRegistered(QName)
+     * {@inheritDoc}
      */
     public void nodeTypeReRegistered(QName ntName) {
         // flush cache
@@ -138,7 +141,7 @@
     }
 
     /**
-     * @see NodeTypeRegistryListener#nodeTypeUnregistered(QName)
+     * {@inheritDoc}
      */
     public void nodeTypeUnregistered(QName ntName) {
         // sync cache
@@ -147,7 +150,7 @@
 
     //------------------------------------------------------< NodeTypeManager >
     /**
-     * @see NodeTypeManager#getAllNodeTypes
+     * {@inheritDoc}
      */
     public NodeTypeIterator getAllNodeTypes() throws RepositoryException {
         QName[] ntNames = ntReg.getRegisteredNodeTypes();
@@ -159,7 +162,7 @@
     }
 
     /**
-     * @see NodeTypeManager#getPrimaryNodeTypes
+     * {@inheritDoc}
      */
     public NodeTypeIterator getPrimaryNodeTypes() throws RepositoryException {
         QName[] ntNames = ntReg.getRegisteredNodeTypes();
@@ -174,7 +177,7 @@
     }
 
     /**
-     * @see NodeTypeManager#getMixinNodeTypes
+     * {@inheritDoc}
      */
     public NodeTypeIterator getMixinNodeTypes() throws RepositoryException {
         QName[] ntNames = ntReg.getRegisteredNodeTypes();
@@ -189,7 +192,7 @@
     }
 
     /**
-     * @see NodeTypeManager#getNodeType
+     * {@inheritDoc}
      */
     public NodeType getNodeType(String nodeTypeName) throws NoSuchNodeTypeException {
         try {
@@ -229,7 +232,7 @@
         }
 
         /**
-         * @see NodeDef#getName
+         * {@inheritDoc}
          */
         public String getName() {
             // not applicable
@@ -237,7 +240,7 @@
         }
 
         /**
-         * @see NodeDef#getDeclaringNodeType
+         * {@inheritDoc}
          */
         public NodeType getDeclaringNodeType() {
             // not applicable

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefImpl.java Fri Mar  4 09:59:44 2005
@@ -52,7 +52,7 @@
 
     //----------------------------------------------------------< PropertyDef >
     /**
-     * @see PropertyDef#getDefaultValues
+     * {@inheritDoc}
      */
     public Value[] getDefaultValues() {
         InternalValue[] defVals = propDef.getDefaultValues();
@@ -74,14 +74,14 @@
     }
 
     /**
-     * @see PropertyDef#getRequiredType
+     * {@inheritDoc}
      */
     public int getRequiredType() {
         return propDef.getRequiredType();
     }
 
     /**
-     * @see PropertyDef#getValueConstraints
+     * {@inheritDoc}
      */
     public String[] getValueConstraints() {
         ValueConstraint[] constraints = propDef.getValueConstraints();
@@ -96,7 +96,7 @@
     }
 
     /**
-     * @see PropertyDef#isMultiple
+     * {@inheritDoc}
      */
     public boolean isMultiple() {
         return propDef.isMultiple();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java Fri Mar  4 09:59:44 2005
@@ -16,10 +16,10 @@
  */
 package org.apache.jackrabbit.core.observation;
 
+import org.apache.jackrabbit.core.MalformedPathException;
 import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.Path;
-import org.apache.jackrabbit.core.MalformedPathException;
+import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.log4j.Logger;
 
 import javax.jcr.RepositoryException;
@@ -70,18 +70,18 @@
     }
 
     /**
-     * @see Event#getType()
+     * {@inheritDoc}
      */
     public int getType() {
         return eventState.getType();
     }
 
     /**
-     * @see Event#getPath()
+     * {@inheritDoc}
      */
     public String getPath() throws RepositoryException {
         try {
-            Path p = null;
+            Path p;
             if (eventState.getChildRelPath().getIndex() > 0) {
                 p = Path.create(eventState.getParentPath(), eventState.getChildRelPath().getName(), eventState.getChildRelPath().getIndex(), false);
             } else {
@@ -100,7 +100,7 @@
     }
 
     /**
-     * @see Event#getUserId()
+     * {@inheritDoc}
      */
     public String getUserId() {
         return eventState.getUserId();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java Fri Mar  4 09:59:44 2005
@@ -77,7 +77,7 @@
     }
 
     /**
-     * @see javax.jcr.observation.EventListenerIterator#nextEventListener()
+     * {@inheritDoc}
      */
     public EventListener nextEventListener() {
         if (next == null) {
@@ -90,7 +90,7 @@
     }
 
     /**
-     * @see javax.jcr.RangeIterator#skip(long)
+     * {@inheritDoc}
      */
     public void skip(long skipNum) {
         while (skipNum-- > 0) {
@@ -108,7 +108,7 @@
     }
 
     /**
-     * @see javax.jcr.RangeIterator#getPos()
+     * {@inheritDoc}
      */
     public long getPos() {
         return pos;
@@ -135,7 +135,7 @@
     }
 
     /**
-     * @see Iterator#next()
+     * {@inheritDoc}
      */
     public Object next() {
         return nextEventListener();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java Fri Mar  4 09:59:44 2005
@@ -261,7 +261,7 @@
     }
 
     /**
-     * @see javax.jcr.observation.Event#getType()
+     * {@inheritDoc}
      */
     public int getType() {
         return type;
@@ -316,7 +316,7 @@
     }
 
     /**
-     * @see javax.jcr.observation.Event#getUserId()
+     * {@inheritDoc}
      */
     public String getUserId() {
         return session.getUserId();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java Fri Mar  4 09:59:44 2005
@@ -77,7 +77,7 @@
     }
 
     /**
-     * @see Iterator#next()
+     * {@inheritDoc}
      */
     public Object next() {
         if (next == null) {
@@ -90,14 +90,14 @@
     }
 
     /**
-     * @see EventIterator#nextEvent()
+     * {@inheritDoc}
      */
     public Event nextEvent() {
         return (Event) next();
     }
 
     /**
-     * @see javax.jcr.RangeIterator#skip(long)
+     * {@inheritDoc}
      */
     public void skip(long skipNum) {
         while (skipNum-- > 0) {
@@ -115,7 +115,7 @@
     }
 
     /**
-     * @see javax.jcr.RangeIterator#getPos()
+     * {@inheritDoc}
      */
     public long getPos() {
         return pos;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java Fri Mar  4 09:59:44 2005
@@ -13,18 +13,18 @@
  */
 package org.apache.jackrabbit.core.observation;
 
-import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.Path;
 import org.apache.jackrabbit.core.MalformedPathException;
+import org.apache.jackrabbit.core.Path;
+import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
 import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
 import org.apache.log4j.Logger;
 
-import javax.jcr.observation.ObservationManager;
+import javax.jcr.RepositoryException;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.EventListenerIterator;
-import javax.jcr.RepositoryException;
+import javax.jcr.observation.ObservationManager;
 
 /**
  * Each <code>Session</code> instance has its own <code>ObservationManager</code>
@@ -33,7 +33,9 @@
  */
 public class ObservationManagerImpl implements ObservationManager {
 
-    /** The logger instance of this class */
+    /**
+     * The logger instance of this class
+     */
     private static final Logger log = Logger.getLogger(ObservationManagerImpl.class);
 
     /**
@@ -47,7 +49,9 @@
      */
     private final ItemManager itemMgr;
 
-    /** The <code>ObservationManagerFactory</code> */
+    /**
+     * The <code>ObservationManagerFactory</code>
+     */
     private final ObservationManagerFactory obsMgrFactory;
 
     /**
@@ -76,7 +80,7 @@
     }
 
     /**
-     * @see javax.jcr.observation.ObservationManager#addEventListener
+     * {@inheritDoc}
      */
     public void addEventListener(EventListener listener,
                                  int eventTypes,
@@ -123,7 +127,7 @@
     }
 
     /**
-     * @see javax.jcr.observation.ObservationManager#removeEventListener(javax.jcr.observation.EventListener)
+     * {@inheritDoc}
      */
     public void removeEventListener(EventListener listener)
             throws RepositoryException {
@@ -134,7 +138,7 @@
     }
 
     /**
-     * @see javax.jcr.observation.ObservationManager#getRegisteredEventListeners()
+     * {@inheritDoc}
      */
     public EventListenerIterator getRegisteredEventListeners()
             throws RepositoryException {
@@ -146,6 +150,7 @@
     /**
      * Creates an <code>EventStateCollection</code> tied to the session
      * which is attached this <code>ObservationManager</code> instance.
+     *
      * @return a new <code>EventStateCollection</code>.
      */
     public EventStateCollection createEventStateCollection() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/AndQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/AndQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/AndQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/AndQueryNode.java Fri Mar  4 09:59:44 2005
@@ -49,7 +49,7 @@
     /**
      * This method can return <code>null</code> to indicate that this
      * <code>AndQueryNode</code> does not contain any operands.
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/ExactQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/ExactQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/ExactQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/ExactQueryNode.java Fri Mar  4 09:59:44 2005
@@ -51,15 +51,14 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
     /**
-     * Returns the type of this node.
-     * @return the type of this node.
+     * {@inheritDoc}
      */
     public int getType() {
         return QueryNode.TYPE_EXACT;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/LocationStepQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/LocationStepQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/LocationStepQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/LocationStepQueryNode.java Fri Mar  4 09:59:44 2005
@@ -150,15 +150,14 @@
     }
 
     /**
-     * @see QueryNode#accept(QueryNodeVisitor, Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
     /**
-     * Returns the type of this node.
-     * @return the type of this node.
+     * {@inheritDoc}
      */
     public int getType() {
         return QueryNode.TYPE_LOCATION;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NodeTypeQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NodeTypeQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NodeTypeQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NodeTypeQueryNode.java Fri Mar  4 09:59:44 2005
@@ -38,7 +38,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -46,6 +46,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NotQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NotQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NotQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NotQueryNode.java Fri Mar  4 09:59:44 2005
@@ -43,7 +43,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -51,6 +51,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrQueryNode.java Fri Mar  4 09:59:44 2005
@@ -45,7 +45,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -53,6 +53,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrderQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrderQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrderQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrderQueryNode.java Fri Mar  4 09:59:44 2005
@@ -18,8 +18,8 @@
 
 import org.apache.jackrabbit.core.QName;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Implements a query node that defines the order of nodes according to the
@@ -36,7 +36,7 @@
      * Creates a new <code>OrderQueryNode</code> with a reference to a parent
      * node and sort properties.
      *
-     * @param parent     the parent node of this query node.
+     * @param parent the parent node of this query node.
      */
     public OrderQueryNode(QueryNode parent) {
         super(parent);
@@ -44,6 +44,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {
@@ -52,9 +53,10 @@
 
     /**
      * Adds an order specification to this query node.
-     * @param property the name of the property.
+     *
+     * @param property  the name of the property.
      * @param ascending if <code>true</code> values of this properties are
-     *   ordered ascending; descending if <code>false</code>.
+     *                  ordered ascending; descending if <code>false</code>.
      */
     public void addOrderSpec(QName property, boolean ascending) {
         specs.add(new OrderSpec(property, ascending));
@@ -62,6 +64,7 @@
 
     /**
      * Adds an order specification to this query node.
+     *
      * @param spec the order spec.
      */
     public void addOrderSpec(OrderSpec spec) {
@@ -69,7 +72,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -78,12 +81,11 @@
     /**
      * Returns <code>true</code> if the property <code>i</code> should be orderd
      * ascending. If <code>false</code> the property is ordered descending.
-     * @param i index of the property
      *
+     * @param i index of the property
      * @return the order spec for the property <code>i</code>.
-     *
-     * @exception IndexOutOfBoundsException if there is no property with
-     * index <code>i</code>.
+     * @throws IndexOutOfBoundsException if there is no property with
+     *                                   index <code>i</code>.
      */
     public boolean isAscending(int i) {
         return ((OrderSpec) specs.get(i)).ascending;
@@ -107,17 +109,22 @@
      */
     public static final class OrderSpec {
 
-        /** The name of the property */
+        /**
+         * The name of the property
+         */
         private QName property;
 
-        /** If <code>true</code> this property is orderd ascending */
+        /**
+         * If <code>true</code> this property is orderd ascending
+         */
         private boolean ascending;
 
         /**
          * Creates a new <code>OrderSpec</code> for <code>property</code>.
-         * @param property the name of the property.
+         *
+         * @param property  the name of the property.
          * @param ascending if <code>true</code> the property is ordered
-         * ascending, otherwise descending.
+         *                  ascending, otherwise descending.
          */
         public OrderSpec(QName property, boolean ascending) {
             this.property = property;
@@ -126,6 +133,7 @@
 
         /**
          * Returns the name of the property.
+         *
          * @return the name of the property.
          */
         public QName getProperty() {
@@ -135,8 +143,9 @@
         /**
          * If <code>true</code> the property is ordered ascending, otherwise
          * descending.
+         *
          * @return <code>true</code> for ascending; <code>false</code> for
-         * descending.
+         *         descending.
          */
         public boolean isAscending() {
             return ascending;
@@ -144,8 +153,9 @@
 
         /**
          * Sets the new value for the ascending property.
+         *
          * @param ascending <code>true</code> for ascending; <code>false</code>
-         * for descending.
+         *                  for descending.
          */
         public void setAscending(boolean ascending) {
             this.ascending = ascending;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/PathQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/PathQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/PathQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/PathQueryNode.java Fri Mar  4 09:59:44 2005
@@ -21,7 +21,9 @@
  */
 public class PathQueryNode extends NAryQueryNode {
 
-    /** Flag indicating whether this path is absolute. */
+    /**
+     * Flag indicating whether this path is absolute.
+     */
     private boolean absolute = false;
 
     /**
@@ -31,6 +33,7 @@
 
     /**
      * Creates a relative <code>PathQueryNode</code> with no location steps.
+     *
      * @param parent the parent query node.
      */
     public PathQueryNode(QueryNode parent) {
@@ -38,7 +41,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -46,6 +49,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {
@@ -54,6 +58,7 @@
 
     /**
      * Adds a path step to this <code>PathQueryNode</code>.
+     *
      * @param step the step to add.
      */
     public void addPathStep(LocationStepQueryNode step) {
@@ -62,6 +67,7 @@
 
     /**
      * Returns an array of all currently set location step nodes.
+     *
      * @return an array of all currently set location step nodes.
      */
     public LocationStepQueryNode[] getPathSteps() {
@@ -76,6 +82,7 @@
      * If <code>absolute</code> is <code>true</code> sets this
      * <code>PathQueryNode</code> to an absolute path. If <code>absolute</code>
      * is <code>false</code> this path is considered relative.
+     *
      * @param absolute sets the absolute property to this new value.
      */
     public void setAbsolute(boolean absolute) {
@@ -85,8 +92,9 @@
     /**
      * Returns <code>true</code> if this is an absolute path; <code>false</code>
      * otherwise.
+     *
      * @return <code>true</code> if this is an absolute path; <code>false</code>
-     *   otherwise.
+     *         otherwise.
      */
     public boolean isAbsolute() {
         return absolute;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java Fri Mar  4 09:59:44 2005
@@ -16,43 +16,50 @@
  */
 package org.apache.jackrabbit.core.search;
 
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.Path;
 import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
 import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.log4j.Logger;
+import org.apache.jackrabbit.core.NoPrefixDeclaredException;
+import org.apache.jackrabbit.core.Path;
+import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 
+import javax.jcr.ItemExistsException;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.lock.LockException;
 import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.query.InvalidQueryException;
-import javax.jcr.query.QueryResult;
 import javax.jcr.query.Query;
-import javax.jcr.lock.LockException;
+import javax.jcr.query.QueryResult;
 import javax.jcr.version.VersionException;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.ItemExistsException;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 
 /**
  * Implements the {@link Query} interface.
  */
 public class QueryImpl implements Query {
 
-    /** The session of the user executing this query */
+    /**
+     * The session of the user executing this query
+     */
     private final SessionImpl session;
 
-    /** The query statement */
+    /**
+     * The query statement
+     */
     private final String statement;
 
-    /** The syntax of the query statement */
+    /**
+     * The syntax of the query statement
+     */
     private final String language;
 
-    /** The actual query implementation that can be executed */
+    /**
+     * The actual query implementation that can be executed
+     */
     private final ExecutableQuery query;
 
     /**
@@ -63,13 +70,14 @@
 
     /**
      * Creates a new query instance from a query string.
-     * @param session the session of the user executing this query.
-     * @param itemMgr the item manager of the session executing this query.
-     * @param handler the query handler of the search index.
+     *
+     * @param session   the session of the user executing this query.
+     * @param itemMgr   the item manager of the session executing this query.
+     * @param handler   the query handler of the search index.
      * @param statement the query statement.
-     * @param language the syntax of the query statement.
+     * @param language  the syntax of the query statement.
      * @throws InvalidQueryException if the query statement is invalid according
-     * to the specified <code>language</code>.
+     *                               to the specified <code>language</code>.
      */
     public QueryImpl(SessionImpl session,
                      ItemManager itemMgr,
@@ -84,13 +92,14 @@
 
     /**
      * Create a new query instance from a nt:query node.
+     *
      * @param session the session of the user executing this query.
      * @param itemMgr the item manager of the session executing this query.
      * @param handler the query handler of the search index.
-     * @param node a node of type <code>nt:query</code>.
+     * @param node    a node of type <code>nt:query</code>.
      * @throws InvalidQueryException If <code>node</code> is not a valid persisted query
-     *   (that is, a node of type <code>nt:query</code>).
-     * @throws RepositoryException if another error occurs
+     *                               (that is, a node of type <code>nt:query</code>).
+     * @throws RepositoryException   if another error occurs
      */
     public QueryImpl(SessionImpl session,
                      ItemManager itemMgr,
@@ -117,28 +126,28 @@
      * This method simply forwards the <code>execute</code> call to the
      * {@link ExecutableQuery} object returned by
      * {@link QueryHandler#createExecutableQuery}.
-     * @see Query#execute()
+     * {@inheritDoc}
      */
     public QueryResult execute() throws RepositoryException {
         return query.execute();
     }
 
     /**
-     * @see Query#getStatement()
+     * {@inheritDoc}
      */
     public String getStatement() {
         return statement;
     }
 
     /**
-     * @see Query#getLanguage()
+     * {@inheritDoc}
      */
     public String getLanguage() {
         return language;
     }
 
     /**
-     * @see Query#getPersistentQueryPath()
+     * {@inheritDoc}
      */
     public String getPersistentQueryPath() throws ItemNotFoundException, RepositoryException {
         if (node == null) {
@@ -148,7 +157,7 @@
     }
 
     /**
-     * @see Query#save(String)
+     * {@inheritDoc}
      */
     public void save(String absPath)
             throws ItemExistsException,

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryManagerImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryManagerImpl.java Fri Mar  4 09:59:44 2005
@@ -79,7 +79,7 @@
     }
 
     /**
-     * @see QueryManager#createQuery(java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public Query createQuery(String statement, String language)
             throws InvalidQueryException, RepositoryException {
@@ -88,7 +88,7 @@
     }
 
     /**
-     * @see QueryManager#getQuery(Node)
+     * {@inheritDoc}
      */
     public Query getQuery(Node node)
             throws InvalidQueryException, RepositoryException {
@@ -97,7 +97,7 @@
     }
 
     /**
-     * @see QueryManager#getSupportedQueryLanguages()
+     * {@inheritDoc}
      */
     public String[] getSupportedQueryLanguages() {
         return (String[]) SUPPORTED_QUERIES_LIST.toArray(new String[SUPPORTED_QUERIES.length]);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryRootNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryRootNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryRootNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryRootNode.java Fri Mar  4 09:59:44 2005
@@ -106,7 +106,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -114,6 +114,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/RelationQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/RelationQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/RelationQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/RelationQueryNode.java Fri Mar  4 09:59:44 2005
@@ -69,6 +69,7 @@
     /**
      * Creates a new <code>RelationQueryNode</code> without a type nor value
      * assigned.
+     *
      * @param parent the parent node for this query node.
      */
     public RelationQueryNode(QueryNode parent, int operation) {
@@ -145,7 +146,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -153,6 +154,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {
@@ -179,6 +181,7 @@
 
     /**
      * Sets a new property name for this relation query node.
+     *
      * @param name the new property name.
      */
     public void setProperty(QName name) {
@@ -197,6 +200,7 @@
 
     /**
      * Sets a new value of type <code>long</code>.
+     *
      * @param value the new value.
      */
     public void setLongValue(long value) {
@@ -216,6 +220,7 @@
 
     /**
      * Sets a new value of type <code>double</code>.
+     *
      * @param value the new value.
      */
     public void setDoubleValue(double value) {
@@ -235,6 +240,7 @@
 
     /**
      * Sets a new value of type <code>String</code>.
+     *
      * @param value the new value.
      */
     public void setStringValue(String value) {
@@ -254,6 +260,7 @@
 
     /**
      * Sets a new value of type <code>Date</code>.
+     *
      * @param value the new value.
      */
     public void setDateValue(Date value) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/TextsearchQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/TextsearchQueryNode.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/TextsearchQueryNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/TextsearchQueryNode.java Fri Mar  4 09:59:44 2005
@@ -39,7 +39,7 @@
     }
 
     /**
-     * @see QueryNode#accept(org.apache.jackrabbit.core.search.QueryNodeVisitor, java.lang.Object)
+     * {@inheritDoc}
      */
     public Object accept(QueryNodeVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -47,6 +47,7 @@
 
     /**
      * Returns the type of this node.
+     *
      * @return the type of this node.
      */
     public int getType() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/ChildAxisQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/ChildAxisQuery.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/ChildAxisQuery.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/ChildAxisQuery.java Fri Mar  4 09:59:44 2005
@@ -16,22 +16,22 @@
  */
 package org.apache.jackrabbit.core.search.lucene;
 
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Weight;
-import org.apache.lucene.search.Searcher;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Explanation;
-import org.apache.lucene.search.HitCollector;
-import org.apache.lucene.search.Similarity;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.HitCollector;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.Weight;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * Implements a lucene <code>Query</code> which returns the child nodes of the
@@ -39,15 +39,20 @@
  */
 class ChildAxisQuery extends Query {
 
-    /** The context query */
+    /**
+     * The context query
+     */
     private final Query contextQuery;
 
-    /** The scorer of the context query */
+    /**
+     * The scorer of the context query
+     */
     private Scorer contextScorer;
 
     /**
      * Creates a new <code>ChildAxisQuery</code> based on a <code>context</code>
      * query.
+     *
      * @param context the context for this query.
      */
     ChildAxisQuery(Query context) {
@@ -56,6 +61,7 @@
 
     /**
      * Creates a <code>Weight</code> instance for this query.
+     *
      * @param searcher the <code>Searcher</code> instance to use.
      * @return a <code>ChildAxisWeight</code>.
      */
@@ -65,6 +71,7 @@
 
     /**
      * Always returns 'ChildAxisQuery'.
+     *
      * @param field the name of a field.
      * @return 'ChildAxisQuery'.
      */
@@ -79,12 +86,15 @@
      */
     private class ChildAxisWeight implements Weight {
 
-        /** The searcher in use */
+        /**
+         * The searcher in use
+         */
         private final Searcher searcher;
 
         /**
          * Creates a new <code>ChildAxisWeight</code> instance using
          * <code>searcher</code>.
+         *
          * @param searcher a <code>Searcher</code> instance.
          */
         private ChildAxisWeight(Searcher searcher) {
@@ -93,6 +103,7 @@
 
         /**
          * Returns this <code>ChildAxisQuery</code>.
+         *
          * @return this <code>ChildAxisQuery</code>.
          */
         public Query getQuery() {
@@ -100,7 +111,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#getValue()
+         * {@inheritDoc}
          */
         public float getValue() {
             // @todo implement properly
@@ -108,7 +119,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#sumOfSquaredWeights()
+         * {@inheritDoc}
          */
         public float sumOfSquaredWeights() throws IOException {
             // @todo implement properly
@@ -116,7 +127,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#normalize(float)
+         * {@inheritDoc}
          */
         public void normalize(float norm) {
             // @todo implement properly
@@ -124,6 +135,7 @@
 
         /**
          * Creates a scorer for this <code>ChildAxisQuery</code>.
+         *
          * @param reader a reader for accessing the index.
          * @return a <code>ChildAxisScorer</code>.
          * @throws IOException if an error occurs while reading from the index.
@@ -134,7 +146,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#explain(org.apache.lucene.index.IndexReader, int)
+         * {@inheritDoc}
          */
         public Explanation explain(IndexReader reader, int doc) throws IOException {
             return new Explanation();
@@ -148,22 +160,31 @@
      */
     private class ChildAxisScorer extends Scorer {
 
-        /** An <code>IndexReader</code> to access the index. */
+        /**
+         * An <code>IndexReader</code> to access the index.
+         */
         private final IndexReader reader;
 
-        /** BitSet storing the id's of selected documents */
+        /**
+         * BitSet storing the id's of selected documents
+         */
         private final BitSet hits;
 
-        /** List of UUIDs of selected nodes */
+        /**
+         * List of UUIDs of selected nodes
+         */
         private List uuids = null;
 
-        /** The next document id to return */
+        /**
+         * The next document id to return
+         */
         private int nextDoc = -1;
 
         /**
          * Creates a new <code>ChildAxisScorer</code>.
+         *
          * @param similarity the <code>Similarity</code> instance to use.
-         * @param reader for index access.
+         * @param reader     for index access.
          */
         protected ChildAxisScorer(Similarity similarity, IndexReader reader) {
             super(similarity);
@@ -172,7 +193,7 @@
         }
 
         /**
-         * @see Scorer#score(org.apache.lucene.search.HitCollector)
+         * {@inheritDoc}
          */
         public void score(HitCollector hc) throws IOException {
             calculateChildren();
@@ -185,29 +206,43 @@
             }
         }
 
+        /**
+         * {@inheritDoc}
+         */
         public boolean next() throws IOException {
             calculateChildren();
             nextDoc = hits.nextSetBit(nextDoc + 1);
             return nextDoc > -1;
         }
 
+        /**
+         * {@inheritDoc}
+         */
         public int doc() {
             return nextDoc;
         }
 
+        /**
+         * {@inheritDoc}
+         */
         public float score() throws IOException {
             // todo implement
             return 1.0f;
         }
 
+        /**
+         * {@inheritDoc}
+         */
         public boolean skipTo(int target) throws IOException {
             nextDoc = hits.nextSetBit(target);
             return nextDoc > -1;
         }
 
         /**
-         * @exception UnsupportedOperationException this implementation always
-         * throws an <code>UnsupportedOperationException</code>.
+         * {@inheritDoc}
+         *
+         * @throws UnsupportedOperationException this implementation always
+         *                                       throws an <code>UnsupportedOperationException</code>.
          */
         public Explanation explain(int doc) throws IOException {
             throw new UnsupportedOperationException();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DescendantSelfAxisQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DescendantSelfAxisQuery.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DescendantSelfAxisQuery.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DescendantSelfAxisQuery.java Fri Mar  4 09:59:44 2005
@@ -16,21 +16,21 @@
  */
 package org.apache.jackrabbit.core.search.lucene;
 
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.HitCollector;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Weight;
 import org.apache.lucene.search.Searcher;
-import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.Similarity;
-import org.apache.lucene.search.HitCollector;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.TermDocs;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.search.Weight;
 
 import java.io.IOException;
 import java.util.BitSet;
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Implements a lucene <code>Query</code> which filters a sub query by checking
@@ -39,13 +39,19 @@
  */
 class DescendantSelfAxisQuery extends Query {
 
-    /** The context query */
+    /**
+     * The context query
+     */
     private final Query contextQuery;
 
-    /** The scorer of the context query */
+    /**
+     * The scorer of the context query
+     */
     private Scorer contextScorer;
 
-    /** The sub query to filter */
+    /**
+     * The sub query to filter
+     */
     private final Query subQuery;
 
     /**
@@ -54,14 +60,17 @@
      */
     private final boolean includeSelf;
 
-    /** The scorer of the sub query to filter */
+    /**
+     * The scorer of the sub query to filter
+     */
     private Scorer subScorer;
 
     /**
      * Creates a new <code>DescendantSelfAxisQuery</code> based on a
      * <code>context</code> query and filtering the <code>sub</code> query.
+     *
      * @param context the context for this query.
-     * @param sub the sub query.
+     * @param sub     the sub query.
      */
     public DescendantSelfAxisQuery(Query context, Query sub) {
         this(context, sub, true);
@@ -70,11 +79,12 @@
     /**
      * Creates a new <code>DescendantSelfAxisQuery</code> based on a
      * <code>context</code> query and filtering the <code>sub</code> query.
-     * @param context the context for this query.
-     * @param sub the sub query.
+     *
+     * @param context     the context for this query.
+     * @param sub         the sub query.
      * @param includeSelf if <code>true</code> this query acts like a
-     * descendant-or-self axis. If <code>false</code> this query acts like
-     * a descendant axis.
+     *                    descendant-or-self axis. If <code>false</code> this query acts like
+     *                    a descendant axis.
      */
     public DescendantSelfAxisQuery(Query context, Query sub, boolean includeSelf) {
         this.contextQuery = context;
@@ -84,6 +94,7 @@
 
     /**
      * Creates a <code>Weight</code> instance for this query.
+     *
      * @param searcher the <code>Searcher</code> instance to use.
      * @return a <code>DescendantSelfAxisWeight</code>.
      */
@@ -93,6 +104,7 @@
 
     /**
      * Always returns 'DescendantSelfAxisQuery'.
+     *
      * @param field the name of a field.
      * @return 'DescendantSelfAxisQuery'.
      */
@@ -108,12 +120,15 @@
      */
     private class DescendantSelfAxisWeight implements Weight {
 
-        /** The searcher in use */
+        /**
+         * The searcher in use
+         */
         private final Searcher searcher;
 
         /**
          * Creates a new <code>DescendantSelfAxisWeight</code> instance using
          * <code>searcher</code>.
+         *
          * @param searcher a <code>Searcher</code> instance.
          */
         private DescendantSelfAxisWeight(Searcher searcher) {
@@ -122,6 +137,7 @@
 
         /**
          * Returns this <code>DescendantSelfAxisQuery</code>.
+         *
          * @return this <code>DescendantSelfAxisQuery</code>.
          */
         public Query getQuery() {
@@ -129,7 +145,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#getValue()
+         * {@inheritDoc}
          */
         public float getValue() {
             // @todo implement properly
@@ -137,7 +153,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#sumOfSquaredWeights()
+         * {@inheritDoc}
          */
         public float sumOfSquaredWeights() throws IOException {
             // @todo implement properly
@@ -145,7 +161,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#normalize(float)
+         * {@inheritDoc}
          */
         public void normalize(float norm) {
             // @todo implement properly
@@ -153,6 +169,7 @@
 
         /**
          * Creates a scorer for this <code>DescendantSelfAxisScorer</code>.
+         *
          * @param reader a reader for accessing the index.
          * @return a <code>DescendantSelfAxisScorer</code>.
          * @throws IOException if an error occurs while reading from the index.
@@ -164,7 +181,7 @@
         }
 
         /**
-         * @see org.apache.lucene.search.Weight#explain(org.apache.lucene.index.IndexReader, int)
+         * {@inheritDoc}
          */
         public Explanation explain(IndexReader reader, int doc) throws IOException {
             return new Explanation();
@@ -172,32 +189,42 @@
     }
 
     //----------------------< DescendantSelfAxisScorer >---------------------------------
-
     /**
      * Implements a <code>Scorer</code> for this
      * <code>DescendantSelfAxisQuery</code>.
      */
     private class DescendantSelfAxisScorer extends Scorer {
 
-        /** An <code>IndexReader</code> to access the index. */
+        /**
+         * An <code>IndexReader</code> to access the index.
+         */
         private final IndexReader reader;
 
-        /** BitSet storing the id's of selected documents */
+        /**
+         * BitSet storing the id's of selected documents
+         */
         private final BitSet hits;
 
-        /** BitSet storing the id's of selected documents from the sub query */
+        /**
+         * BitSet storing the id's of selected documents from the sub query
+         */
         private final BitSet subHits;
 
-        /** List of UUIDs of selected nodes by the context query */
+        /**
+         * List of UUIDs of selected nodes by the context query
+         */
         private Set contextUUIDs = null;
 
-        /** The next document id to return */
+        /**
+         * The next document id to return
+         */
         private int nextDoc = -1;
 
         /**
          * Creates a new <code>DescendantSelfAxisScorer</code>.
+         *
          * @param similarity the <code>Similarity</code> instance to use.
-         * @param reader for index access.
+         * @param reader     for index access.
          */
         protected DescendantSelfAxisScorer(Similarity similarity, IndexReader reader) {
             super(similarity);
@@ -207,7 +234,7 @@
         }
 
         /**
-         * @see Scorer#score(org.apache.lucene.search.HitCollector)
+         * {@inheritDoc}
          */
         public void score(HitCollector hc) throws IOException {
             while (next()) {
@@ -290,8 +317,8 @@
         }
 
         /**
-         * @exception UnsupportedOperationException this implementation always
-         * throws an <code>UnsupportedOperationException</code>.
+         * @throws UnsupportedOperationException this implementation always
+         *                                       throws an <code>UnsupportedOperationException</code>.
          */
         public Explanation explain(int doc) throws IOException {
             throw new UnsupportedOperationException();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/FileSystemDirectory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/FileSystemDirectory.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/FileSystemDirectory.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/FileSystemDirectory.java Fri Mar  4 09:59:44 2005
@@ -117,7 +117,7 @@
     }
 
     /**
-     * @see Directory#list()
+     * {@inheritDoc}
      */
     public String[] list() throws IOException {
         if (log.isDebugEnabled()) {
@@ -131,7 +131,7 @@
     }
 
     /**
-     * @see Directory#fileExists(String)
+     * {@inheritDoc}
      */
     public boolean fileExists(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -145,7 +145,7 @@
     }
 
     /**
-     * @see Directory#fileModified(String)
+     * {@inheritDoc}
      */
     public long fileModified(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -159,7 +159,7 @@
     }
 
     /**
-     * @see Directory#touchFile(String)
+     * {@inheritDoc}
      */
     public void touchFile(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -173,7 +173,7 @@
     }
 
     /**
-     * @see Directory#deleteFile(String)
+     * {@inheritDoc}
      */
     public void deleteFile(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -187,7 +187,7 @@
     }
 
     /**
-     * @see Directory#renameFile(String, String)
+     * {@inheritDoc}
      */
     public void renameFile(String from, String to) throws IOException {
         if (log.isDebugEnabled()) {
@@ -201,7 +201,7 @@
     }
 
     /**
-     * @see Directory#fileLength(String)
+     * {@inheritDoc}
      */
     public long fileLength(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -215,7 +215,7 @@
     }
 
     /**
-     * @see Directory#createFile(String)
+     * {@inheritDoc}
      */
     public OutputStream createFile(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -225,7 +225,7 @@
     }
 
     /**
-     * @see Directory#openFile(String)
+     * {@inheritDoc}
      */
     public InputStream openFile(String name) throws IOException {
         if (log.isDebugEnabled()) {
@@ -235,7 +235,7 @@
     }
 
     /**
-     * @see Directory#makeLock(String)
+     * {@inheritDoc}
      */
     public Lock makeLock(String name) {
         final FileSystemResource lock = new FileSystemResource(fs, name);
@@ -285,7 +285,7 @@
     }
 
     /**
-     * @see Directory#close()
+     * {@inheritDoc}
      */
     public void close() throws IOException {
         // there is nothing to close here.

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllScorer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllScorer.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllScorer.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllScorer.java Fri Mar  4 09:59:44 2005
@@ -20,7 +20,11 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.TermDocs;
 import org.apache.lucene.index.TermEnum;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.HitCollector;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.Weight;
 
 import java.io.IOException;
 import java.util.BitSet;
@@ -86,7 +90,7 @@
     }
 
     /**
-     * @see Scorer#score(org.apache.lucene.search.HitCollector)
+     * {@inheritDoc}
      */
     public void score(HitCollector hc) throws IOException {
         while (next()) {
@@ -94,9 +98,8 @@
         }
     }
 
-
     /**
-     * @see org.apache.lucene.search.Scorer#next()
+     * {@inheritDoc}
      */
     public boolean next() throws IOException {
         nextDoc = docFilter.nextSetBit(nextDoc + 1);
@@ -104,21 +107,21 @@
     }
 
     /**
-     * @see org.apache.lucene.search.Scorer#doc()
+     * {@inheritDoc}
      */
     public int doc() {
         return nextDoc;
     }
 
     /**
-     * @see org.apache.lucene.search.Scorer#score()
+     * {@inheritDoc}
      */
     public float score() throws IOException {
         return 1.0f;
     }
 
     /**
-     * @see org.apache.lucene.search.Scorer#skipTo(int)
+     * {@inheritDoc}
      */
     public boolean skipTo(int target) throws IOException {
         nextDoc = target - 1;
@@ -126,7 +129,7 @@
     }
 
     /**
-     * @see Scorer#explain
+     * {@inheritDoc}
      */
     public Explanation explain(int doc) {
         return matchExpl;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllWeight.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllWeight.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllWeight.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllWeight.java Fri Mar  4 09:59:44 2005
@@ -17,7 +17,12 @@
 package org.apache.jackrabbit.core.search.lucene;
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.Weight;
 
 import java.io.IOException;
 
@@ -64,21 +69,21 @@
     }
 
     /**
-     * @see Weight#getQuery()
+     * {@inheritDoc}
      */
     public Query getQuery() {
         return query;
     }
 
     /**
-     * @see Weight#getValue()
+     * {@inheritDoc}
      */
     public float getValue() {
         return value;
     }
 
     /**
-     * @see Weight#sumOfSquaredWeights()
+     * {@inheritDoc}
      */
     public float sumOfSquaredWeights() throws IOException {
         idf = searcher.getSimilarity().idf(searcher.maxDoc(), searcher.maxDoc()); // compute idf
@@ -87,7 +92,7 @@
     }
 
     /**
-     * @see Weight#normalize(float)
+     * {@inheritDoc}
      */
     public void normalize(float queryNorm) {
         queryWeight *= queryNorm;                   // normalize query weight
@@ -95,14 +100,14 @@
     }
 
     /**
-     * @see Weight#scorer(org.apache.lucene.index.IndexReader)
+     * {@inheritDoc}
      */
     public Scorer scorer(IndexReader reader) throws IOException {
         return new MatchAllScorer(reader, this, field);
     }
 
     /**
-     * @see Weight#explain(org.apache.lucene.index.IndexReader, int)
+     * {@inheritDoc}
      */
     public Explanation explain(IndexReader reader, int doc) throws IOException {
         return new Explanation(Similarity.getDefault().idf(reader.maxDoc(), reader.maxDoc()),



Mime
View raw message