mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,108 +1,108 @@
|
||||
package org.alfresco.web.config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.extensions.config.ConfigElement;
|
||||
import org.springframework.extensions.config.ConfigException;
|
||||
import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
|
||||
import org.alfresco.web.config.AdvancedSearchConfigElement.CustomProperty;
|
||||
import org.dom4j.Element;
|
||||
|
||||
/**
|
||||
* Custom element reader to parse config for advanced search
|
||||
*
|
||||
* @author Gavin Cornwell
|
||||
*/
|
||||
public class AdvancedSearchElementReader implements ConfigElementReader
|
||||
{
|
||||
public static final String ELEMENT_CONTENTTYPES = "content-types";
|
||||
public static final String ELEMENT_FOLDERTYPES = "folder-types";
|
||||
public static final String ELEMENT_TYPE = "type";
|
||||
public static final String ELEMENT_CUSTOMPROPS = "custom-properties";
|
||||
public static final String ELEMENT_METADATA = "meta-data";
|
||||
public static final String ATTRIBUTE_NAME = "name";
|
||||
public static final String ATTRIBUTE_TYPE = "type";
|
||||
public static final String ATTRIBUTE_PROPERTY = "property";
|
||||
public static final String ATTRIBUTE_ASPECT = "aspect";
|
||||
public static final String ATTRIBUTE_DISPLAYLABEL = "display-label-id";
|
||||
|
||||
/**
|
||||
* @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public ConfigElement parse(Element element)
|
||||
{
|
||||
AdvancedSearchConfigElement configElement = null;
|
||||
|
||||
if (element != null)
|
||||
{
|
||||
String name = element.getName();
|
||||
if (name.equals(AdvancedSearchConfigElement.CONFIG_ELEMENT_ID) == false)
|
||||
{
|
||||
throw new ConfigException("AdvancedSearchElementReader can only parse " +
|
||||
AdvancedSearchConfigElement.CONFIG_ELEMENT_ID + " elements, the element passed was '" +
|
||||
name + "'");
|
||||
}
|
||||
|
||||
configElement = new AdvancedSearchConfigElement();
|
||||
|
||||
// get the list of content types
|
||||
Element contentTypes = element.element(ELEMENT_CONTENTTYPES);
|
||||
if (contentTypes != null)
|
||||
{
|
||||
Iterator<Element> typesItr = contentTypes.elementIterator(ELEMENT_TYPE);
|
||||
List<String> types = new ArrayList<String>(5);
|
||||
while (typesItr.hasNext())
|
||||
{
|
||||
Element contentType = typesItr.next();
|
||||
String type = contentType.attributeValue(ATTRIBUTE_NAME);
|
||||
if (type != null)
|
||||
{
|
||||
types.add(type);
|
||||
}
|
||||
}
|
||||
configElement.setContentTypes(types);
|
||||
}
|
||||
|
||||
// get the list of folder types
|
||||
Element folderTypes = element.element(ELEMENT_FOLDERTYPES);
|
||||
if (folderTypes != null)
|
||||
{
|
||||
Iterator<Element> typesItr = folderTypes.elementIterator(ELEMENT_TYPE);
|
||||
List<String> types = new ArrayList<String>(5);
|
||||
while (typesItr.hasNext())
|
||||
{
|
||||
Element folderType = typesItr.next();
|
||||
String type = folderType.attributeValue(ATTRIBUTE_NAME);
|
||||
if (type != null)
|
||||
{
|
||||
types.add(type);
|
||||
}
|
||||
}
|
||||
configElement.setFolderTypes(types);
|
||||
}
|
||||
|
||||
// get the list of custom properties to display
|
||||
Element customProps = element.element(ELEMENT_CUSTOMPROPS);
|
||||
if (customProps != null)
|
||||
{
|
||||
Iterator<Element> propsItr = customProps.elementIterator(ELEMENT_METADATA);
|
||||
List<CustomProperty> props = new ArrayList<CustomProperty>(5);
|
||||
while (propsItr.hasNext())
|
||||
{
|
||||
Element propElement = propsItr.next();
|
||||
String type = propElement.attributeValue(ATTRIBUTE_TYPE);
|
||||
String aspect = propElement.attributeValue(ATTRIBUTE_ASPECT);
|
||||
String prop = propElement.attributeValue(ATTRIBUTE_PROPERTY);
|
||||
String labelId = propElement.attributeValue(ATTRIBUTE_DISPLAYLABEL);
|
||||
props.add(new AdvancedSearchConfigElement.CustomProperty(type, aspect, prop, labelId));
|
||||
}
|
||||
configElement.setCustomProperties(props);
|
||||
}
|
||||
}
|
||||
|
||||
return configElement;
|
||||
}
|
||||
}
|
||||
package org.alfresco.web.config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.extensions.config.ConfigElement;
|
||||
import org.springframework.extensions.config.ConfigException;
|
||||
import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
|
||||
import org.alfresco.web.config.AdvancedSearchConfigElement.CustomProperty;
|
||||
import org.dom4j.Element;
|
||||
|
||||
/**
|
||||
* Custom element reader to parse config for advanced search
|
||||
*
|
||||
* @author Gavin Cornwell
|
||||
*/
|
||||
public class AdvancedSearchElementReader implements ConfigElementReader
|
||||
{
|
||||
public static final String ELEMENT_CONTENTTYPES = "content-types";
|
||||
public static final String ELEMENT_FOLDERTYPES = "folder-types";
|
||||
public static final String ELEMENT_TYPE = "type";
|
||||
public static final String ELEMENT_CUSTOMPROPS = "custom-properties";
|
||||
public static final String ELEMENT_METADATA = "meta-data";
|
||||
public static final String ATTRIBUTE_NAME = "name";
|
||||
public static final String ATTRIBUTE_TYPE = "type";
|
||||
public static final String ATTRIBUTE_PROPERTY = "property";
|
||||
public static final String ATTRIBUTE_ASPECT = "aspect";
|
||||
public static final String ATTRIBUTE_DISPLAYLABEL = "display-label-id";
|
||||
|
||||
/**
|
||||
* @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public ConfigElement parse(Element element)
|
||||
{
|
||||
AdvancedSearchConfigElement configElement = null;
|
||||
|
||||
if (element != null)
|
||||
{
|
||||
String name = element.getName();
|
||||
if (name.equals(AdvancedSearchConfigElement.CONFIG_ELEMENT_ID) == false)
|
||||
{
|
||||
throw new ConfigException("AdvancedSearchElementReader can only parse " +
|
||||
AdvancedSearchConfigElement.CONFIG_ELEMENT_ID + " elements, the element passed was '" +
|
||||
name + "'");
|
||||
}
|
||||
|
||||
configElement = new AdvancedSearchConfigElement();
|
||||
|
||||
// get the list of content types
|
||||
Element contentTypes = element.element(ELEMENT_CONTENTTYPES);
|
||||
if (contentTypes != null)
|
||||
{
|
||||
Iterator<Element> typesItr = contentTypes.elementIterator(ELEMENT_TYPE);
|
||||
List<String> types = new ArrayList<String>(5);
|
||||
while (typesItr.hasNext())
|
||||
{
|
||||
Element contentType = typesItr.next();
|
||||
String type = contentType.attributeValue(ATTRIBUTE_NAME);
|
||||
if (type != null)
|
||||
{
|
||||
types.add(type);
|
||||
}
|
||||
}
|
||||
configElement.setContentTypes(types);
|
||||
}
|
||||
|
||||
// get the list of folder types
|
||||
Element folderTypes = element.element(ELEMENT_FOLDERTYPES);
|
||||
if (folderTypes != null)
|
||||
{
|
||||
Iterator<Element> typesItr = folderTypes.elementIterator(ELEMENT_TYPE);
|
||||
List<String> types = new ArrayList<String>(5);
|
||||
while (typesItr.hasNext())
|
||||
{
|
||||
Element folderType = typesItr.next();
|
||||
String type = folderType.attributeValue(ATTRIBUTE_NAME);
|
||||
if (type != null)
|
||||
{
|
||||
types.add(type);
|
||||
}
|
||||
}
|
||||
configElement.setFolderTypes(types);
|
||||
}
|
||||
|
||||
// get the list of custom properties to display
|
||||
Element customProps = element.element(ELEMENT_CUSTOMPROPS);
|
||||
if (customProps != null)
|
||||
{
|
||||
Iterator<Element> propsItr = customProps.elementIterator(ELEMENT_METADATA);
|
||||
List<CustomProperty> props = new ArrayList<CustomProperty>(5);
|
||||
while (propsItr.hasNext())
|
||||
{
|
||||
Element propElement = propsItr.next();
|
||||
String type = propElement.attributeValue(ATTRIBUTE_TYPE);
|
||||
String aspect = propElement.attributeValue(ATTRIBUTE_ASPECT);
|
||||
String prop = propElement.attributeValue(ATTRIBUTE_PROPERTY);
|
||||
String labelId = propElement.attributeValue(ATTRIBUTE_DISPLAYLABEL);
|
||||
props.add(new AdvancedSearchConfigElement.CustomProperty(type, aspect, prop, labelId));
|
||||
}
|
||||
configElement.setCustomProperties(props);
|
||||
}
|
||||
}
|
||||
|
||||
return configElement;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user