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

Merged V3.1 to HEAD

Browse Source 
13033: Back end support for ETHREEOH-1179
   13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
   13046: Merged V3.0 to V3.1
      13043: Merged V2.2 to V3.0
         13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
   13049: Build/test fix (WCM AssetTest)
   13057: Merged V2.1-A to V3.1
      8770: Added Flex SDK module
      8771: Added Flex SDK binary (swc)
      DH: I'm not sure about the svn:eol-style property appearing here.  SVN Clients?
   13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
   13060: [no comments]
   13061: [no comments]
   13063: [no comments]
   13064: [no comments]
   13066: [no comments]
   13067: Add NodeService.getChildrenByName
   13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13043
      Merged /alfresco/BRANCHES/V2.2:r13016
      Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 04:21:44 +00:00
parent f1307fba20
commit 2c563871d8
38 changed files with 1264 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
View File

@@ -210,7 +210,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
AVMDAOs.Instance().fAVMNodeDAO.save(this);
if (copyContents)
{
for (ChildEntry child : AVMDAOs.Instance().fChildEntryDAO.getByParent(other))
for (ChildEntry child : AVMDAOs.Instance().fChildEntryDAO.getByParent(other, null))
{
ChildKey key = new ChildKey(this, child.getKey().getName());
ChildEntryImpl newChild = new ChildEntryImpl(key, child.getChild());
@@ -430,6 +430,18 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
* @return A Map from names to nodes. This is a sorted Map.
*/
public Map<String, AVMNode> getListing(Lookup lPath, boolean includeDeleted)
{
return getListing(lPath, null, includeDeleted);
}
/**
* Get a listing of the virtual contents of this directory.
*
* @param lPath
* The Lookup.
* @return A Map from names to nodes. This is a sorted Map.
*/
public Map<String, AVMNode> getListing(Lookup lPath, String childNamePattern, boolean includeDeleted)
{
// Get the base listing from the thing we indirect to.
Map<String, AVMNode> listing = new HashMap<String, AVMNode>();
@@ -439,7 +451,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
if (lookup != null)
{
DirectoryNode dir = (DirectoryNode) lookup.getCurrentNode();
Map<String, AVMNode> underListing = dir.getListing(lookup, includeDeleted);
Map<String, AVMNode> underListing = dir.getListing(lookup, childNamePattern, includeDeleted);
for (Map.Entry<String, AVMNode> entry : underListing.entrySet())
{
if (entry.getValue().getType() == AVMNodeType.LAYERED_DIRECTORY ||
@@ -454,7 +466,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
}
}
}
for (ChildEntry entry : AVMDAOs.Instance().fChildEntryDAO.getByParent(this))
for (ChildEntry entry : AVMDAOs.Instance().fChildEntryDAO.getByParent(this, childNamePattern))
{
if (entry.getChild().getType() == AVMNodeType.LAYERED_DIRECTORY ||
entry.getChild().getType() == AVMNodeType.PLAIN_DIRECTORY)
@@ -486,7 +498,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
public Map<String, AVMNode> getListingDirect(Lookup lPath, boolean includeDeleted)
{
Map<String, AVMNode> listing = new HashMap<String, AVMNode>();
for (ChildEntry entry : AVMDAOs.Instance().fChildEntryDAO.getByParent(this))
for (ChildEntry entry : AVMDAOs.Instance().fChildEntryDAO.getByParent(this, null))
{
if (entry.getChild().getType() == AVMNodeType.LAYERED_DIRECTORY ||
entry.getChild().getType() == AVMNodeType.PLAIN_DIRECTORY)
@@ -517,7 +529,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
*/
public SortedMap<String, AVMNodeDescriptor> getListingDirect(AVMNodeDescriptor dir, boolean includeDeleted)
{
List<ChildEntry> children = AVMDAOs.Instance().fChildEntryDAO.getByParent(this);
List<ChildEntry> children = AVMDAOs.Instance().fChildEntryDAO.getByParent(this, null);
SortedMap<String, AVMNodeDescriptor> listing = new TreeMap<String, AVMNodeDescriptor>(String.CASE_INSENSITIVE_ORDER);
for (ChildEntry child : children)
{
@@ -550,6 +562,22 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
* @return A Map of names to node descriptors.
*/
public SortedMap<String, AVMNodeDescriptor> getListing(AVMNodeDescriptor dir, boolean includeDeleted)
{
return getListing(dir, null, includeDeleted);
}
/**
* Get a listing from a directory node descriptor.
*
* @param dir
* The directory node descriptor.
* @param childNamePattern
* Pattern to match for child names - may be null
* @param includeDeleted
* Should DeletedNodes be shown.
* @return A Map of names to node descriptors.
*/
public SortedMap<String, AVMNodeDescriptor> getListing(AVMNodeDescriptor dir, String childNamePattern, boolean includeDeleted)
{
if (dir.getPath() == null || dir.getIndirection() == null)
{
@@ -563,7 +591,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
if (lookup != null)
{
DirectoryNode dirNode = (DirectoryNode) lookup.getCurrentNode();
Map<String, AVMNode> listing = dirNode.getListing(lookup, includeDeleted);
Map<String, AVMNode> listing = dirNode.getListing(lookup, childNamePattern, includeDeleted);
for (Map.Entry<String, AVMNode> entry : listing.entrySet())
{
if (entry.getValue().getType() == AVMNodeType.LAYERED_DIRECTORY ||
@@ -581,7 +609,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
}
}
}
List<ChildEntry> children = AVMDAOs.Instance().fChildEntryDAO.getByParent(this);
List<ChildEntry> children = AVMDAOs.Instance().fChildEntryDAO.getByParent(this, childNamePattern);
for (ChildEntry child : children)
{
if (child.getChild().getType() == AVMNodeType.LAYERED_DIRECTORY ||
@@ -612,7 +640,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
*/
public List<String> getDeletedNames()
{
List<ChildEntry> children = AVMDAOs.Instance().fChildEntryDAO.getByParent(this);
List<ChildEntry> children = AVMDAOs.Instance().fChildEntryDAO.getByParent(this, null);
List<String> listing = new ArrayList<String>();
for (ChildEntry entry : children)
{