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:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent d6f9f50c39
commit dead3c3825
265 changed files with 44099 additions and 44099 deletions

View File

@@ -1,58 +1,58 @@
package org.alfresco.web.config;
import java.util.Iterator;
import org.springframework.extensions.config.ConfigElement;
import org.springframework.extensions.config.ConfigException;
import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
import org.dom4j.Element;
/**
* Custom element reader to parse config for languages
*
* @author Gavin Cornwell
*/
public class LanguagesElementReader implements ConfigElementReader
{
public static final String ELEMENT_LANGUAGE = "language";
public static final String ATTRIBUTE_LOCALE = "locale";
/**
* @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
*/
@SuppressWarnings("unchecked")
public ConfigElement parse(Element element)
{
LanguagesConfigElement configElement = null;
if (element != null)
{
String name = element.getName();
if (name.equals(LanguagesConfigElement.CONFIG_ELEMENT_ID) == false)
{
throw new ConfigException("LanguagesElementReader can only parse " +
LanguagesConfigElement.CONFIG_ELEMENT_ID + " elements, the element passed was '" +
name + "'");
}
configElement = new LanguagesConfigElement();
Iterator<Element> langsItr = element.elementIterator(ELEMENT_LANGUAGE);
while (langsItr.hasNext())
{
Element language = langsItr.next();
String localeCode = language.attributeValue(ATTRIBUTE_LOCALE);
String label = language.getTextTrim();
if (localeCode != null && localeCode.length() != 0 &&
label != null && label.length() != 0)
{
// store the language code against the display label
configElement.addLanguage(localeCode, label);
}
}
}
return configElement;
}
}
package org.alfresco.web.config;
import java.util.Iterator;
import org.springframework.extensions.config.ConfigElement;
import org.springframework.extensions.config.ConfigException;
import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
import org.dom4j.Element;
/**
* Custom element reader to parse config for languages
*
* @author Gavin Cornwell
*/
public class LanguagesElementReader implements ConfigElementReader
{
public static final String ELEMENT_LANGUAGE = "language";
public static final String ATTRIBUTE_LOCALE = "locale";
/**
* @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
*/
@SuppressWarnings("unchecked")
public ConfigElement parse(Element element)
{
LanguagesConfigElement configElement = null;
if (element != null)
{
String name = element.getName();
if (name.equals(LanguagesConfigElement.CONFIG_ELEMENT_ID) == false)
{
throw new ConfigException("LanguagesElementReader can only parse " +
LanguagesConfigElement.CONFIG_ELEMENT_ID + " elements, the element passed was '" +
name + "'");
}
configElement = new LanguagesConfigElement();
Iterator<Element> langsItr = element.elementIterator(ELEMENT_LANGUAGE);
while (langsItr.hasNext())
{
Element language = langsItr.next();
String localeCode = language.attributeValue(ATTRIBUTE_LOCALE);
String label = language.getTextTrim();
if (localeCode != null && localeCode.length() != 0 &&
label != null && label.length() != 0)
{
// store the language code against the display label
configElement.addLanguage(localeCode, label);
}
}
}
return configElement;
}
}