mcconnell 2003/02/07 14:17:08 Modified: i18n default.properties i18n/src/java/org/apache/avalon/excalibur/i18n ResourceManager.java Log: Moving back to 1.0 status. Revision Changes Path 1.12 +1 -1 avalon-excalibur/i18n/default.properties Index: default.properties =================================================================== RCS file: /home/cvs/avalon-excalibur/i18n/default.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- default.properties 7 Feb 2003 18:01:05 -0000 1.11 +++ default.properties 7 Feb 2003 22:17:08 -0000 1.12 @@ -9,7 +9,7 @@ Name=Excalibur I18N dir-name=il8n version=1.0 -package-version=1.1 +package-version=1.0 year=2000-2002 # 1.19 +1 -29 avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/ResourceManager.java Index: ResourceManager.java =================================================================== RCS file: /home/cvs/avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/ResourceManager.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ResourceManager.java 27 Jan 2003 03:14:16 -0000 1.18 +++ ResourceManager.java 7 Feb 2003 22:17:08 -0000 1.19 @@ -7,7 +7,6 @@ */ package org.apache.avalon.excalibur.i18n; -import java.util.Locale; import java.lang.ref.WeakReference; import java.util.HashMap; @@ -46,24 +45,10 @@ public synchronized static final Resources getBaseResources( final String baseName, final ClassLoader classLoader ) { - return getBaseResources( baseName, Locale.getDefault(), classLoader ); - } - - /** - * Retrieve resource with specified basename. - * - * @param baseName the basename - * @param classLoader the classLoader to load resources from - * @return the Resources - */ - public synchronized static final Resources getBaseResources( final String baseName, - final Locale locale, - final ClassLoader classLoader ) - { Resources resources = getCachedResource( baseName ); if( null == resources ) { - resources = new Resources( baseName, locale, classLoader ); + resources = new Resources( baseName, classLoader ); putCachedResource( baseName, resources ); } @@ -152,19 +137,6 @@ { return getBaseResources( getPackageResourcesBaseName( clazz ), clazz.getClassLoader() ); } - - /** - * Retrieve resource for package relative to the specified class and locale. - * - * @param clazz the Class - * @param locale the locale - * @return the Resources - */ - public static final Resources getPackageResources( final Class clazz, Locale locale ) - { - return getBaseResources( getPackageResourcesBaseName( clazz ), locale, clazz.getClassLoader() ); - } - /** * Retrieve resource for specified Class.
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]