jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r156566 - in incubator/jackrabbit/trunk/src: java/org/apache/jackrabbit/core/NodeImpl.java test/org/apache/jackrabbit/init/NodeTestData.java test/org/apache/jackrabbit/test/api/version/CheckinTest.java
Date Tue, 08 Mar 2005 21:07:41 GMT
Author: jukka
Date: Tue Mar  8 13:07:40 2005
New Revision: 156566

URL: http://svn.apache.org/viewcvs?view=rev&rev=156566
Log:
Fixed non-ASCII characters. (JCR-58)

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
    incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java
    incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/CheckinTest.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&r1=156565&r2=156566
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java Tue Mar 
8 13:07:40 2005
@@ -3065,13 +3065,13 @@
         if (vp.isMoreRecent(v) && !isCheckedOut()) {
             // I f V' is a successor (to any degree) of V, then the merge result for
             // N is update. This case can be thought of as the case where N' is
-            // “newer” than N and therefore N should be updated to reflect N'.
+            // "newer" than N and therefore N should be updated to reflect N'.
             return srcNode;
         } else if (v.equals(vp) || v.isMoreRecent(vp)) {
             // If V' is a predecessor (to any degree) of V or if V and V' are
             // identical (i.e., are actually the same version), then the merge
             // result for N is leave. This case can be thought of as the case where
-            // N' is “older” or the “same age” as N and therefore N should be left alone.
+            // N' is "older" or the "same age" as N and therefore N should be left alone.
             return null;
         } else {
             // If V is neither a successor of, predecessor of, nor identical
@@ -3373,13 +3373,13 @@
         //    own OnParentVersion attributes (see 7.2.8, below, for details).
         restoreFrozenState(version.getFrozenNode(), vsel, removeExisting);
 
-        // 2. N’s jcr:baseVersion property will be changed to point to V.
+        // 2. N's jcr:baseVersion property will be changed to point to V.
         internalSetProperty(JCR_BASEVERSION, InternalValue.create(new UUID(version.getId())));
 
         // 4. N's jcr:predecessor property is set to null
         internalSetProperty(JCR_PREDECESSORS, new InternalValue[0], PropertyType.REFERENCE);
 
-        // 3. N’s jcr:isCheckedOut property is set to false.
+        // 3. N's jcr:isCheckedOut property is set to false.
         internalSetProperty(JCR_ISCHECKEDOUT, InternalValue.create(false));
     }
 

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java?view=diff&r1=156565&r2=156566
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java Tue Mar
 8 13:07:40 2005
@@ -92,7 +92,7 @@
         resource.setProperty(jcrMimeType, "text/plain");
         ByteArrayOutputStream data = new ByteArrayOutputStream();
         OutputStreamWriter writer = new OutputStreamWriter(data, ENCODING);
-        writer.write("Hello wörld.");
+        writer.write("Hello w\u00F6rld.");
         writer.close();
         resource.setProperty(jcrData, new ByteArrayInputStream(data.toByteArray()));
         resource.setProperty(jcrLastModified, Calendar.getInstance());

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/CheckinTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/CheckinTest.java?view=diff&r1=156565&r2=156566
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/CheckinTest.java
(original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/CheckinTest.java
Tue Mar  8 13:07:40 2005
@@ -77,7 +77,7 @@
         Version v = versionableNode.checkin();
         Value[] vPredecessorsValue = v.getProperty(jcrPredecessors).getValues();
 
-        assertEquals("The versionable checked-out node’s jcr:predecessors property is copied
to the new version on checkin.", Arrays.asList(nPredecessorsValue), Arrays.asList(vPredecessorsValue));
+        assertEquals("The versionable checked-out node's jcr:predecessors property is copied
to the new version on checkin.", Arrays.asList(nPredecessorsValue), Arrays.asList(vPredecessorsValue));
     }
 
     /**



Mime
View raw message