jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r511533 - in /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit: server/ server/io/ webdav/jcr/
Date Sun, 25 Feb 2007 15:51:24 GMT
Author: jukka
Date: Sun Feb 25 07:51:24 2007
New Revision: 511533

URL: http://svn.apache.org/viewvc?view=rev&rev=511533
Log:
JCR-753: Avoid using {@link #method} links without an explicit class name in classes whose
subclasses inherit the method javadocs. Such usage is known to hit a javadoc regression in
Java 5 and 6. 

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/SessionProvider.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/IOHandler.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyHandler.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/SessionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/SessionProvider.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/SessionProvider.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/SessionProvider.java
Sun Feb 25 07:51:24 2007
@@ -43,7 +43,7 @@
 
     /**
      * Informs this provider that the session aquired by a previous
-     * {@link #getSession} call is no longer needed.
+     * {@link SessionProvider#getSession} call is no longer needed.
      *
      * @param session
      */

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
Sun Feb 25 07:51:24 2007
@@ -377,8 +377,8 @@
     }
 
     /**
-     * Same as (@link #exportContent(ExportContext, boolean)} where the boolean
-     * values is defined by {@link DavResource#isCollection()}.
+     * Same as (@link IOHandler#exportContent(ExportContext, boolean)} where
+     * the boolean values is defined by {@link DavResource#isCollection()}.
      *
      * @see IOHandler#exportContent(ExportContext, DavResource)
      */
@@ -394,7 +394,7 @@
      * and spools its value to the output stream fo the export context.<br>
      * Please note, that subclasses that define a different structure of the
      * content node should create their own
