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

. Merge horrors fixed

Browse Source 
. Code compile issue fixed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-12-20 10:03:44 +00:00
parent e6f28374a5
commit ec80a72900
11 changed files with 1932 additions and 1926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/jscript/AVMNode.java
View File

@@ -39,9 +39,9 @@ public class AVMNode extends Node
* @param services
* @param resolver
*/
public AVMNode(NodeRef nodeRef, ServiceRegistry services, TemplateImageResolver resolver)
public AVMNode(NodeRef nodeRef, ServiceRegistry services)
{
super(nodeRef, services, resolver);
super(nodeRef, services);
this.path = AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond();
}
@@ -53,9 +53,9 @@ public class AVMNode extends Node
* @param resolver
* @param scope
*/
public AVMNode(NodeRef nodeRef, ServiceRegistry services, TemplateImageResolver resolver, Scriptable scope)
public AVMNode(NodeRef nodeRef, ServiceRegistry services, Scriptable scope)
{
super(nodeRef, services, resolver, scope);
super(nodeRef, services, scope);
this.path = AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond();
}
@@ -63,9 +63,9 @@ public class AVMNode extends Node
* Factory method
*/
@Override
public Node newInstance(NodeRef nodeRef, ServiceRegistry services, TemplateImageResolver resolver, Scriptable scope)
public Node newInstance(NodeRef nodeRef, ServiceRegistry services, Scriptable scope)
{
return new AVMNode(nodeRef, services, resolver, scope);
return new AVMNode(nodeRef, services, scope);
}
// TODO: changing the 'name' property (either directly using .name or with .properties.name)
@@ -121,7 +121,7 @@ public class AVMNode extends Node
this.services.getAVMService().copy(-1, getPath(), destination, getName());
copy = newInstance(
AVMNodeConverter.ToNodeRef(-1, destination + '/' + getName()),
this.services, null, this.scope);
this.services, this.scope);
}
return copy;