inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forums overriden actions (checkin) and Discuss/Create Forum actions now externalised

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-03-20 14:10:44 +00:00
parent 5d3872279f
commit 65d874e9c9
10 changed files with 263 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/java/org/alfresco/web/config/ActionsConfigElement.java
View File

@@ -20,8 +20,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.config.ConfigElement;
import org.alfresco.config.ConfigException;
@@ -78,11 +80,6 @@ public class ActionsConfigElement extends ConfigElementAdapter
combinedElement.actionGroups.putAll(this.actionGroups);
combinedElement.actionGroups.putAll(existingElement.actionGroups);
//
// TODO: do we need to check all groups here and update ActionDefinition references incase they
// have changed? e.g. if an actiondef ID is overriden, a group using it will not know!
//
return combinedElement;
}
@@ -170,7 +167,7 @@ public class ActionsConfigElement extends ConfigElementAdapter
return params;
}
private String id;
String id;
private List<String> permissionAllow = null;
private List<String> permissionDeny = null;
private Map<String, String> params = null;
@@ -197,7 +194,7 @@ public class ActionsConfigElement extends ConfigElementAdapter
*
* @author Kevin Roast
*/
public static class ActionGroup implements Iterable<ActionDefinition>
public static class ActionGroup implements Iterable<String>
{
public ActionGroup(String id)
{
@@ -213,24 +210,24 @@ public class ActionsConfigElement extends ConfigElementAdapter
return id;
}
public void addAction(ActionDefinition actionDef)
public void addAction(String actionId)
{
actions.put(actionDef.getId(), actionDef);
actions.add(actionId);
}
/**
* @return Iterator to the ActionDefinition objects referenced by this group
* @return Iterator over the ActionDefinition IDs referenced by this group
*/
public Iterator<ActionDefinition> iterator()
public Iterator<String> iterator()
{
return actions.values().iterator();
return actions.iterator();
}
private String id;
/** the action definitions, we use a linked hashmap to ensure we do not have more
/** the action definitions, we use a Linked HashSet to ensure we do not have more
than one action with the same Id and that the insertion order is preserved */
private Map<String, ActionDefinition> actions = new LinkedHashMap(8, 1.0f);
private Set<String> actions = new LinkedHashSet<String>(16, 1.0f);
public boolean ShowLink;
public String Style;