Skip to content

Commit 9470323

Browse files
committed
"setBasenames" uses varargs now (for programmatic setup; SPR-9106)
1 parent b17d545 commit 9470323

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2009 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -135,7 +135,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
135135
* @see java.util.ResourceBundle
136136
*/
137137
public void setBasename(String basename) {
138-
setBasenames(new String[] {basename});
138+
setBasenames(basename);
139139
}
140140

141141
/**
@@ -153,7 +153,7 @@ public void setBasename(String basename) {
153153
* @see #setBasename
154154
* @see java.util.ResourceBundle
155155
*/
156-
public void setBasenames(String[] basenames) {
156+
public void setBasenames(String... basenames) {
157157
if (basenames != null) {
158158
this.basenames = new String[basenames.length];
159159
for (int i = 0; i < basenames.length; i++) {

org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2008 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
100100
* @see java.util.ResourceBundle#getBundle(String)
101101
*/
102102
public void setBasename(String basename) {
103-
setBasenames(new String[] {basename});
103+
setBasenames(basename);
104104
}
105105

106106
/**
@@ -119,7 +119,7 @@ public void setBasename(String basename) {
119119
* @see #setBasename
120120
* @see java.util.ResourceBundle#getBundle(String)
121121
*/
122-
public void setBasenames(String[] basenames) {
122+
public void setBasenames(String... basenames) {
123123
if (basenames != null) {
124124
this.basenames = new String[basenames.length];
125125
for (int i = 0; i < basenames.length; i++) {

0 commit comments

Comments
 (0)