FYI: [gui] More swing final fields patches from GNU Classpath

[Mark Wielaard <mark at klomp dot org>]

Hi,

This merges Tom his patch for a GNU Classpath bug reported on Savannah.

2004-09-23  Tom Tromey  <tromey@redhat.com>

        Bug 9948.
        * javax/swing/JDesktopPane.java (LIVE_DRAG_MODE): Now final.
        (OUTLINE_DRAG_MODE): LIVE_DRAG_MODE.
        * javax/swing/plaf/basic/BasicSplitPaneUI.java
        (NON_CONTINUOUS_DIVIDER): Now final.  Initialize.

Committed,

Mark

? javax/swing/semantic.cache
? javax/swing/plaf/basic/semantic.cache
? javax/swing/text/semantic.cache
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.3.8.3
diff -u -r1.3.8.3 JDesktopPane.java
--- javax/swing/JDesktopPane.java	9 Jun 2004 20:55:10 -0000	1.3.8.3
+++ javax/swing/JDesktopPane.java	23 Sep 2004 15:47:08 -0000
@@ -64,13 +64,13 @@
    * This specifies that when dragged, a JInternalFrame should be completely
    * visible.
    */
-  public static int LIVE_DRAG_MODE = 0;
+  public static final int LIVE_DRAG_MODE = 0;
 
   /**
    * This specifies that when dragged, a JInternalFrame should only be visible
    * as an outline.
    */
-  public static int OUTLINE_DRAG_MODE = 1;
+  public static final int OUTLINE_DRAG_MODE = 1;
 
   /** The selected frame in the JDesktopPane. */
   private transient JInternalFrame selectedFrame;
Index: javax/swing/plaf/basic/BasicSplitPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.java,v
retrieving revision 1.1.26.3
diff -u -r1.1.26.3 BasicSplitPaneUI.java
--- javax/swing/plaf/basic/BasicSplitPaneUI.java	16 Jul 2004 22:02:42 -0000	1.1.26.3
+++ javax/swing/plaf/basic/BasicSplitPaneUI.java	23 Sep 2004 15:47:08 -0000
@@ -892,7 +892,8 @@
    * The constraints object used when adding the non-continuous divider to the
    * JSplitPane.
    */
-  protected static String NON_CONTINUOUS_DIVIDER;
+  protected static final String NON_CONTINUOUS_DIVIDER
+    = "nonContinuousDivider";
 
   /** The dark divider used when dragging in non-continuous layout mode. */
   protected Component nonContinuousLayoutDivider;

Attachment: signature.asc
Description: This is a digitally signed message part