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

Daily merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-12 20:22:46 +00:00
parent 1250a0352c
commit 1dd2a7b72b
67 changed files with 1364 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/web/config/CommandServletConfigElement.java
View File

@@ -64,19 +64,19 @@ public class CommandServletConfigElement extends ConfigElementAdapter
*/
public ConfigElement combine(ConfigElement configElement)
{
CommandServletConfigElement existingElement = (CommandServletConfigElement)configElement;
CommandServletConfigElement newElement = new CommandServletConfigElement();
CommandServletConfigElement newElement = (CommandServletConfigElement)configElement;
CommandServletConfigElement combinedElement = new CommandServletConfigElement();
for (String name : commandProcessors.keySet())
{
newElement.addCommandProcessor(name, commandProcessors.get(name));
combinedElement.addCommandProcessor(name, commandProcessors.get(name));
}
for (String name : existingElement.commandProcessors.keySet())
for (String name : newElement.commandProcessors.keySet())
{
newElement.addCommandProcessor(name, existingElement.commandProcessors.get(name));
combinedElement.addCommandProcessor(name, newElement.commandProcessors.get(name));
}
return newElement;
return combinedElement;
}
/*package*/ void addCommandProcessor(String name, String className)