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

6
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -333,10 +333,10 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
Map<String, Object> model = new HashMap<String, Object>(8, 1.0f);
NodeRef person = personService.getPerson(authService.getCurrentUserName());
model.put("person", new TemplateNode(person, serviceRegistry));
model.put("document", new TemplateNode(ref, serviceRegistry));
model.put("person", new TemplateNode(person, serviceRegistry, null));
model.put("document", new TemplateNode(ref, serviceRegistry, null));
NodeRef parent = serviceRegistry.getNodeService().getPrimaryParent(ref).getParentRef();
model.put("space", new TemplateNode(parent, serviceRegistry));
model.put("space", new TemplateNode(parent, serviceRegistry, null));
// current date/time is useful to have and isn't supplied by FreeMarker by default
model.put("date", new Date());

4
source/java/org/alfresco/repo/jscript/AVM.java
View File

@@ -68,7 +68,7 @@ public final class AVM extends BaseScriptImplementation implements Scopeable
AVMNodeDescriptor nodeDesc = this.services.getAVMService().lookup(-1, rootPath);
if (nodeDesc != null)
{
rootNode = new AVMNode(AVMNodeConverter.ToNodeRef(-1, rootPath), this.services, null, this.scope);
rootNode = new AVMNode(AVMNodeConverter.ToNodeRef(-1, rootPath), this.services, this.scope);
}
}
return rootNode;
@@ -89,7 +89,7 @@ public final class AVM extends BaseScriptImplementation implements Scopeable
AVMNodeDescriptor nodeDesc = this.services.getAVMService().lookup(-1, path);
if (nodeDesc != null)
{
node = new AVMNode(AVMNodeConverter.ToNodeRef(-1, path), this.services, null, this.scope);
node = new AVMNode(AVMNodeConverter.ToNodeRef(-1, path), this.services, this.scope);
}
}
return node;

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;

16
source/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
View File

@@ -25,6 +25,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.repository.TemplateNode;
import org.alfresco.service.cmr.search.CategoryService;
import org.alfresco.service.namespace.QName;
@@ -34,8 +35,6 @@ import org.alfresco.service.namespace.QName;
*/
public class CategoryTemplateNode extends TemplateNode
{
private static final long serialVersionUID = -2595282439089450151L;
/**
* Constructor
*
@@ -43,9 +42,9 @@ public class CategoryTemplateNode extends TemplateNode
* @param services
* @param resolver
*/
public CategoryTemplateNode(NodeRef nodeRef, ServiceRegistry services)
public CategoryTemplateNode(NodeRef nodeRef, ServiceRegistry services, TemplateImageResolver resolver)
{
super(nodeRef, services);
super(nodeRef, services, resolver);
}
@Override
@@ -164,7 +163,7 @@ public class CategoryTemplateNode extends TemplateNode
for (ChildAssociationRef ref : childRefs)
{
// create our Node representation from the NodeRef
TemplateNode child = new TemplateNode(ref.getChildRef(), this.services);
TemplateNode child = new TemplateNode(ref.getChildRef(), this.services, this.imageResolver);
answer.add(child);
}
return answer;
@@ -176,7 +175,7 @@ public class CategoryTemplateNode extends TemplateNode
for (ChildAssociationRef ref : childRefs)
{
// create our Node representation from the NodeRef
CategoryTemplateNode child = new CategoryTemplateNode(ref.getChildRef(), this.services);
CategoryTemplateNode child = new CategoryTemplateNode(ref.getChildRef(), this.services, this.imageResolver);
answer.add(child);
}
return answer;
@@ -185,16 +184,17 @@ public class CategoryTemplateNode extends TemplateNode
private List<TemplateNode> buildMixedNodeList(Collection<ChildAssociationRef> cars)
{
List<TemplateNode> nodes = new ArrayList<TemplateNode>(cars.size());
int i = 0;
for (ChildAssociationRef car : cars)
{
QName type = services.getNodeService().getType(car.getChildRef());
if (services.getDictionaryService().isSubClass(type, ContentModel.TYPE_CATEGORY))
{
nodes.add(new CategoryTemplateNode(car.getChildRef(), this.services));
nodes.add(new CategoryTemplateNode(car.getChildRef(), this.services, this.imageResolver));
}
else
{
nodes.add(new TemplateNode(car.getChildRef(), this.services));
nodes.add(new TemplateNode(car.getChildRef(), this.services, this.imageResolver));
}
}
return nodes;

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

File diff suppressed because it is too large Load Diff

4
source/java/org/alfresco/repo/template/BasePathResultsMap.java
View File

@@ -77,7 +77,7 @@ public abstract class BasePathResultsMap extends BaseTemplateMap
if (nodes.size() != 0)
{
result = new ArrayList<TemplateNode>(1);
result.add(new TemplateNode(nodes.get(0), this.services));
result.add(new TemplateNode(nodes.get(0), this.services, this.parent.getImageResolver()));
}
}
// or all the results
@@ -86,7 +86,7 @@ public abstract class BasePathResultsMap extends BaseTemplateMap
result = new ArrayList<TemplateNode>(nodes.size());
for (NodeRef ref : nodes)
{
result.add(new TemplateNode(ref, this.services));
result.add(new TemplateNode(ref, this.services, this.parent.getImageResolver()));
}
}
}

