You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2005/02/17 22:39:36 UTC

svn commit: r154195 - incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client

Author: jukka
Date: Thu Feb 17 13:39:33 2005
New Revision: 154195

URL: http://svn.apache.org/viewcvs?view=rev&rev=154195
Log:
Use the ClientObject.getItem() utility method to select the correct
adapter type for a remote node or property. Fixes the problem where
a returned Item adapter implements _only_ the Item interface even if
the underlying remote reference is either a Node or a Property.

Modified:
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.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/ClientSession.java

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java?view=diff&r1=154194&r2=154195
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java Thu Feb 17 13:39:33 2005
@@ -100,7 +100,7 @@
     public Item getAncestor(int level) throws ItemNotFoundException,
             AccessDeniedException, RepositoryException {
         try {
-            return factory.getItem(session, remote.getAncestor(level));
+            return getItem(session, remote.getAncestor(level));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }

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=154194&r2=154195
==============================================================================
--- 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 Thu Feb 17 13:39:33 2005
@@ -277,7 +277,7 @@
     public Item getPrimaryItem() throws ItemNotFoundException,
             RepositoryException {
         try {
-            return factory.getItem(session, remote.getPrimaryItem());
+            return getItem(session, remote.getPrimaryItem());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java?view=diff&r1=154194&r2=154195
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java Thu Feb 17 13:39:33 2005
@@ -166,7 +166,7 @@
     public Item getItem(String path) throws PathNotFoundException,
             RepositoryException {
         try {
-            return factory.getItem(this, remote.getItem(path));
+            return getItem(this, remote.getItem(path));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }