mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.0 to HEAD
5178: WCM-336, checkin performance 5182: Missing OpenSearch strings 5183: AR-1126 5185: OpenSearch externalized strings 5190: Schema and xforms 5191: WCM-343 5205: NTML using incorrect auth component 5210: No virtual server start 5211: WCM-352, WCM-353 5212: Manage Task Dialog issues git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -140,18 +140,7 @@ public class AVMNode extends Node implements Map<String, Object>
|
||||
this.avmRef = avmRef;
|
||||
this.version = -1; // TODO: always -1 for now...
|
||||
this.id = avmRef.getPath();
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param avmRef The AVMNodeDescriptor that describes this node
|
||||
* @param deleted True if the node represents a ghosted deleted node
|
||||
*/
|
||||
public AVMNode(AVMNodeDescriptor avmRef, boolean deleted)
|
||||
{
|
||||
this(avmRef);
|
||||
this.deleted = deleted;
|
||||
this.deleted = avmRef.isDeleted();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -196,12 +185,12 @@ public class AVMNode extends Node implements Map<String, Object>
|
||||
|
||||
public final boolean isDirectory()
|
||||
{
|
||||
return this.avmRef.isDirectory();
|
||||
return this.avmRef.isDirectory() || this.avmRef.isDeletedDirectory();
|
||||
}
|
||||
|
||||
public final boolean isFile()
|
||||
{
|
||||
return this.avmRef.isFile();
|
||||
return this.avmRef.isFile() || this.avmRef.isDeletedFile();
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user