jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r785668 - in /jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav: lock/ observation/ property/ search/ version/ version/report/ xml/
Date Wed, 17 Jun 2009 15:27:37 GMT
Author: angela
Date: Wed Jun 17 15:27:36 2009
New Revision: 785668

URL: http://svn.apache.org/viewvc?rev=785668&view=rev
Log:
JCR-2156: Usage of "qualified name" in JavaDoc and Comments

... and method names.


Modified:
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Type.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/DefaultEventType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyName.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/ResourceType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsResponse.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Wed Jun 17 15:27:36 2009
@@ -106,7 +106,7 @@
      * @return Scope object.
      */
     public static Scope create(String localName, Namespace namespace) {
-        String key = DomUtil.getQualifiedName(localName, namespace);
+        String key = DomUtil.getExpandedName(localName, namespace);
         if (scopes.containsKey(key)) {
             return (Scope) scopes.get(key);
         } else {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Type.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Type.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Type.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Type.java
Wed Jun 17 15:27:36 2009
@@ -104,7 +104,7 @@
      * @return <code>Type</code> object.
      */
     public static Type create(String localName, Namespace namespace) {
-        String key = DomUtil.getQualifiedName(localName, namespace);
+        String key = DomUtil.getExpandedName(localName, namespace);
         if (types.containsKey(key)) {
             return (Type) types.get(key);
         } else {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/DefaultEventType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/DefaultEventType.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/DefaultEventType.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/DefaultEventType.java
Wed Jun 17 15:27:36 2009
@@ -64,7 +64,7 @@
         if (localName == null || "".equals(localName)) {
             throw new IllegalArgumentException("null and '' are not valid local names of
an event type.");
         }
-        String key = DomUtil.getQualifiedName(localName, namespace);
+        String key = DomUtil.getExpandedName(localName, namespace);
         if (eventTypes.containsKey(key)) {
             return (EventType) eventTypes.get(key);
         } else {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyName.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyName.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyName.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyName.java
Wed Jun 17 15:27:36 2009
@@ -184,7 +184,7 @@
      * @return a human readable string representation
      */
     public String toString() {
-        return DomUtil.getQualifiedName(name, namespace);
+        return DomUtil.getExpandedName(name, namespace);
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/ResourceType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/ResourceType.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/ResourceType.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/ResourceType.java
Wed Jun 17 15:27:36 2009
@@ -182,7 +182,7 @@
         private TypeName(String localName, Namespace namespace) {
             this.localName = localName;
             this.namespace = namespace;
-            hashCode = DomUtil.getQualifiedName(localName, namespace).hashCode();
+            hashCode = DomUtil.getExpandedName(localName, namespace).hashCode();
         }
 
         public int hashCode() {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java
Wed Jun 17 15:27:36 2009
@@ -115,7 +115,7 @@
         Grammer(String localName, Namespace namespace) {
             this.localName = localName;
             this.namespace = namespace;
-            hashCode = DomUtil.getQualifiedName(localName, namespace).hashCode();
+            hashCode = DomUtil.getExpandedName(localName, namespace).hashCode();
         }
 
         public int hashCode() {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsResponse.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsResponse.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsResponse.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsResponse.java
Wed Jun 17 15:27:36 2009
@@ -68,7 +68,7 @@
      */
     public void addEntry(String localName, Namespace namespace, String[] hrefs) {
         Entry entry = new Entry(localName, namespace, hrefs);
-        entries.put(DomUtil.getQualifiedName(localName, namespace), entry);
+        entries.put(DomUtil.getExpandedName(localName, namespace), entry);
     }
 
     /**
@@ -78,7 +78,7 @@
      * @return
      */
     public String[] getHrefs(String localName, Namespace namespace) {
-        String key = DomUtil.getQualifiedName(localName, namespace);
+        String key = DomUtil.getExpandedName(localName, namespace);
         if (entries.containsKey(key)) {
             return ((Entry)entries.get(key)).hrefs;
         } else {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportInfo.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportInfo.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportInfo.java
Wed Jun 17 15:27:36 2009
@@ -137,7 +137,7 @@
      * @return Name of the report type
      */
     public String getReportName() {
-        return DomUtil.getQualifiedName(typeLocalName, typeNamespace);
+        return DomUtil.getExpandedName(typeLocalName, typeNamespace);
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
Wed Jun 17 15:27:36 2009
@@ -147,7 +147,7 @@
         if (localName == null || namespace == null || reportClass == null) {
             throw new IllegalArgumentException("A ReportType cannot be registered with a
null name, namespace or report class");
         }
-        String key = DomUtil.getQualifiedName(localName, namespace);
+        String key = DomUtil.getExpandedName(localName, namespace);
         if (types.containsKey(key)) {
             return (ReportType) types.get(key);
         } else {

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java?rev=785668&r1=785667&r2=785668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
(original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
Wed Jun 17 15:27:36 2009
@@ -592,17 +592,38 @@
     }
 
     /**
-     * Return a qualified name of a DOM node consisting of "{" + namespace uri + "}"
+     * Same as {@link #getExpandedName(String, Namespace)}.
+     *
+     * @param localName
+     * @param namespace
+     * @return the expanded name of a DOM node consisting of "{" + namespace uri + "}"
      * + localName. If the specified namespace is <code>null</code> or represents
      * the empty namespace, the local name is returned.
+     * @deprecated As of 2.0. Please use {@link #getExpandedName(String, Namespace)}
+     * instead. This method was named according to usage of 'qualified name' in
+     * JSR 170 that conflicts with the terminology used in XMLNS. As of JCR 2.0
+     * the String consisting of <code>"{" + namespace uri + "}" + localName</code>
+     * is called <code>Expanded Name</code>.
+     *
+     */
+    public static String getQualifiedName(String localName, Namespace namespace) {
+        return getExpandedName(localName, namespace);
+    }
+
+    /**
+     * Returns a string representation of the name of a DOM node consisting
+     * of "{" + namespace uri + "}" + localName. If the specified namespace is
+     * <code>null</code> or represents the empty namespace, the local name is
+     * returned.
      *
      * @param localName
      * @param namespace
-     * @return the qualified name of a DOM node consisting of "{" + namespace uri + "}"
+     * @return String representation of the name of a DOM node consisting of "{" + namespace
uri + "}"
      * + localName. If the specified namespace is <code>null</code> or represents
      * the empty namespace, the local name is returned.
+     * @since 2.0 Replaces the deprecated method {@link #getQualifiedName(String, Namespace)}.
      */
-    public static String getQualifiedName(String localName, Namespace namespace) {
+    public static String getExpandedName(String localName, Namespace namespace) {
         if (namespace == null || namespace.equals(Namespace.EMPTY_NAMESPACE)) {
             return localName;
         }
@@ -613,7 +634,7 @@
     }
 
     /**
-     * Return the prefixed name of a DOM node consisting of
+     * Return the qualified name of a DOM node consisting of
      * namespace prefix + ":" + local name. If the specified namespace is <code>null</code>
      * or contains an empty prefix, the local name is returned.<br>
      * NOTE, that this is the value to be used for the 'qualified Name' parameter



Mime
View raw message