From 8aa540d2f783474d1d2e06f16744bf67b9c1facc Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Fri, 10 Mar 2006 21:46:48 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942
---
 .../javax/swing/plaf/basic/BasicBorders.java       | 36 +++++-----------------
 1 file changed, 8 insertions(+), 28 deletions(-)

(limited to 'libjava/classpath/javax/swing/plaf/basic/BasicBorders.java')

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java b/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
index 5d4ce18932b..5e2cf2e48ca 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
@@ -299,9 +299,7 @@ public class BasicBorders
   public static Border getSplitPaneDividerBorder()
   {
     /* See comment in methods above for why this border is not shared. */
-    return new SplitPaneDividerBorder(
-      UIManager.getColor("SplitPane.highlight"),
-      UIManager.getColor("SplitPane.darkShadow"));
+    return new SplitPaneDividerBorder();
   }
 
 
@@ -1517,35 +1515,16 @@ public class BasicBorders
   private static class SplitPaneDividerBorder
     implements Border, UIResource, Serializable
   {
-    /**
-     * The highlight color, which is drawn on the left or top edge
-     * depending on the orientation of the JSplitPanel.
-     */
-    protected Color highlight;
-
-
-    /**
-     * The highlight color, which is drawn on the right or bottom edge
-     * depending on the orientation of the JSplitPanel.
-     */
-    protected Color shadow;
-
-
     /**
      * Constructs a new border for drawing the divider of a JSplitPane
      * in the Basic look and feel.  The outer parts of the JSplitPane have
      * their own border class, <code>SplitPaneBorder</code>.
-     *
-     * @param shadow the shadow color.
-     * @param highlight the highlight color.
      */
-    public SplitPaneDividerBorder(Color highlight, Color shadow)
+    public SplitPaneDividerBorder()
     {
-      this.highlight = (highlight != null) ? highlight : Color.white;
-      this.shadow = (shadow != null) ? shadow : Color.black;
+      // Nothing to do here.
     }
 
-
     /**
      * Paints the border around the divider of a <code>JSplitPane</code>.
      *
@@ -1564,6 +1543,8 @@ public class BasicBorders
     public void paintBorder(Component c, Graphics  g,
                             int x, int y, int width, int height)
     {
+      Color highlight = UIManager.getColor("SplitPane.highlight");
+      Color shadow = UIManager.getColor("SplitPane.shadow");
       Color oldColor, dcol;
       int x2, y2;
       JSplitPane sp;
@@ -1624,17 +1605,15 @@ public class BasicBorders
       return new Insets(1, 1, 1, 1);
     }
 
-
     /**
      * Determines whether this border fills every pixel in its area
      * when painting.
      *
-     * @return <code>true</code> if both highlight and shadow
-     *         color are fully opaque.
+     * @return <code>true</code>
      */
     public boolean isBorderOpaque()
     {
-      return (highlight.getAlpha() == 255) && (shadow.getAlpha() == 255);
+      return true;
     }
 
     
@@ -1785,4 +1764,5 @@ public class BasicBorders
       return insets;
     }
   }
+
 }
-- 
cgit v1.2.1