Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support varargs for DomUtils.getChildElementsByTagName

Browse Source 
Issue: SPR-11272
This commit is contained in:
Juergen Hoeller
2014-01-03 12:18:19 +01:00
parent 2e123b01e5
commit e3344898cd
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-core/src/main/java/org/springframework/util/xml/DomUtils.java
View File

@@ -32,7 +32,8 @@ import org.xml.sax.ContentHandler;
import org.springframework.util.Assert;
/**
* Convenience methods for working with the DOM API, in particular for working with DOM Nodes and DOM Elements.
* Convenience methods for working with the DOM API,
* in particular for working with DOM Nodes and DOM Elements.
*
* @author Juergen Hoeller
* @author Rob Harrop
@@ -55,7 +56,7 @@ public abstract class DomUtils {
* @see org.w3c.dom.Element
* @see org.w3c.dom.Element#getElementsByTagName
*/
public static List<Element> getChildElementsByTagName(Element ele, String[] childEleNames) {
public static List<Element> getChildElementsByTagName(Element ele, String... childEleNames) {
Assert.notNull(ele, "Element must not be null");
Assert.notNull(childEleNames, "Element names collection must not be null");
List<String> childEleNameList = Arrays.asList(childEleNames);
@@ -81,7 +82,7 @@ public abstract class DomUtils {
* @see org.w3c.dom.Element#getElementsByTagName
*/
public static List<Element> getChildElementsByTagName(Element ele, String childEleName) {
return getChildElementsByTagName(ele, new String[]{childEleName});
return getChildElementsByTagName(ele, new String[] {childEleName});
}
/**
@@ -184,7 +185,7 @@ public abstract class DomUtils {
/**
* Matches the given node's name and local name against the given desired names.
*/
private static boolean nodeNameMatch(Node node, Collection desiredNames) {
private static boolean nodeNameMatch(Node node, Collection<?> desiredNames) {
return (desiredNames.contains(node.getNodeName()) || desiredNames.contains(node.getLocalName()));
}