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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:08:20 +00:00
parent 5cf4251421
commit 34d911b025
35 changed files with 1176 additions and 3862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
View File

@@ -19,17 +19,13 @@
package org.alfresco.web.bean.clipboard;
import java.util.List;
import java.util.Map;
import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.search.QueryParameterDefImpl;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.QueryParameterDefinition;
@@ -63,8 +59,9 @@ abstract class AbstractClipboardItem implements ClipboardItem
private QName type;
private String icon;
transient protected AVMService avmService;
// // WCM
// transient protected AVMService avmService;
//
private List<String> customPasteViewIds;
@@ -95,21 +92,22 @@ abstract class AbstractClipboardItem implements ClipboardItem
this.parent = parent;
this.customPasteViewIds = customPasteViewIds;
}
public void setAvmService(AVMService avmService)
{
this.avmService = avmService;
}
protected AVMService getAvmService()
{
if (avmService == null)
{
avmService = getServiceRegistry().getAVMLockingAwareService();
}
return avmService;
}
// // 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;
@@ -228,28 +226,29 @@ abstract class AbstractClipboardItem implements ClipboardItem
return (nodeRefs.size() != 0);
}
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());
}
}
}
//
// // 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());
// }
// }
// }
}