Merged HEAD (5.2) to 5.2.N (5.2.1)

126481 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122580 jvonka: Nodes (FileFolder) API - return isFile in node info (renamed from isContent) in addition to isFolder
      RA-828, RA-741


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/impl/NodesImpl.java

@@ -705,7 +705,7 @@ public class NodesImpl implements Nodes
             // might be sub-type of cm:cmobject (or a cm:link pointing to cm:cmobject or possibly even another cm:link)
             node = new Node(nodeRef, parentNodeRef, properties, mapUserInfo, sr);
             node.setIsFolder(false);
-            node.setIsContent(false);
+            node.setIsFile(false);
         }
         else if (type.equals(Type.DOCUMENT))
         {

source/java/org/alfresco/rest/api/model/Document.java

@@ -63,7 +63,7 @@ public class Document extends Node
         }
 
         setIsFolder(false);
-        setIsContent(true);
+        setIsFile(true);
     }
 
     @Override

source/java/org/alfresco/rest/api/model/Folder.java

@@ -51,7 +51,7 @@ public class Folder extends Node
         super(nodeRef, parentNodeRef, nodeProps, mapUserInfo, sr);
 
         setIsFolder(true);
-        setIsContent(false);
+        setIsFile(false);
     }
 
     @Override

source/java/org/alfresco/rest/api/model/Node.java

@@ -64,7 +64,7 @@ public class Node implements Comparable<Node>
     protected UserInfo modifiedByUser;
 
     protected Boolean isFolder;
-    protected Boolean isContent;
+    protected Boolean isFile;
     protected Boolean isLink;
 
     protected NodeRef parentNodeRef;
@@ -261,14 +261,14 @@ public class Node implements Comparable<Node>
         this.isFolder = isFolder;
     }
 
-    public Boolean getIsContent()
+    public Boolean getIsFile()
     {
-        return isContent;
+        return isFile;
     }
 
-    public void setIsContent(Boolean isContent)
+    public void setIsFile(Boolean isFile)
     {
-        this.isContent = isContent;
+        this.isFile = isFile;
     }
 
     public Boolean getIsLink()
@@ -309,7 +309,7 @@ public class Node implements Comparable<Node>
         return "Node [nodeRef=" + nodeRef + ", type=" + prefixTypeQName + ", name=" + name + ", title="
                 + title + ", description=" + description + ", createdAt="
                 + createdAt + ", modifiedAt=" + modifiedAt + ", createdByUser=" + createdByUser + ", modifiedBy="
-                + modifiedByUser + ", isFolder =" + isFolder + ", isContent =" + isContent + ", pathInfo =" + pathInfo +"]";
+                + modifiedByUser + ", isFolder =" + isFolder + ", isFile =" + isFile + ", pathInfo =" + pathInfo +"]";
     }
 
     // here to allow POST /nodes/{id}/children when creating empty file with specified content.mimeType