Merged CMIS063 to HEAD

15185: 0.62c upgrade: service document
  15198: 0.62c upgrade: allowable actions
  15228: 0.62c upgrade: types and properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17227 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/cmis/CMISPropertyId.java

@@ -39,9 +39,8 @@ public class CMISPropertyId implements Serializable
     private static final long serialVersionUID = 4094778633095367606L;
 
     // Id properties
-    private String propertyName;
+    private QName propertyQName;
     private String propertyId;
-    private QName qName;
 
     
     /**
@@ -49,23 +48,12 @@ public class CMISPropertyId implements Serializable
      * 
      * @param propertyName
      * @param propertyId
-     * @param qName
+     * @param internalQName
      */
-    public CMISPropertyId(String propertyName, String propertyId, QName qName)
+    public CMISPropertyId(QName propertyQName, String propertyId)
     {
-        this.propertyName = propertyName;
+        this.propertyQName = propertyQName;
         this.propertyId = propertyId;
-        this.qName = qName;
-    }
-
-    /**
-     * Get property name
-     *  
-     * @return
-     */
-    public String getName()
-    {
-        return propertyName;
     }
 
     /**
@@ -78,6 +66,24 @@ public class CMISPropertyId implements Serializable
         return propertyId;
     }
 
+    /**
+     * Get property local name
+     * @return
+     */
+    public String getLocalName()
+    {
+        return propertyQName.getLocalName();
+    }
+    
+    /**
+     * Get property local namespace
+     * @return
+     */
+    public String getLocalNamespace()
+    {
+        return propertyQName.getNamespaceURI();
+    }
+    
     /**
      * Get the Alfresco model QName associated with the property
      * 
@@ -85,7 +91,7 @@ public class CMISPropertyId implements Serializable
      */
     public QName getQName()
     {
-        return qName;
+        return propertyQName;
     }
 
     /*
@@ -95,7 +101,7 @@ public class CMISPropertyId implements Serializable
     @Override
     public String toString()
     {
-        return getName();
+        return getId();
     }
 
     /*
@@ -107,7 +113,7 @@ public class CMISPropertyId implements Serializable
     {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((propertyName == null) ? 0 : propertyName.hashCode());
+        result = prime * result + ((propertyQName == null) ? 0 : propertyQName.hashCode());
         return result;
     }
 
@@ -125,12 +131,12 @@ public class CMISPropertyId implements Serializable
         if (getClass() != obj.getClass())
             return false;
         final CMISPropertyId other = (CMISPropertyId) obj;
-        if (propertyName == null)
+        if (propertyQName == null)
         {
-            if (other.propertyName != null)
+            if (other.propertyQName != null)
                 return false;
         }
-        else if (!propertyName.equals(other.propertyName))
+        else if (!propertyQName.equals(other.propertyQName))
             return false;
         return true;
     }