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

62
source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
View File

@@ -33,6 +33,7 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter
public static final String CONFIG_ELEMENT_ID = "advanced-search";
private List<String> contentTypes = null;
private List<String> folderTypes = null;
private List<CustomProperty> customProps = null;
/**
@@ -67,15 +68,22 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter
*/
public ConfigElement combine(ConfigElement configElement)
{
AdvancedSearchConfigElement existingElement = (AdvancedSearchConfigElement)configElement;
AdvancedSearchConfigElement newElement = new AdvancedSearchConfigElement();
AdvancedSearchConfigElement newElement = (AdvancedSearchConfigElement)configElement;
AdvancedSearchConfigElement combinedElement = new AdvancedSearchConfigElement();
// just copy the list of types and properties from this instance to the new one
if (this.contentTypes != null)
{
for (String type : this.contentTypes)
{
newElement.addContentType(type);
combinedElement.addContentType(type);
}
}
if (this.folderTypes != null)
{
for (String type : this.folderTypes)
{
combinedElement.addFolderType(type);
}
}
@@ -83,28 +91,28 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter
{
for (CustomProperty property : this.customProps)
{
newElement.addCustomProperty(property);
combinedElement.addCustomProperty(property);
}
}
// now add those types and custom properties from the element to be combined
if (existingElement.getContentTypes() != null)
if (newElement.getContentTypes() != null)
{
for (String type : existingElement.getContentTypes())
for (String type : newElement.getContentTypes())
{
newElement.addContentType(type);
combinedElement.addContentType(type);
}
}
if (existingElement.getCustomProperties() != null)
if (newElement.getCustomProperties() != null)
{
for (CustomProperty property : existingElement.getCustomProperties())
for (CustomProperty property : newElement.getCustomProperties())
{
newElement.addCustomProperty(property);
combinedElement.addCustomProperty(property);
}
}
return newElement;
return combinedElement;
}
/**
@@ -139,6 +147,38 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter
}
}
/**
* @return Returns the folderTypes.
*/
public List<String> getFolderTypes()
{
return this.folderTypes;
}
/**
* @param folderTypes The folderTypes to set.
*/
/*package*/ void setFolderTypes(List<String> folderTypes)
{
this.folderTypes = folderTypes;
}
/**
* @param folderType Adds the given folder type to the list
*/
/*package*/ void addFolderType(String folderType)
{
if (this.folderTypes == null)
{
this.folderTypes = new ArrayList<String>(3);
}
if (this.folderTypes.contains(folderType) == false)
{
this.folderTypes.add(folderType);
}
}
/**
* @return Returns the customProps.
*/