From aa54ea1844bcd95a10f97b97f4f4e194cb0a37da Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 10 Jan 2003 22:35:17 +0000 Subject: * java/util/ResourceBundle.java (static): Fixed indentation. (getCallingClassLoader): Likewise. (getObject): Likewise. --- ChangeLog | 6 ++++++ java/util/ResourceBundle.java | 29 +++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ed889b15..2a6100202 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-10 Tom Tromey + + * java/util/ResourceBundle.java (static): Fixed indentation. + (getCallingClassLoader): Likewise. + (getObject): Likewise. + 2003-01-10: C. Brian Jones * java/net/Socket.java: add missing @since tags, most of patch diff --git a/java/util/ResourceBundle.java b/java/util/ResourceBundle.java index edc7328d2..fd0cae3e4 100644 --- a/java/util/ResourceBundle.java +++ b/java/util/ResourceBundle.java @@ -1,5 +1,5 @@ /* ResourceBundle -- aids in loading resource bundles - Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -108,12 +108,15 @@ public abstract class ResourceBundle private static Class resourceBundleClass; private static Class securityClass; - static { - try { - resourceBundleClass = Class.forName("java.util.ResourceBundle"); - securityClass = Class.forName("java.util.ResourceBundle$Security"); - } catch (ClassNotFoundException e) { - + static + { + try + { + resourceBundleClass = Class.forName("java.util.ResourceBundle"); + securityClass = Class.forName("java.util.ResourceBundle$Security"); + } + catch (ClassNotFoundException e) + { } } @@ -136,10 +139,11 @@ public abstract class ResourceBundle ClassLoader getCallingClassLoader() { Class[] stack = getClassContext(); - for (int i = 0; i < stack.length; i++) { - if (stack[i] != securityClass && stack[i] != resourceBundleClass) - return stack[i].getClassLoader(); - } + for (int i = 0; i < stack.length; i++) + { + if (stack[i] != securityClass && stack[i] != resourceBundleClass) + return stack[i].getClassLoader(); + } return null; } @@ -236,7 +240,8 @@ public abstract class ResourceBundle { } - throw new MissingResourceException("Key not found", getClass().getName(), key); + throw new MissingResourceException("Key not found", getClass().getName(), + key); } /** -- cgit v1.2.1