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

8
source/java/org/alfresco/web/config/PropertySheetConfigElement.java
View File

@@ -72,21 +72,21 @@ public class PropertySheetConfigElement extends ConfigElementAdapter
*/
public ConfigElement combine(ConfigElement configElement)
{
PropertySheetConfigElement combined = new PropertySheetConfigElement();
PropertySheetConfigElement combinedElement = new PropertySheetConfigElement();
// add all the existing properties
for (ItemConfig item : this.getItems().values())
{
combined.addItem(item);
combinedElement.addItem(item);
}
// add all the properties from the given element
for (ItemConfig item : ((PropertySheetConfigElement)configElement).getItems().values())
{
combined.addItem(item);
combinedElement.addItem(item);
}
return combined;
return combinedElement;
}
/**