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

@@ -330,16 +330,6 @@ public class ClipboardBean implements Serializable
{
item = new WorkspaceClipboardItem(ref, parent, mode, customPasteViewIds);
}
// // WCM
// else if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()))
// {
// item = new AVMClipboardItem(ref, mode, customPasteViewIds);
// }
// else
// {
// logger.warn("Unable to add item to clipboard - unknown store protocol: " + ref.getStoreRef().getProtocol());
// }
//
if (item != null)
{
// check for duplicates first
@@ -364,8 +354,6 @@ public class ClipboardBean implements Serializable
FacesContext context = FacesContext.getCurrentInstance();
if (Application.getClientConfig(context).isClipboardStatusVisible())
{
// // WCM
// String pattern = Application.getMessage(context, StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()) ? "node_added_clipboard_avm" : "node_added_clipboard");
String pattern = Application.getMessage(context, "node_added_clipboard");
String msg = MessageFormat.format(pattern, items.size());
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);