From 947032372479fae3f9da5d64b9e3512896db92a4 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 11 Feb 2012 18:21:58 +0100 Subject: [PATCH] "setBasenames" uses varargs now (for programmatic setup; SPR-9106) --- .../support/ReloadableResourceBundleMessageSource.java | 6 +++--- .../context/support/ResourceBundleMessageSource.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java index a51d6fc407..da8af17fb0 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -135,7 +135,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource * @see java.util.ResourceBundle */ public void setBasename(String basename) { - setBasenames(new String[] {basename}); + setBasenames(basename); } /** @@ -153,7 +153,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource * @see #setBasename * @see java.util.ResourceBundle */ - public void setBasenames(String[] basenames) { + public void setBasenames(String... basenames) { if (basenames != null) { this.basenames = new String[basenames.length]; for (int i = 0; i < basenames.length; i++) { diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java b/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java index 9080ebd333..a3426dc1d5 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,7 +100,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement * @see java.util.ResourceBundle#getBundle(String) */ public void setBasename(String basename) { - setBasenames(new String[] {basename}); + setBasenames(basename); } /** @@ -119,7 +119,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement * @see #setBasename * @see java.util.ResourceBundle#getBundle(String) */ - public void setBasenames(String[] basenames) { + public void setBasenames(String... basenames) { if (basenames != null) { this.basenames = new String[basenames.length]; for (int i = 0; i < basenames.length; i++) {