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

18
source/java/org/alfresco/web/config/NavigationConfigElement.java
View File

@@ -123,36 +123,36 @@ public class NavigationConfigElement extends ConfigElementAdapter
*/
public ConfigElement combine(ConfigElement configElement)
{
NavigationConfigElement combined = new NavigationConfigElement();
NavigationConfigElement newElement = (NavigationConfigElement)configElement;
NavigationConfigElement combinedElement = new NavigationConfigElement();
// add all the existing from view id overrides
for (String fromViewId : this.viewIds.keySet())
{
combined.addOverride(fromViewId, null, this.viewIds.get(fromViewId));
combinedElement.addOverride(fromViewId, null, this.viewIds.get(fromViewId));
}
// add all the existing from outcome overrides
for (String fromOutcome : this.outcomes.keySet())
{
combined.addOverride(null, fromOutcome, this.outcomes.get(fromOutcome));
combinedElement.addOverride(null, fromOutcome, this.outcomes.get(fromOutcome));
}
// add all the from view id overrides from the given element
NavigationConfigElement navCfg = (NavigationConfigElement)configElement;
HashMap<String, NavigationResult> viewIds = navCfg.getViewIds();
HashMap<String, NavigationResult> viewIds = newElement.getViewIds();
for (String fromViewId : viewIds.keySet())
{
combined.addOverride(fromViewId, null, viewIds.get(fromViewId));
combinedElement.addOverride(fromViewId, null, viewIds.get(fromViewId));
}
// add all the from outcome overrides from the given element
HashMap<String, NavigationResult> outcomes = navCfg.getOutcomes();
HashMap<String, NavigationResult> outcomes = newElement.getOutcomes();
for (String fromOutcome : outcomes.keySet())
{
combined.addOverride(null, fromOutcome, outcomes.get(fromOutcome));
combinedElement.addOverride(null, fromOutcome, outcomes.get(fromOutcome));
}
return combined;
return combinedElement;
}
/**