Re: [cp-patches] Patch: FYI: BorderLayout -vs- 1.5

[Tom Tromey]

Tom> Duh, I was confused.
Tom> I'll revert this bit momentarily.

Here's the patch.  Apologies for the noise.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * java/awt/BorderLayout.java: Reverted field reordering.

Index: java/awt/BorderLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/BorderLayout.java,v
retrieving revision 1.19
diff -u -r1.19 BorderLayout.java
--- java/awt/BorderLayout.java  21 Sep 2005 18:38:22 -0000      1.19
+++ java/awt/BorderLayout.java  21 Sep 2005 19:05:04 -0000
@@ -175,16 +175,6 @@
 
 
   /**
-   * @serial The horizontal gap between components
-   */
-  private int hgap;
-
-  /**
-   * @serial The vertical gap between components
-   */
-  private int vgap;
-
-  /**
    * @serial
    */
   private Component north;
@@ -192,7 +182,7 @@
   /**
    * @serial
    */
-  private Component west;
+  private Component south;
 
   /**
    * @serial
@@ -202,7 +192,7 @@
   /**
    * @serial
    */
-  private Component south;
+  private Component west;
 
   /**
    * @serial
@@ -228,6 +218,16 @@
    * @serial
    */
   private Component lastItem;
+
+  /**
+   * @serial The horizontal gap between components
+   */
+  private int hgap;
+
+  /**
+   * @serial The vertical gap between components
+   */
+  private int vgap;
 
 
   // Some constants for use with calcSize().