Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JInternalFrame.java,v
retrieving revision 1.2.18.6
diff -u -r1.2.18.6 JInternalFrame.java
--- javax/swing/JInternalFrame.java	25 Oct 2004 10:34:31 -0000	1.2.18.6
+++ javax/swing/JInternalFrame.java	13 Dec 2004 19:08:23 -0000
@@ -860,7 +860,7 @@
   {
     JDesktopPane pane = getDesktopPane();
     if (pane != null)
-      return pane.getLayer(this).intValue();
+      return pane.getLayer(this);
     return -1;
   }
 
Index: javax/swing/JLayeredPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JLayeredPane.java,v
retrieving revision 1.6.8.7
diff -u -r1.6.8.7 JLayeredPane.java
--- javax/swing/JLayeredPane.java	1 Dec 2004 13:24:13 -0000	1.6.8.7
+++ javax/swing/JLayeredPane.java	13 Dec 2004 19:08:23 -0000
@@ -122,11 +122,11 @@
    * @return the layer the component is currently assigned to, in this container.
    * @throws IllegalArgumentException if the component is not a child of this container.
    */
-  protected Integer getLayer (Component c)
+  public int getLayer(Component c)
   {
     if (! componentToLayer.containsKey (c))
 	    throw new IllegalArgumentException ();
-    return (Integer) componentToLayer.get (c);
+    return ((Integer) componentToLayer.get(c)).intValue();
   }
 
   /**
@@ -270,8 +270,8 @@
    */
   public int getPosition(Component c)
   {
-    Integer layer = getLayer (c);
-    int[] range = layerToRange (layer);
+    int layer = getLayer (c);
+    int[] range = layerToRange(new Integer(layer));
     int top = range[0];
     int bot = range[1];
     Component[] comps = getComponents ();
@@ -297,8 +297,8 @@
    */
   public void setPosition(Component c, int position)
   {
-    Integer layer = getLayer (c);
-    int[] range = layerToRange (layer);
+    int layer = getLayer (c);
+    int[] range = layerToRange(new Integer(layer));
     if (range[0] == range[1])
       throw new IllegalArgumentException ();
 
@@ -389,8 +389,8 @@
    */
   public int getIndexOf(Component c) 
   {
-    Integer layer = getLayer (c);
-    int[] range = layerToRange (layer);
+    int layer = getLayer (c);
+    int[] range = layerToRange(new Integer(layer));
     Component[] comps = getComponents();
     for (int i = range[0]; i < range[1]; ++i)
 	    {
@@ -475,8 +475,8 @@
   public void remove (int index)
   {
     Component c = getComponent (index);
-    Integer layer = getLayer (c);
-    decrLayer (layer);
+    int layer = getLayer (c);
+    decrLayer (new Integer(layer));
     componentToLayer.remove (c);
     super.remove (index);
     revalidate();