jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1071667 - in /jackrabbit/branches/2.1: ./ jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/ jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/
Date Thu, 17 Feb 2011 15:59:05 GMT
Author: jukka
Date: Thu Feb 17 15:59:05 2011
New Revision: 1071667

URL: http://svn.apache.org/viewvc?rev=1071667&view=rev
Log:
2.1: Merged revision 1071665 (JCR-2888)

Added:
    jackrabbit/branches/2.1/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/
      - copied from r1071665, jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/
    jackrabbit/branches/2.1/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/NamespaceTest.java
      - copied unchanged from r1071665, jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/NamespaceTest.java
    jackrabbit/branches/2.1/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/TestAll.java
      - copied unchanged from r1071665, jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/TestAll.java
Modified:
    jackrabbit/branches/2.1/   (props changed)
    jackrabbit/branches/2.1/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java

Propchange: jackrabbit/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 15:59:05 2011
@@ -1,6 +1,6 @@
 /jackrabbit/branches/1.5:794012,794100,794102
-/jackrabbit/branches/2.2:1065610,1067910,1071647
+/jackrabbit/branches/2.2:1065610,1067910,1071647,1071665
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216,933554,933646,933694,934405,934412,934849,935557,936668,938099,945528,950440,950680,955222,955229,955307,955852,961487,961626,964362,965539,986682,986686,986715,991144,995411-995412,996810,999298-999299,999965,1000947,1001707,1002065-1002066,1002084,1002101-1002102,1002168,1002170,1002589,1002608,1002657,1002729,1003423,1003470,1003542,1003773,1004182,1004184,1004223-1004224,1004652,1005057,1005112,1036117,1036336-1036337,1038201,1039064,1039423,1040090,1065599,1071562
+/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216,933554,933646,933694,934405,934412,934849,935557,936668,938099,945528,950440,950680,955222,955229,955307,955852,961487,961626,964362,965539,986682,986686,986715,991144,995411-995412,996810,999298-999299,999965,1000947,1001707,1002065-1002066,1002084,1002101-1002102,1002168,1002170,1002589,1002608,1002657,1002729,1003423,1003470,1003542,1003773,1004182,1004184,1004223-1004224,1004652,1005057,1005112,1036117,1036336-1036337,1038201,1039064,1039423,1040090,1065599,1071562,1071573

Modified: jackrabbit/branches/2.1/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java?rev=1071667&r1=1071666&r2=1071667&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java
(original)
+++ jackrabbit/branches/2.1/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java
Thu Feb 17 15:59:05 2011
@@ -26,9 +26,9 @@ public class Namespace {
 
     private static Logger log = LoggerFactory.getLogger(Namespace.class);
 
-    public static final Namespace EMPTY_NAMESPACE = Namespace.getNamespace("","");
-    public static final Namespace XML_NAMESPACE = Namespace.getNamespace("xml", "http://www.w3.org/XML/1998/namespace");
-    public static final Namespace XMLNS_NAMESPACE = Namespace.getNamespace("xmlns", "http://www.w3.org/2000/xmlns/");
+    public static final Namespace EMPTY_NAMESPACE = new Namespace("","");
+    public static final Namespace XML_NAMESPACE = new Namespace("xml", "http://www.w3.org/XML/1998/namespace");
+    public static final Namespace XMLNS_NAMESPACE = new Namespace("xmlns", "http://www.w3.org/2000/xmlns/");
 
     private final String prefix;
     private final String uri;
@@ -64,8 +64,18 @@ public class Namespace {
         return uri;
     }
 
+    /**
+     * Returns <code>true</code> if the a <code>Namespace</code>
built from the
+     * specified <code>namespaceURI</code> is equal to this namespace object.
+     *
+     * @param namespaceURI A namespace URI to be compared to this namespace instance.
+     * @return true if the a <code>Namespace</code> built from the
+     * specified <code>namespaceURI</code> is equal to this namespace object;
+     * false otherwise.
+     */
     public boolean isSame(String namespaceURI) {
-        return uri.equals(namespaceURI);
+        Namespace other = getNamespace(namespaceURI);
+        return this.equals(other);
     }
 
     //-------------------------------------------------------------< Object >---



Mime
View raw message