git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ResourceBundle.java: Reformatted. 

2004-11-24  Michael Koch  <konqueror@gmx.de>

	* java/util/ResourceBundle.java: Reformatted.
	(tryBundle): Fixed javadoc.

From-SVN: r91152
This commit is contained in:
Michael Koch 2004-11-24 13:26:27 +00:00 committed by Michael Koch
parent 9cf1276586
commit b1e6f04325
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2004-11-24 Michael Koch <konqueror@gmx.de>
* java/util/ResourceBundle.java: Reformatted.
(tryBundle): Fixed javadoc.
2004-11-24 Jeroen Frijters <jeroen@frijters.net> 2004-11-24 Jeroen Frijters <jeroen@frijters.net>
* java/text/MessageFormat.java * java/text/MessageFormat.java

8
libjava/java/util/ResourceBundle.java
View File

@ -1,5 +1,6 @@
/* ResourceBundle -- aids in loading resource bundles /* ResourceBundle -- aids in loading resource bundles
Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -292,7 +293,7 @@ public abstract class ResourceBundle
catch (CloneNotSupportedException x) {} catch (CloneNotSupportedException x) {}
return clone; return clone;
} }
} }
/** A cache lookup key. This avoids having to a new one for every /** A cache lookup key. This avoids having to a new one for every
@ -395,6 +396,7 @@ public abstract class ResourceBundle
Object obj = bundleCache.get(lookupKey); Object obj = bundleCache.get(lookupKey);
ResourceBundle rb = null; ResourceBundle rb = null;
if (obj instanceof ResourceBundle) if (obj instanceof ResourceBundle)
{ {
return (ResourceBundle) obj; return (ResourceBundle) obj;
@ -516,7 +518,7 @@ public abstract class ResourceBundle
* Tries to load a the bundle for a given locale, also loads the backup * Tries to load a the bundle for a given locale, also loads the backup
* locales with the same language. * locales with the same language.
* *
* @param name the name * @param baseName the raw bundle name, without locale qualifiers
* @param locale the locale * @param locale the locale
* @param classloader the classloader * @param classloader the classloader
* @param bundle the backup (parent) bundle * @param bundle the backup (parent) bundle