Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

62915: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62288: ACE-479  Provide Search Adapter - general tidy up including addressing the review comments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:33:04 +00:00
parent 50b79beee2
commit e245353b4a
22 changed files with 25 additions and 218 deletions

View File

@@ -127,6 +127,7 @@ public class NodeSearcher
{
nsXPath.addNamespace(prefix, namespacePrefixResolver.getNamespaceURI(prefix));
}
@SuppressWarnings("rawtypes")
List list = nsXPath.selectNodes(nodeService.getPrimaryParent(contextNodeRef));
HashSet<NodeRef> unique = new HashSet<NodeRef>(list.size());
for (Object o : list)
@@ -183,7 +184,7 @@ public class NodeSearcher
this.order = order;
}
@SuppressWarnings("unchecked")
@SuppressWarnings({ "unchecked", "rawtypes" })
public int compare(NodeRef n1, NodeRef n2)
{
for (AttributeOrder attributeOrder : order)
@@ -244,6 +245,7 @@ public class NodeSearcher
{
nsXPath.addNamespace(prefix, namespacePrefixResolver.getNamespaceURI(prefix));
}
@SuppressWarnings("rawtypes")
List list = nsXPath.selectNodes(nodeService.getPrimaryParent(contextNodeRef));
List<Serializable> answer = new ArrayList<Serializable>(list.size());
for (Object o : list)