Got rid of warning from ehcache. Wrote equals and hashCode for MergeLinkImpl

and HistoryLinkImpl (oops).  GetDirectoryListing now returns
Map<String, AVMNodeDescriptor>.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3156 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-06-20 00:56:36 +00:00
parent 8614d80962
commit 8cb3db78e3
11 changed files with 159 additions and 189 deletions

View File

@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import org.hibernate.Query;
@@ -275,19 +276,17 @@ class RepositoryImpl implements Repository, Serializable
* @param path The path to the directory.
* @return A List of FolderEntries.
*/
public List<FolderEntry> getListing(int version, String path)
public Map<String, AVMNodeDescriptor> getListing(int version, String path)
{
Lookup lPath = lookupDirectory(version, path);
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
Map<String, AVMNode> listing = dir.getListing(lPath);
ArrayList<FolderEntry> results = new ArrayList<FolderEntry>();
Map<String, AVMNodeDescriptor> results = new TreeMap<String, AVMNodeDescriptor>();
for (String name : listing.keySet())
{
AVMNode child = listing.get(name);
FolderEntry item = new FolderEntry();
item.setName(name);
item.setType(child.getType());
results.add(item);
AVMNodeDescriptor desc = child.getDescriptor(lPath);
results.put(name, desc);
}
return results;
}