[cp-patches] FYI: Implemented MetalCheckBoxIcon

[Roman Kennke]

Hi,

I implemented the javax.swing.plaf.metal.MetalCheckBoxIcon and fixed the 
name of MetalBorders.ButtonBorder.

2005-07-15  Roman Kennke  <address@hidden>

       * javax/swing/plaf/metal/MetalCheckBoxIcon.java:
       New class. An icon implementation for use in JCheckBoxes.
       * javax/swing/plaf/metal/MetalBorders.java
       Renamed MetalButtonBorder to ButtonBorder.

/Roman

Index: javax/swing/plaf/metal/MetalCheckBoxIcon.java
===================================================================
RCS file: javax/swing/plaf/metal/MetalCheckBoxIcon.java
diff -N javax/swing/plaf/metal/MetalCheckBoxIcon.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/metal/MetalCheckBoxIcon.java       15 Jul 2005 14:53:12 
-0000
@@ -0,0 +1,136 @@
+/* MetalCheckBoxIcon.java -- An icon for JCheckBoxes in the Metal L&F
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.swing.plaf.metal;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+
+import java.io.Serializable;
+
+import javax.swing.Icon;
+import javax.swing.JCheckBox;
+import javax.swing.plaf.UIResource;
+
+/**
+ * An address@hidden Icon} implementation for address@hidden JCheckBox}es in 
the
+ * Metal Look &amp; Feel.
+ *
+ * @author Roman Kennke (address@hidden)
+ */
+public class MetalCheckBoxIcon
+  implements Icon, UIResource, Serializable
+{
+
+  /** Used to paint the border of the icon. */
+  MetalBorders.ButtonBorder border;
+
+  /**
+   * Creates a new MetalCheckBoxIcon instance.
+   */
+  public MetalCheckBoxIcon()
+  {
+    border = new MetalBorders.ButtonBorder();
+  }
+
+  /**
+   * Draws the check in the CheckBox.
+   *
+   * @param c the component to draw on
+   * @param g the Graphics context to draw with
+   * @param x the X position
+   * @param y the Y position
+   */
+  protected void drawCheck(Component c, Graphics g, int x, int y)
+  {
+    g.setColor(Color.BLACK);
+    g.drawLine(3, 5, 3, 9);
+    g.drawLine(4, 5, 4, 9);
+    g.drawLine(5, 7, 9, 3);
+    g.drawLine(5, 8, 9, 4);
+  }
+
+  /**
+   * Returns the size (both X and Y) of the checkbox icon.
+   *
+   * @return the size of the checkbox icon
+   */
+  protected int getControlSize()
+  {
+    return 13;
+  }
+
+  /**
+   * Returns the width of the icon in pixels.
+   *
+   * @return the width of the icon in pixels
+   */
+  public int getIconWidth()
+  {
+    return getControlSize();
+  }
+
+  /**
+   * Returns the height of the icon in pixels.
+   *
+   * @return the height of the icon in pixels
+   */
+  public int getIconHeight()
+  {
+    return getControlSize();
+  }
+
+  /**
+   * Paints the icon. This first paints the border of the CheckBox and
+   * if the CheckBox is selected it calls address@hidden #drawCheck} to draw
+   * the check.
+   *
+   * @param c the Component to draw on (gets casted to JCheckBox)
+   * @param g the Graphics context to draw with
+   * @param x the X position
+   * @param x the Y position
+   */
+  public void paintIcon(Component c, Graphics g, int x, int y)
+  {
+    border.paintBorder(c, g, x, y, getIconWidth(), getIconHeight());
+    JCheckBox cb = (JCheckBox) c;
+    if (cb.isSelected())
+      drawCheck(c, g, x, y);
+  }
+}
Index: javax/swing/plaf/metal/MetalBorders.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalBorders.java,v
retrieving revision 1.6
diff -u -r1.6 MetalBorders.java
--- javax/swing/plaf/metal/MetalBorders.java    2 Jul 2005 20:32:50 -0000       
1.6
+++ javax/swing/plaf/metal/MetalBorders.java    15 Jul 2005 14:53:12 -0000
@@ -78,7 +78,7 @@
   /**
    * The border that is drawn around Swing buttons.
    */
-  public static class MetalButtonBorder
+  public static class ButtonBorder
     extends AbstractBorder
     implements UIResource
   {
@@ -88,7 +88,7 @@
     /**
      * Creates a new instance of ButtonBorder.
      */
-    public MetalButtonBorder()
+    public ButtonBorder()
     {
     }
 
@@ -404,7 +404,7 @@
   {
     if (buttonBorder == null)
       {
-        Border outer = new MetalButtonBorder();
+        Border outer = new ButtonBorder();
         Border inner = getMarginBorder();
         buttonBorder = new BorderUIResource.CompoundBorderUIResource
             (outer, inner);
@@ -421,7 +421,7 @@
   {
     if (toolbarButtonBorder == null)
       {
-        Border outer = new MetalButtonBorder();
+        Border outer = new ButtonBorder();
         Border inner = new RolloverMarginBorder();
         toolbarButtonBorder = new BorderUIResource.CompoundBorderUIResource
           (outer, inner);