You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/02/12 14:36:02 UTC

svn commit: r743734 - /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandler.java

Author: angela
Date: Thu Feb 12 13:36:02 2009
New Revision: 743734

URL: http://svn.apache.org/viewvc?rev=743734&view=rev
Log:
- JCR-1958: Enhanced JCR remoting (work in progress)

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandler.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandler.java?rev=743734&r1=743733&r2=743734&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandler.java Thu Feb 12 13:36:02 2009
@@ -71,9 +71,7 @@
 
     //--------------------------------------------------------< DiffHandler >---
     /**
-     *
-     * @param targetPath
-     * @param diffValue
+     * @see DiffHandler#addNode(String, String)
      */
     public void addNode(String targetPath, String diffValue) throws DiffException {
         if (diffValue == null || !(diffValue.startsWith("{") && diffValue.endsWith("}"))) {
@@ -92,6 +90,9 @@
         }
     }
 
+    /**
+     * @see DiffHandler#setProperty(String, String) 
+     */
     public void setProperty(String targetPath, String diffValue) throws DiffException {
         try {
             String itemPath = getItemPath(targetPath);
@@ -147,8 +148,11 @@
         }
     }
 
+    /**
+     * @see DiffHandler#remove(String, String) 
+     */
     public void remove(String targetPath, String diffValue) throws DiffException {
-        if (!(diffValue == null || diffValue.length() == 0)) {
+        if (!(diffValue == null || diffValue.trim().length() == 0)) {
             throw new DiffException("'remove' may not have a diffValue.");
         }
         try {
@@ -159,6 +163,9 @@
         }
     }
 
+    /**
+     * @see DiffHandler#move(String, String) 
+     */
     public void move(String targetPath, String diffValue) throws DiffException {
         if (diffValue == null || diffValue.length() == 0) {
             throw new DiffException("Invalid 'move' value '" + diffValue + "'");