2
source/java/org/alfresco/repo/template/BaseSearchResultsMap.java
View File

@@ -75,7 +75,7 @@ public abstract class BaseSearchResultsMap extends BaseTemplateMap
NodeRef nodeRef = row.getNodeRef();
if (!nodeRefs.contains(nodeRef))
{
nodes.add(new TemplateNode(nodeRef, services));
nodes.add(new TemplateNode(nodeRef, services, this.parent.getImageResolver()));
nodeRefs.add(nodeRef);
}
}

2
source/java/org/alfresco/repo/template/Classification.java
View File

@@ -102,7 +102,7 @@ public final class Classification
ArrayList<CategoryTemplateNode> categoryNodes = new ArrayList<CategoryTemplateNode>(cars.size());
for (ChildAssociationRef car : cars)
{
categoryNodes.add(new CategoryTemplateNode(car.getChildRef(), this.services));
categoryNodes.add(new CategoryTemplateNode(car.getChildRef(), this.services, this.imageResolver));
}
return categoryNodes;
}

8
source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
View File

@@ -309,18 +309,18 @@ public class FreeMarkerProcessor implements TemplateProcessor
Map<String, Object> model = new HashMap<String, Object>(16, 1.0f);
// supply the Company Home space as "companyhome"
model.put("companyhome", new TemplateNode(companyHome, services));
model.put("companyhome", new TemplateNode(companyHome, services, imageResolver));
// supply the users Home Space as "userhome"
model.put("userhome", new TemplateNode(userHome, services));
model.put("userhome", new TemplateNode(userHome, services, imageResolver));
// supply the current user Node as "person"
model.put("person", new TemplateNode(person, services));
model.put("person", new TemplateNode(person, services, imageResolver));
// add the template itself as "template" if it comes from content on a node
if (template != null)
{
model.put("template", new TemplateNode(template, services));
model.put("template", new TemplateNode(template, services, imageResolver));
}
// current date/time is useful to have and isn't supplied by FreeMarker by default

2
source/java/org/alfresco/repo/template/TemplateServiceImplTest.java
View File

@@ -116,7 +116,7 @@ public class TemplateServiceImplTest extends TestCase
// create test model
Map model = new HashMap(7, 1.0f);
model.put("root", new TemplateNode(root, serviceRegistry));
model.put("root", new TemplateNode(root, serviceRegistry, null));
// execute on test template
String output = templateService.processTemplate("freemarker", TEMPLATE_1, model);