From 6cd9226fb493e6c9ef831feb1b14bde5f1f4fb72 Mon Sep 17 00:00:00 2001 From: tromey Date: Sat, 6 Nov 2004 23:29:12 +0000 Subject: [PATCH] * javax/naming/directory/BasicAttributes.java (attributes): Now package-private. * javax/imageio/spi/ServiceRegistry.java (categories): Now package-private. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90204 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 7 +++++++ libjava/javax/imageio/spi/ServiceRegistry.java | 3 ++- libjava/javax/naming/directory/BasicAttributes.java | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3e2c5f2613a..56e3b463693 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2004-11-06 Tom Tromey + * javax/naming/directory/BasicAttributes.java (attributes): Now + package-private. + * javax/imageio/spi/ServiceRegistry.java (categories): Now + package-private. + +2004-11-06 Tom Tromey + * java/net/URLClassLoader.java (URLClassLoader): Now package-private. * java/nio/charset/CoderResult.java (CoderResult): Now diff --git a/libjava/javax/imageio/spi/ServiceRegistry.java b/libjava/javax/imageio/spi/ServiceRegistry.java index 566d50f732e..3d7134ed53f 100644 --- a/libjava/javax/imageio/spi/ServiceRegistry.java +++ b/libjava/javax/imageio/spi/ServiceRegistry.java @@ -62,6 +62,7 @@ import java.util.Set; */ public class ServiceRegistry { + // Package-private to avoid a trampoline. /** * The service categories of this registry. * @@ -73,7 +74,7 @@ public class ServiceRegistry * * @see #providers */ - private final Class[] categories; + final Class[] categories; /** diff --git a/libjava/javax/naming/directory/BasicAttributes.java b/libjava/javax/naming/directory/BasicAttributes.java index eec1c88bbe7..9a9a80019a4 100644 --- a/libjava/javax/naming/directory/BasicAttributes.java +++ b/libjava/javax/naming/directory/BasicAttributes.java @@ -185,7 +185,8 @@ public class BasicAttributes implements Attributes // This is set by the serialization spec. private boolean ignoreCase; - private transient Vector attributes; + // Package-private to avoid a trampoline. + transient Vector attributes; // Used when enumerating. private class BasicAttributesEnumeration implements NamingEnumeration -- 2.11.4.GIT