root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

BeanDefinitionReader and ClassPath/FileSystemXmlApplicationContext use varargs where possible (SPR-6849) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2988 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-02-16 11:59:29 +00:00
parent 9fc396ae8c
commit f96ccfa39e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -136,7 +136,7 @@ public abstract class AbstractBeanDefinitionReader implements BeanDefinitionRead
} }
public int loadBeanDefinitions(Resource[] resources) throws BeanDefinitionStoreException { public int loadBeanDefinitions(Resource... resources) throws BeanDefinitionStoreException {
Assert.notNull(resources, "Resource array must not be null"); Assert.notNull(resources, "Resource array must not be null");
int counter = 0; int counter = 0;
for (Resource resource : resources) { for (Resource resource : resources) {
@ -205,7 +205,7 @@ public abstract class AbstractBeanDefinitionReader implements BeanDefinitionRead
} }
} }
public int loadBeanDefinitions(String[] locations) throws BeanDefinitionStoreException { public int loadBeanDefinitions(String... locations) throws BeanDefinitionStoreException {
Assert.notNull(locations, "Location array must not be null"); Assert.notNull(locations, "Location array must not be null");
int counter = 0; int counter = 0;
for (String location : locations) { for (String location : locations) {

6
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -93,7 +93,7 @@ public interface BeanDefinitionReader {
* @return the number of bean definitions found * @return the number of bean definitions found
* @throws BeanDefinitionStoreException in case of loading or parsing errors * @throws BeanDefinitionStoreException in case of loading or parsing errors
*/ */
int loadBeanDefinitions(Resource[] resources) throws BeanDefinitionStoreException; int loadBeanDefinitions(Resource... resources) throws BeanDefinitionStoreException;
/** /**
* Load bean definitions from the specified resource location. * Load bean definitions from the specified resource location.
@ -116,6 +116,6 @@ public interface BeanDefinitionReader {
* @return the number of bean definitions found * @return the number of bean definitions found
* @throws BeanDefinitionStoreException in case of loading or parsing errors * @throws BeanDefinitionStoreException in case of loading or parsing errors
*/ */
int loadBeanDefinitions(String[] locations) throws BeanDefinitionStoreException; int loadBeanDefinitions(String... locations) throws BeanDefinitionStoreException;
} }

4
org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -89,7 +89,7 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex
* @param configLocations array of resource locations * @param configLocations array of resource locations
* @throws BeansException if context creation failed * @throws BeansException if context creation failed
*/ */
public ClassPathXmlApplicationContext(String[] configLocations) throws BeansException { public ClassPathXmlApplicationContext(String... configLocations) throws BeansException {
this(configLocations, true, null); this(configLocations, true, null);
} }

4
org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -90,7 +90,7 @@ public class FileSystemXmlApplicationContext extends AbstractXmlApplicationConte
* @param configLocations array of file paths * @param configLocations array of file paths
* @throws BeansException if context creation failed * @throws BeansException if context creation failed
*/ */
public FileSystemXmlApplicationContext(String[] configLocations) throws BeansException { public FileSystemXmlApplicationContext(String... configLocations) throws BeansException {
this(configLocations, true, null); this(configLocations, true, null);
} }