-     * {@link #exportData(ExportContext, boolean, Node) exportData} method.
+     * {@link  #exportData(ExportContext, boolean, Node) exportData} method.
      *
      * @param context
      * @param isCollection
@@ -529,7 +529,7 @@
         try {
             // export the properties common with normal IO handling
             exportProperties(exportContext, isCollection, cn);
-            
+
             // export all other properties as well
             PropertyIterator it = cn.getProperties();
             while (it.hasNext()) {

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/IOHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/IOHandler.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/IOHandler.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/IOHandler.java
Sun Feb 25 07:51:24 2007
@@ -60,8 +60,9 @@
     /**
      * Returns true, if this handler can run a successful import based on
      * the specified context and resource. A simple implementation may choose
-     * to return the same as {@link #canImport(ImportContext, boolean)} where
-     * the isCollection flag is determined by {@link DavResource#isCollection()}.
+     * to return the same as {@link IOHandler#canImport(ImportContext, boolean)}
+     * where the isCollection flag is determined by
+     * {@link DavResource#isCollection()}.
      *
      * @param context
      * @param resource
@@ -84,8 +85,8 @@
      * @param isCollection
      * @return true if the import was successful.
      * @throws IOException if an unexpected error occurs or if this method has
-     * been called although {@link #canImport(ImportContext, boolean)} returns
-     * false.
+     * been called although {@link IOHandler#canImport(ImportContext, boolean)}
+     * returns false.
      */
     public boolean importContent(ImportContext context, boolean isCollection) throws IOException;
 
@@ -95,8 +96,8 @@
      * <code>ImportContext</code> does not provide a {@link ImportContext#hasStream()
stream}
      * the implementation is free, to only import properties of to refuse the
      * import. A simple implementation may return the same as
-     * {@link #importContent(ImportContext, boolean)} where the isCollection flag
-     * is determined by {@link DavResource#isCollection()}<br>
+     * {@link IOHandler#importContent(ImportContext, boolean)} where the
+     * isCollection flag is determined by {@link DavResource#isCollection()}<br>
      *
      * Please note, that it is the responsibility of the specified
      * <code>ImportContext</code> to assert, that its stream is not consumed
@@ -106,9 +107,9 @@
      * @param resource
      * @return
      * @throws IOException if an unexpected error occurs or if this method has
-     * been called although {@link #canImport(ImportContext, DavResource)} returns
-     * false.
-     * @see #importContent(ImportContext, boolean)
+     * been called although {@link IOHandler#canImport(ImportContext, DavResource)}
+     * returns false.
+     * @see IOHandler#importContent(ImportContext, boolean)
      */
     public boolean importContent(ImportContext context, DavResource resource) throws IOException;
 
@@ -125,8 +126,9 @@
     /**
      * Returns true, if this handler can run a successful export based on
      * the specified context and resource. A simple implementation may choose
-     * to return the same as {@link #canExport(ExportContext, boolean)} where
-     * the isCollection flag is determined by {@link DavResource#isCollection()}.
+     * to return the same as {@link IOHandler#canExport(ExportContext, boolean)}
+     * where the isCollection flag is determined by
+     * {@link DavResource#isCollection()}.
      *
      * @param context
      * @param resource
@@ -140,8 +142,8 @@
      * <code>ExportContext</code> does not provide a {@link ExportContext#hasStream()
stream}
      * the implementation should set the properties only and ignore the content to
      * be exported. A simple implementation may return the same as
-     * {@link #exportContent(ExportContext, boolean)} where the isCollection flag
-     * is determined by {@link DavResource#isCollection()}<br>
+     * {@link IOHandler#exportContent(ExportContext, boolean)} where the
+     * isCollection flag is determined by {@link DavResource#isCollection()}<br>
      *
      * Please note, that it is the responsibility of the specified
      * <code>ExportContext</code> to assert, that its stream is not written
@@ -151,8 +153,8 @@
      * @param isCollection
      * @return
      * @throws IOException if an unexpected error occurs or if this method has
-     * been called although {@link #canExport(ExportContext, boolean)} returns
-     * false.
+     * been called although {@link IOHandler#canExport(ExportContext, boolean)}
+     * returns false.
      */
     public boolean exportContent(ExportContext context, boolean isCollection) throws IOException;
 
@@ -162,8 +164,8 @@
      * <code>ExportContext</code> does not provide a {@link ExportContext#hasStream()
stream}
      * the implementation should set the properties only and ignore the content to
      * be exported. A simple implementation may return the same as
-     * {@link #exportContent(ExportContext, boolean)} where the isCollection flag
-     * is determined by {@link DavResource#isCollection()}<br>
+     * {@link IOHandler#exportContent(ExportContext, boolean)} where the
+     * isCollection flag is determined by {@link DavResource#isCollection()}<br>
      *
      * Please note, that it is the responsibility of the specified
      * <code>ExportContext</code> to assert, that its stream is not written
@@ -173,8 +175,8 @@
      * @param resource
      * @return
      * @throws IOException if an unexpected error occurs or if this method has
-     * been called although {@link #canExport(ExportContext, DavResource)} returns
-     * false.
+     * been called although {@link IOHandler#canExport(ExportContext, DavResource)}
+     * returns false.
      */
     public boolean exportContent(ExportContext context, DavResource resource) throws IOException;
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyHandler.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyHandler.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyHandler.java
Sun Feb 25 07:51:24 2007
@@ -45,8 +45,8 @@
      * @param isCollection
      * @return true if the export succeeded.
      * @throws RepositoryException If an attempt is made to export properties
-     * even if {@link #canExport{PropertyExportContext, boolean)} returns false or if
-     * some other unrecoverable error occurs.
+     * even if {@link PropertyHandler#canExport{PropertyExportContext, boolean)}
+     * returns false or if some other unrecoverable error occurs.
      */
     public boolean exportProperties(PropertyExportContext exportContext, boolean isCollection)
throws RepositoryException;
 
@@ -73,10 +73,12 @@
      * @param isCollection
      * @return Map listing those properties that failed to be updated. An empty
      * map indicates a successful import for all properties listed in the context.
-     * @throws RepositoryException If {@link #canImport(PropertyImportContext, boolean)}
+     * @throws RepositoryException If
+     * {@link PropertyHandler#canImport(PropertyImportContext, boolean)}
      * returns false for the given parameters or if some other unrecoverable
      * error occured. Note, that normal failure of a property update must be
      * reported with the return value and should not result in an exception.
      */
     public Map importProperties(PropertyImportContext importContext, boolean isCollection)
throws RepositoryException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java
Sun Feb 25 07:51:24 2007
@@ -113,10 +113,10 @@
      * this resource does not exist). An item path is in addition first translated
      * to the corresponding resource path.<br>
      * NOTE: the displayname is not equivalent to {@link Item#getName() item name}
-     * which is exposed with the {@link #JCR_NAME &#123;http://www.day.com/jcr/webdav/1.0&#125;name}
-     * property.
+     * which is exposed with the {@link ItemResourceConstants#JCR_NAME
+     * &#123;http://www.day.com/jcr/webdav/1.0&#125;name} property.
      *
-     * @see org.apache.jackrabbit.webdav.DavResource#getDisplayName() )
+     * @see org.apache.jackrabbit.webdav.DavResource#getDisplayName()
      */
     public String getDisplayName() {
         String resPath = getResourcePath();

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java
Sun Feb 25 07:51:24 2007
@@ -223,9 +223,9 @@
 
     /**
      * Builds a single List from the properties to set and the properties to
-     * remove and delegates the list to {@link #alterProperties(List)};
+     * remove and delegates the list to {@link AbstractResource#alterProperties(List)};
      *
-     * @see DavResource#alterProperties(org.apache.jackrabbit.webdav.property.DavPropertySet,
org.apache.jackrabbit.webdav.property.DavPropertyNameSet) 
+     * @see DavResource#alterProperties(org.apache.jackrabbit.webdav.property.DavPropertySet,
org.apache.jackrabbit.webdav.property.DavPropertyNameSet)
      */
     public MultiStatusResponse alterProperties(DavPropertySet setProperties,
                                 DavPropertyNameSet removePropertyNames)
@@ -364,7 +364,7 @@
      * @see DavResource#refreshLock(org.apache.jackrabbit.webdav.lock.LockInfo, String)
      */
     public ActiveLock refreshLock(LockInfo info, String lockToken) throws DavException {
-        return txMgr.refreshLock(info, lockToken, this);        
+        return txMgr.refreshLock(info, lockToken, this);
     }
 
     /**
@@ -558,7 +558,7 @@
     public MultiStatus search(SearchInfo sInfo) throws DavException {
         return new SearchResourceImpl(getLocator(), session).search(sInfo);
     }
-    
+
     //--------------------------------------------------------------------------
     /**
      * Fill the set of default properties
@@ -657,7 +657,7 @@
     /**
      * Shortcut for <code>getSession().getRepositorySession()</code>
      *
-     * @return repository session present in the {@link #session}.
+     * @return repository session present in the {@link AbstractResource#session}.
      */
     protected Session getRepositorySession() {
         return session.getRepositorySession();

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java?view=diff&rev=511533&r1=511532&r2=511533
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java
Sun Feb 25 07:51:24 2007
@@ -302,8 +302,9 @@
     /**
      * Loops over the given <code>List</code>s and alters the properties accordingly.
      * Changes are persisted at the end according to the rules defined with
-     * the {@link #complete()} method.<p>
-     * Please note: since there is only a single property ({@link #JCR_MIXINNODETYPES}
+     * the {@link AbstractItemResource#complete()} method.<p>
+     * Please note: since there is only a single property
+     * ({@link ItemResourceConstants#JCR_MIXINNODETYPES}
      * that can be set or removed with PROPPATCH, this method either succeeds
      * or throws an exception, even if this violates RFC 2518. Thus no property
      * specific multistatus will be created in case of an error.
@@ -662,7 +663,8 @@
     /**
      * Returns the write lock present on this resource or <code>null</code> if
      * no write lock exists. NOTE: that the scope of a write lock may either
-     * be {@link org.apache.jackrabbit.webdav.lock.Scope#EXCLUSIVE} or {@link #EXCLUSIVE_SESSION}.
+     * be {@link org.apache.jackrabbit.webdav.lock.Scope#EXCLUSIVE} or
+     * {@link ItemResourceConstants#EXCLUSIVE_SESSION}.
      *
      * @return write lock or <code>null</code>
      * @throws DavException if this resource does not represent a repository item.
@@ -683,8 +685,8 @@
      * Returns true if this resource exists and the nodetype defining the
      * underlying repository node allow to reorder this nodes children.
      *
-     * @return true if {@link #orderMembers(OrderPatch)} can be called on this
-     * resource.
+     * @return true if {@link DefaultItemCollection#orderMembers(OrderPatch)}
+     * can be called on this resource.
      * @see org.apache.jackrabbit.webdav.ordering.OrderingResource#isOrderable()
      * @see javax.jcr.nodetype.NodeType#hasOrderableChildNodes()
      */
@@ -783,9 +785,10 @@
 
     //--------------------------------------------------------------------------
     /**
-     * Extend the general {@link #supportedLock} field by lock entries specific for this
-     * resource: write locks (exclusive or exclusive session-scoped) in case the underlying
-     * node has the node type mix:lockable.
+     * Extend the general {@link AbstractResource#supportedLock} field by
+     * lock entries specific for this resource: write locks (exclusive or
+     * exclusive session-scoped) in case the underlying node has the node
+     * type mix:lockable.
      *
      * @see org.apache.jackrabbit.JcrConstants#MIX_LOCKABLE
      */



Mime
View raw message