From 042ebd65efbc5c40667852ddb78276603c128e5c Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Tue, 12 Oct 2010 09:34:10 +0000 Subject: [PATCH] Merged V3.3-BUG-FIX to HEAD 22932: (RECORD ONLY) Merged HEAD to V3.3-BUG-FIX 22927: Fix ALF-2831: 'Check out to Google Docs' is not working. Missing action config from Repository details page. Also added Google Docs aspect to default set. 22989: (RECORD ONLY) Latest SpringSurf libs - improvements for ALF-3873 23030: Merged DEV/TEMPORARY to V3.3-BUG-FIX 23026: ALF-4780: Action icons disappear Remove groups field from serialization. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/web/ui/repo/component/UIActions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/ui/repo/component/UIActions.java b/source/java/org/alfresco/web/ui/repo/component/UIActions.java index c8d20a511c..e046b0c188 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UIActions.java +++ b/source/java/org/alfresco/web/ui/repo/component/UIActions.java @@ -77,7 +77,7 @@ public class UIActions extends SelfRenderingComponent public final static Class ACTION_CLASS_ARGS[] = {javax.faces.event.ActionEvent.class}; - private Set groups = new HashSet(4); + private transient Set groups = new HashSet(4); private final static String CONTEXTID_DEFAULT = "_default"; /** @@ -99,7 +99,7 @@ public class UIActions extends SelfRenderingComponent this.value = (String)values[1]; this.showLink = (Boolean)values[2]; this.verticalSpacing = (Integer)values[3]; - this.groups = (HashSet)values[4]; + this.groups = new HashSet(4); } /** @@ -108,7 +108,7 @@ public class UIActions extends SelfRenderingComponent public Object saveState(FacesContext context) { Object values[] = new Object[] { - super.saveState(context), this.value, this.showLink, this.verticalSpacing, this.groups}; + super.saveState(context), this.value, this.showLink, this.verticalSpacing}; return (values); }