inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4147 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4148 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4151 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4152 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4157 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4159 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4161 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4162 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4169 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4175 .
   
   Skipped:
      4146, 4151, 4153, 4156, 4157, 4160, 4163-4167 (inclusive)
   Last included:
      4175



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-10-20 02:03:05 +00:00
parent be167f60cf
commit ed140c671f
17 changed files with 235 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/jscript/Node.java
View File

@@ -427,7 +427,7 @@ public class Node implements Serializable, Scopeable
/**
* @return true if this Node is a container (i.e. a folder)
*/
public boolean isContainer()
public boolean getIsContainer()
{
if (isContainer == null)
{
@@ -441,13 +441,13 @@ public class Node implements Serializable, Scopeable
public boolean jsGet_isContainer()
{
return isContainer();
return getIsContainer();
}
/**
* @return true if this Node is a Document (i.e. with content)
*/
public boolean isDocument()
public boolean getIsDocument()
{
if (isDocument == null)
{
@@ -460,13 +460,13 @@ public class Node implements Serializable, Scopeable
public boolean jsGet_isDocument()
{
return isDocument();
return getIsDocument();
}
/**
* @return true if the Node is a Category
*/
public boolean isCategory()
public boolean getIsCategory()
{
// this valid is overriden by the CategoryNode sub-class
return false;
@@ -474,7 +474,7 @@ public class Node implements Serializable, Scopeable
public boolean jsGet_isCategory()
{
return isCategory();
return getIsCategory();
}
/**
@@ -567,7 +567,7 @@ public class Node implements Serializable, Scopeable
{
if (this.imageResolver != null)
{
if (isDocument())
if (getIsDocument())
{
return this.imageResolver.resolveImagePathForName(getName(), true);
}
@@ -594,7 +594,7 @@ public class Node implements Serializable, Scopeable
{
if (this.imageResolver != null)
{
if (isDocument())
if (getIsDocument())
{
return this.imageResolver.resolveImagePathForName(getName(), false);
}
@@ -740,7 +740,7 @@ public class Node implements Serializable, Scopeable
*/
public String getUrl()
{
if (isDocument() == true)
if (getIsDocument() == true)
{
try
{
@@ -1646,7 +1646,7 @@ public class Node implements Serializable, Scopeable
this.imageResolver);
// add the current node as either the document/space as appropriate
if (this.isDocument())
if (this.getIsDocument())
{
model.put("document", new TemplateNode(this.nodeRef, this.services, this.imageResolver));
model.put("space", new TemplateNode(getPrimaryParentAssoc().getParentRef(), this.services, this.imageResolver));