Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions

View File

@@ -59,9 +59,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
private QName type;
private String icon;
// // WCM
// transient protected AVMService avmService;
//
private List<String> customPasteViewIds;
@@ -93,21 +90,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
this.customPasteViewIds = customPasteViewIds;
}
// // WCM
// public void setAvmService(AVMService avmService)
// {
// this.avmService = avmService;
// }
//
// protected AVMService getAvmService()
// {
// if (avmService == null)
// {
// avmService = getServiceRegistry().getAVMLockingAwareService();
// }
// return avmService;
// }
//
public ClipboardStatus getMode()
{
return this.mode;
@@ -226,29 +208,4 @@ abstract class AbstractClipboardItem implements ClipboardItem
return (nodeRefs.size() != 0);
}
//
// // WCM
// protected void recursiveFormCheck(AVMNodeDescriptor desc)
// {
// if (desc.isFile())
// {
// String filePath = desc.getPath();
// if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
// {
// avmService.removeAspect(filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
// }
// if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_RENDITION))
// {
// avmService.removeAspect(filePath, WCMAppModel.ASPECT_RENDITION);
// }
// }
// else
// {
// Map<String, AVMNodeDescriptor> listing = getAvmService().getDirectoryListing(desc);
// for (Map.Entry<String, AVMNodeDescriptor> entry : listing.entrySet())
// {
// recursiveFormCheck(entry.getValue());
// }
// }
// }
}