[cp-patches] Patch: FYI: Most of bug 9948

[Tom Tromey]

I'm checking this in.

This fixes most of bug 9948 -- a couple of constants weren't marked
final, and one was missing its value.

The bug remains open as I didn't know what to do with the fourth
field, which is not a constant according to the docs.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        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.

Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JDesktopPane.java,v
retrieving revision 1.4
diff -u -r1.4 JDesktopPane.java
--- javax/swing/JDesktopPane.java 26 Jun 2004 16:06:49 -0000 1.4
+++ javax/swing/JDesktopPane.java 17 Aug 2004 03:03:33 -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: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,v
retrieving revision 1.3
diff -u -r1.3 BasicSplitPaneUI.java
--- javax/swing/plaf/basic/BasicSplitPaneUI.java 22 Jul 2004 19:45:39 -0000 1.3
+++ javax/swing/plaf/basic/BasicSplitPaneUI.java 17 Aug 2004 03:03:33 -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;