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 2011/02/17 16:57:58 UTC
svn commit: r1071665 - in /jackrabbit/branches/2.2: ./
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/
jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/
Author: jukka
Date: Thu Feb 17 15:57:58 2011
New Revision: 1071665
URL: http://svn.apache.org/viewvc?rev=1071665&view=rev
Log:
2.2: Merged revision 1071573 (JCR-2888)
Added:
jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/
- copied from r1071573, jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/
jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/NamespaceTest.java
- copied unchanged from r1071573, jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/NamespaceTest.java
jackrabbit/branches/2.2/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/TestAll.java
- copied unchanged from r1071573, jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/xml/TestAll.java
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 15:57:58 2011
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1044312,1049473,1049491,1049520,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1065599,1065622,1066059,1066071,1071562
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1044312,1049473,1049491,1049520,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1065599,1065622,1066059,1066071,1071562,1071573
Modified: jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java?rev=1071665&r1=1071664&r2=1071665&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java Thu Feb 17 15:57:58 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 >---