[cp-patches] Patch: FYI: trampolines in javax

[Tom Tromey]

I'm checking this in to Classpath and libgcj.

This removes trampolines in javax.*, except swing, which I'm saving
for later.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * javax/naming/directory/BasicAttributes.java (attributes): Now
        package-private.
        * javax/imageio/spi/ServiceRegistry.java (categories): Now
        package-private.

Index: javax/naming/directory/BasicAttributes.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/naming/directory/BasicAttributes.java,v
retrieving revision 1.3
diff -u -r1.3 BasicAttributes.java
--- javax/naming/directory/BasicAttributes.java 21 Oct 2004 20:53:16 -0000 1.3
+++ javax/naming/directory/BasicAttributes.java 6 Nov 2004 23:30:25 -0000
@@ -185,7 +185,8 @@
 
   // 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
Index: javax/imageio/spi/ServiceRegistry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/spi/ServiceRegistry.java,v
retrieving revision 1.2
diff -u -r1.2 ServiceRegistry.java
--- javax/imageio/spi/ServiceRegistry.java 4 Oct 2004 06:49:45 -0000 1.2
+++ javax/imageio/spi/ServiceRegistry.java 6 Nov 2004 23:30:25 -0000
@@ -62,6 +62,7 @@
  */
 public class ServiceRegistry
 {
+  // Package-private to avoid a trampoline.
   /**
    * The service categories of this registry.
    *
@@ -73,7 +74,7 @@
    *
    * @see #providers
    */
-  private final Class[] categories;
+  final Class[] categories;
 
 
   /**