jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r159672 - in incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi: client/ iterator/ remote/ server/
Date Fri, 01 Apr 2005 09:34:12 GMT
Author: jukka
Date: Fri Apr  1 01:34:07 2005
New Revision: 159672

URL: http://svn.apache.org/viewcvs?view=rev&rev=159672
Log:
Checkstyle cleanups after JCR-94.

Modified:
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
Fri Apr  1 01:34:07 2005
@@ -153,7 +153,7 @@
     public Version getVersion(Session session, RemoteVersion remote) {
         return new ClientVersion(session, remote, this);
     }
-    
+
     /**
      * Creates and returns a {@link ClientVersionHistory ClientVersionHistory}
      * instance.

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
Fri Apr  1 01:34:07 2005
@@ -35,7 +35,6 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.StringValue;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
 import javax.jcr.lock.Lock;
 import javax.jcr.nodetype.NodeDef;

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
Fri Apr  1 01:34:07 2005
@@ -26,8 +26,6 @@
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 
-import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteVersion;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
 
 /**
@@ -58,6 +56,7 @@
         this.remote = remote;
     }
 
+    /** {@inheritDoc} */
     public Version getRootVersion() throws RepositoryException {
         try {
             return getFactory().getVersion(getSession(), remote.getRootVersion());

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java
Fri Apr  1 01:34:07 2005
@@ -32,7 +32,7 @@
     /**
      * Creates an iterator for the given array of nodes.
      *
-     * @param nodes the nodes to iterate
+     * @param versions the versions to iterate
      */
     public ArrayVersionIterator(Version[] versions) {
         super(versions);

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
Fri Apr  1 01:34:07 2005
@@ -353,6 +353,7 @@
      * Remote version of the
      * {@link javax.jcr.Node#checkin() Node.checkin()} method.
      *
+     * @return checked in version
      * @throws RepositoryException on repository errors
      * @throws RemoteException on RMI errors
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
Fri Apr  1 01:34:07 2005
@@ -49,42 +49,40 @@
      * {@link javax.jcr.version.Version#getContainingHistory() Version.getContainingHistory()}
method.
      *
      * @return a <code>RemoteVersionHistory</code> object.
-     * 
+     *
      * @throws RepositoryException on repository errors
      * @throws RemoteException on RMI errors
      */
-//     public RemoteVersionHistory getContainingHistory() throws RepositoryException;
+//     RemoteVersionHistory getContainingHistory() throws RepositoryException;
 
     /**
      * Remote version of the
      * {@link javax.jcr.version.Version#getCreated() Version.getCreated()} method.
      *
      * @return a <code>Calendar</code> object.
-     * 
      * @throws RepositoryException on repository errors
      * @throws RemoteException on RMI errors
      */
-    public Calendar getCreated() throws RepositoryException, RemoteException;
+    Calendar getCreated() throws RepositoryException, RemoteException;
 
     /**
      * Remote version of the
      * {@link javax.jcr.version.Version#getSuccessors() Version.getSuccessors()} method.
      *
      * @return a <code>RemoteVersion</code> array.
-     * 
      * @throws RepositoryException on repository errors
      * @throws RemoteException on RMI errors
      */
-    public RemoteVersion[] getSuccessors() throws RepositoryException, RemoteException;
+    RemoteVersion[] getSuccessors() throws RepositoryException, RemoteException;
 
     /**
      * Remote version of the
      * {@link javax.jcr.version.Version#getPredecessors() Version.getPredecessors()} method.
      *
      * @return a <code>RemoteVersion</code> array.
-     * 
      * @throws RepositoryException on repository errors
      * @throws RemoteException on RMI errors
      */
-    public RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException;
+    RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException;
+
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
Fri Apr  1 01:34:07 2005
@@ -21,9 +21,9 @@
 import javax.jcr.RepositoryException;
 
 /**
- * Remote version of the JCR 
+ * Remote version of the JC
  * {@link javax.jcr.version.VersionHistory VersionHistory} interface. Used by
- * the 
+ * the
  * {@link org.apache.jackrabbit.rmi.server.ServerVersionHistory ServerVersionHistory}
  * and
  * {@link org.apache.jackrabbit.rmi.client.ClientVersionHistory ClientVersionHistory}
@@ -54,8 +54,7 @@
      * @throws RepositoryException if an error occurs.
      * @throws RemoteException on RMI errors
      */
-//    public String getVersionableUUID() 
-//            throws RepositoryException, RemoteException;
+//    String getVersionableUUID() throws RepositoryException, RemoteException;
 
     /**
      * Remote version of the
@@ -66,8 +65,7 @@
      * @throws RepositoryException if an error occurs.
      * @throws RemoteException on RMI errors
      */
-    public RemoteVersion getRootVersion() 
-            throws RepositoryException, RemoteException;
+    RemoteVersion getRootVersion() throws RepositoryException, RemoteException;
 
     /**
      * Remote version of the
@@ -78,7 +76,7 @@
      * @throws RepositoryException if an error occurs.
      * @throws RemoteException on RMI errors
      */
-    public RemoteVersion[] getAllVersions() 
+    RemoteVersion[] getAllVersions()
             throws RepositoryException, RemoteException;
 
     /**
@@ -91,7 +89,7 @@
      * @throws RepositoryException if an error occurs.
      * @throws RemoteException on RMI errors
      */
-    public RemoteVersion getVersion(String versionName)
+    RemoteVersion getVersion(String versionName)
             throws RepositoryException, RemoteException;
 
     /**
@@ -104,12 +102,13 @@
      * @throws RepositoryException if an error occurs.
      * @throws RemoteException on RMI errors
      */
-    public RemoteVersion getVersionByLabel(String label)
+    RemoteVersion getVersionByLabel(String label)
             throws RepositoryException, RemoteException;
 
     /**
      * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#addVersionLabel(String, String, boolean) VersionHistory.addVersionLabel(String,
String, boolean)}
+     * {@link javax.jcr.version.VersionHistory#addVersionLabel(String, String, boolean)
+     * VersionHistory.addVersionLabel(String, String, boolean)}
      * method.
      *
      * @param versionName the name of the version to which the label is to be added.
@@ -121,7 +120,7 @@
      * @throws RepositoryException if another error occurs.
      * @throws RemoteException on RMI errors
      */
-    public void addVersionLabel(String versionName, String label, boolean moveLabel)
+    void addVersionLabel(String versionName, String label, boolean moveLabel)
             throws RepositoryException, RemoteException;
 
     /**
@@ -133,7 +132,7 @@
      * @throws RepositoryException if another error occurs.
      * @throws RemoteException on RMI errors
      */
-    public void removeVersionLabel(String label)
+    void removeVersionLabel(String label)
             throws RepositoryException, RemoteException;
 
     /**
@@ -145,7 +144,7 @@
      * @return a <code>boolean</code>
      * @throws RemoteException on RMI errors
      */
-    public boolean hasVersionLabel(String label) throws RemoteException;
+    boolean hasVersionLabel(String label) throws RemoteException;
 
     /**
      * Remote version of the
@@ -158,7 +157,7 @@
      * @throws RepositoryException if another error occurs.
      * @throws RemoteException on RMI errors
      */
-    public boolean hasVersionLabel(String versionUUID, String label)
+    boolean hasVersionLabel(String versionUUID, String label)
             throws RepositoryException, RemoteException;
 
     /**
@@ -169,7 +168,7 @@
      * @return a <code>String</code> array containing all the labels of the version
history
      * @throws RemoteException on RMI errors
      */
-    public String[] getVersionLabels() throws RemoteException;
+    String[] getVersionLabels() throws RemoteException;
 
     /**
      * Remote version of the
@@ -181,7 +180,7 @@
      * @throws RepositoryException if another error occurs.
      * @throws RemoteException on RMI errors
      */
-    public String[] getVersionLabels(String versionUUID)
+    String[] getVersionLabels(String versionUUID)
             throws RepositoryException, RemoteException;
 
     /**
@@ -193,6 +192,6 @@
      * @throws RepositoryException if another error occurs.
      * @throws RemoteException on RMI errors
      */
-    public void removeVersion(String versionName)
+    void removeVersion(String versionName)
             throws RepositoryException, RemoteException;
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
Fri Apr  1 01:34:07 2005
@@ -175,9 +175,9 @@
      * @return remote version history adapter
      * @throws RemoteException on RMI errors
      */
-    RemoteVersionHistory getRemoteVersionHistory(VersionHistory versionHistory) 
+    RemoteVersionHistory getRemoteVersionHistory(VersionHistory versionHistory)
             throws RemoteException;
-    
+
     /**
      * Returns a remote adapter for the given local node type.
      *

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
Fri Apr  1 01:34:07 2005
@@ -150,7 +150,7 @@
     public RemoteVersion getRemoteVersion(Version version) throws RemoteException {
         return new ServerVersion(version, this);
     }
-    
+
     /**
      * Creates a {@link ServerVersionHistory ServerVersionHistory} instance.
      * {@inheritDoc}
@@ -159,7 +159,7 @@
             throws RemoteException {
         return new ServerVersionHistory(versionHistory, this);
     }
-    
+
     /**
      * Creates a {@link ServerNodeType ServerNodeType} instance.
      * {@inheritDoc}

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
Fri Apr  1 01:34:07 2005
@@ -454,7 +454,7 @@
             throw getRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public RemoteVersion getBaseVersion()
             throws RepositoryException, RemoteException {
@@ -464,7 +464,7 @@
             throw getRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public boolean isLocked() throws RepositoryException, RemoteException {
         try {
@@ -515,31 +515,31 @@
     }
 
     //---------- Implementation helper -----------------------------------------
-    
+
     /**
      * Returns the {@link Version} instance for the given UUID.
-     * 
+     *
      * @param versionUUID The UUID of the version.
-     * 
+     *
      * @return The version node.
-     * 
+     *
      * @throws RepositoryException if an error occurrs accessing the version
      *      node or if the UUID does not denote a version.
      */
     protected Version getVersionByUUID(String versionUUID)
             throws RepositoryException {
-        
+
         // get the version node by its UUID from the version history's session
         Session session = node.getSession();
         Node versionNode = session.getNodeByUUID(versionUUID);
-        
+
         // check whether the node is a session, which it should be according
         // to the spec (methods returning nodes should automatically return
         // the correct type).
         if (versionNode instanceof Version) {
             return (Version) versionNode;
         }
-        
+
         // otherwise fail
         throw new RepositoryException("Cannot find version " + versionUUID);
     }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
Fri Apr  1 01:34:07 2005
@@ -180,7 +180,7 @@
      * corresponding node, version, or version history remote reference using
      * the remote adapter factory.
      *
-     * @param item local node, property, or item
+     * @param node local version, versionhistory, or normal node
      * @return remote node, property, or item reference
      * @throws RemoteException on RMI errors
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
Fri Apr  1 01:34:07 2005
@@ -35,7 +35,7 @@
  * @see org.apache.jackrabbit.rmi.remote.RemoteVersion
  */
 public class ServerVersion extends ServerNode implements RemoteVersion {
-    
+
     /** The adapted local version. */
     private Version version;
 

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java?view=diff&r1=159671&r2=159672
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
(original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
Fri Apr  1 01:34:07 2005
@@ -18,9 +18,7 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.Node;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 
@@ -30,7 +28,7 @@
 /**
  * Remote adapter for the JCR {@link javax.jcr.version.VersionHistory VersionHistory}
  * interface. This class makes a local version history available as an RMI
- * service using the 
+ * service using the
  * {@link org.apache.jackrabbit.rmi.remote.RemoteVersionHistory RemoteVersionHistory}
  * interface.
  *
@@ -78,7 +76,7 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteVersion[] getAllVersions() 
+    public RemoteVersion[] getAllVersions()
             throws RepositoryException, RemoteException {
         try {
             return getRemoteVersionArray(versionHistory.getAllVersions());



Mime
View raw message