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

Script specific Node class renamed to ScriptNode.

Browse Source 
SVN rename command used to ensure file history is kept.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-06-12 15:10:48 +00:00
parent a73f5b12c6
commit 21b9367f7f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/web/scripts/AbstractWebScript.java
View File

@@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.repo.jscript.Node; import org.alfresco.repo.jscript.ScriptNode;
import org.alfresco.repo.jscript.ScriptableHashMap; import org.alfresco.repo.jscript.ScriptableHashMap;
import org.alfresco.repo.template.AbsoluteUrlMethod; import org.alfresco.repo.template.AbsoluteUrlMethod;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
@@ -223,13 +223,13 @@ public abstract class AbstractWebScript implements WebScript
NodeRef companyHome = scriptContext.getCompanyHome(); NodeRef companyHome = scriptContext.getCompanyHome();
if (companyHome != null) if (companyHome != null)
{ {
model.put("companyhome", new Node(scriptContext.getCompanyHome(), serviceRegistry)); model.put("companyhome", new ScriptNode(scriptContext.getCompanyHome(), serviceRegistry));
} }
NodeRef person = scriptContext.getPerson(); NodeRef person = scriptContext.getPerson();
if (person != null) if (person != null)
{ {
model.put("person", new Node(person, serviceRegistry)); model.put("person", new ScriptNode(person, serviceRegistry));
model.put("userhome", new Node(scriptContext.getUserHome(person), serviceRegistry)); model.put("userhome", new ScriptNode(scriptContext.getUserHome(person), serviceRegistry));
} }
} }

16
source/java/org/alfresco/web/scripts/DeclarativeWebScript.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.jscript.Node; import org.alfresco.repo.jscript.ScriptNode;
import org.alfresco.repo.jscript.ScriptableHashMap; import org.alfresco.repo.jscript.ScriptableHashMap;
import org.alfresco.repo.template.TemplateNode; import org.alfresco.repo.template.TemplateNode;
import org.alfresco.service.cmr.repository.ScriptLocation; import org.alfresco.service.cmr.repository.ScriptLocation;
@@ -211,9 +211,9 @@ public class DeclarativeWebScript extends AbstractWebScript
} }
// convert script node to template node, if required // convert script node to template node, if required
if (value instanceof Node) if (value instanceof ScriptNode)
{ {
value = new TemplateNode(((Node)value).getNodeRef(), getServiceRegistry(), getWebScriptRegistry().getTemplateImageResolver()); value = new TemplateNode(((ScriptNode)value).getNodeRef(), getServiceRegistry(), getWebScriptRegistry().getTemplateImageResolver());
} }
else if (value instanceof Collection) else if (value instanceof Collection)
{ {
@@ -221,9 +221,9 @@ public class DeclarativeWebScript extends AbstractWebScript
Collection templateColl = new ArrayList(coll.size()); Collection templateColl = new ArrayList(coll.size());
for (Object object : coll) for (Object object : coll)
{ {
if (value instanceof Node) if (value instanceof ScriptNode)
{ {
templateColl.add(new TemplateNode(((Node)object).getNodeRef(), getServiceRegistry(), getWebScriptRegistry().getTemplateImageResolver())); templateColl.add(new TemplateNode(((ScriptNode)object).getNodeRef(), getServiceRegistry(), getWebScriptRegistry().getTemplateImageResolver()));
} }
else else
{ {
@@ -232,12 +232,12 @@ public class DeclarativeWebScript extends AbstractWebScript
} }
value = templateColl; value = templateColl;
} }
else if (value instanceof Node[]) else if (value instanceof ScriptNode[])
{ {
Node[] nodes = (Node[])value; ScriptNode[] nodes = (ScriptNode[])value;
TemplateNode[] templateNodes = new TemplateNode[nodes.length]; TemplateNode[] templateNodes = new TemplateNode[nodes.length];
int i = 0; int i = 0;
for (Node node : nodes) for (ScriptNode node : nodes)
{ {
templateNodes[i++] = new TemplateNode(node.getNodeRef(), getServiceRegistry(), getWebScriptRegistry().getTemplateImageResolver()); templateNodes[i++] = new TemplateNode(node.getNodeRef(), getServiceRegistry(), getWebScriptRegistry().getTemplateImageResolver());
} }