2011-01-14 Basile Starynkevitch <basile@starynkevitch.net>

        MELT branch merged with trunk rev 168776



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@168777 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 148 insertions, 149 deletions

diff --git a/libjava/classpath/javax/swing/border/AbstractBorder.java b/libjava/classpath/javax/swing/border/AbstractBorder.java
index 16bb238c374..f75bcbbc279 100644
--- a/libjava/classpath/javax/swing/border/AbstractBorder.java
+++ b/libjava/classpath/javax/swing/border/AbstractBorder.java
@@ -1,4 +1,4 @@
-/* AbstractBorder.java -- 
+/* AbstractBorder.java --
    Copyright (C) 2003, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -87,10 +87,10 @@ public abstract class AbstractBorder implements Border, Serializable
   }
 
   /**
-   * Returns the insets required for drawing this border around the specified 
+   * Returns the insets required for drawing this border around the specified
    * component.
    *
-   * @param c  the component that the border applies to (ignored here, 
+   * @param c  the component that the border applies to (ignored here,
    *     subclasses may use it).
    *
    * @return an Insets object whose <code>left</code>, <code>right</code>,
@@ -106,25 +106,25 @@ public abstract class AbstractBorder implements Border, Serializable
   }
 
   /**
-   * Returns the insets required for drawing this border around the specified 
-   * component.  The default implementation provided here sets the 
-   * <code>left</code>, <code>right</code>, <code>top</code> and 
-   * <code>bottom</code> fields of the passed <code>insets</code> parameter to 
+   * Returns the insets required for drawing this border around the specified
+   * component.  The default implementation provided here sets the
+   * <code>left</code>, <code>right</code>, <code>top</code> and
+   * <code>bottom</code> fields of the passed <code>insets</code> parameter to
    * zero.
    *
-   * @param c  the component that the border applies to (ignored here, 
+   * @param c  the component that the border applies to (ignored here,
    *     subclasses may use it).
-   * @param insets  an instance that will be overwritten and returned as the 
-   *     result (<code>null</code> not permitted).  
+   * @param insets  an instance that will be overwritten and returned as the
+   *     result (<code>null</code> not permitted).
    *
-   * @return The border insets (the same object that was passed as the 
+   * @return The border insets (the same object that was passed as the
    *     <code>insets</code> argument).
    *
    * @see #getBorderInsets(Component)
-   * 
+   *
    * @throws NullPointerException if <code>insets</code> is <code>null</code>.
    */
-  public Insets getBorderInsets(Component c, Insets insets) 
+  public Insets getBorderInsets(Component c, Insets insets)
   {
     insets.left = insets.right = insets.top = insets.bottom = 0;
     return insets;
@@ -139,14 +139,14 @@ public abstract class AbstractBorder implements Border, Serializable
    *
    * @return <code>false</code>.
    */
-  public boolean isBorderOpaque() 
+  public boolean isBorderOpaque()
   {
     return false;
   }
 
   /**
-   * Returns a rectangle that covers the specified area minus the insets 
-   * required to draw this border.  Components that wish to determine an area 
+   * Returns a rectangle that covers the specified area minus the insets
+   * required to draw this border.  Components that wish to determine an area
    * into which they can safely draw without intersecting with a border might
    * want to use this helper method.
    *
@@ -155,7 +155,7 @@ public abstract class AbstractBorder implements Border, Serializable
    * @param y the vertical position of the border.
    * @param width the width of the available area for the border.
    * @param height the height of the available area for the border.
-   * 
+   *
    * @return The interior rectangle.
    */
   public Rectangle getInteriorRectangle(Component c, int x, int y, int width,
@@ -163,12 +163,12 @@ public abstract class AbstractBorder implements Border, Serializable
   {
     return getInteriorRectangle(c, this, x, y, width, height);
   }
-  
+
   /**
-   * Returns a rectangle that covers the specified area minus the insets 
+   * Returns a rectangle that covers the specified area minus the insets
    * required to draw the specified border (if the border is <code>null</code>,
-   * zero insets are assumed).  Components that wish to determine an area into 
-   * which they can safely draw without intersecting with a border might want 
+   * zero insets are assumed).  Components that wish to determine an area into
+   * which they can safely draw without intersecting with a border might want
    * to use this helper method.
    *
    * @param c the component in the center of this border.
@@ -177,7 +177,7 @@ public abstract class AbstractBorder implements Border, Serializable
    * @param y the vertical position of the border.
    * @param width the width of the available area for the border.
    * @param height the height of the available area for the border.
-   * 
+   *
    * @return The interior rectangle.
    */
   public static Rectangle getInteriorRectangle(Component c, Border b, int x,
diff --git a/libjava/classpath/javax/swing/border/BevelBorder.java b/libjava/classpath/javax/swing/border/BevelBorder.java
index 5b4761e9ec8..b91961d6689 100644
--- a/libjava/classpath/javax/swing/border/BevelBorder.java
+++ b/libjava/classpath/javax/swing/border/BevelBorder.java
@@ -1,4 +1,4 @@
-/* BevelBorder.java -- 
+/* BevelBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -76,12 +76,12 @@ public class BevelBorder extends AbstractBorder
    * pressed into the screen.
    */
   public static final int LOWERED = 1;
-  
+
 
   /**
    * The type of this BevelBorder, which is either {@link #RAISED}
    * or {@link #LOWERED}.
-   */  
+   */
   protected int bevelType;
 
 
@@ -296,7 +296,7 @@ public class BevelBorder extends AbstractBorder
     return insets;
   }
 
-  
+
   /**
    * Determines the color that will be used for the outer side of
    * highlighted edges when painting the border.  If a highlight color
@@ -306,7 +306,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see #getHighlightInnerColor(java.awt.Component)
    * @see java.awt.Color#brighter()
    */
@@ -329,7 +329,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#brighter()
    */
@@ -352,7 +352,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#darker()
    */
@@ -374,7 +374,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see #getShadowInnerColor(java.awt.Component)
    * @see java.awt.Color#darker()
    */
@@ -392,7 +392,7 @@ public class BevelBorder extends AbstractBorder
    * highlighted edges when painting the border, or <code>null</code>
    * if that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly <code>null</code>).
    */
   public Color getHighlightOuterColor()
@@ -406,7 +406,7 @@ public class BevelBorder extends AbstractBorder
    * highlighted edges when painting the border, or <code>null</code>
    * if that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly <code>null</code>).
    */
   public Color getHighlightInnerColor()
@@ -420,7 +420,7 @@ public class BevelBorder extends AbstractBorder
    * shadowed edges when painting the border, or <code>null</code> if
    * that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly <code>null</code>).
    */
   public Color getShadowInnerColor()
@@ -434,19 +434,19 @@ public class BevelBorder extends AbstractBorder
    * shadowed edges when painting the border, or <code>null</code> if
    * that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly <code>null</code>).
    */
   public Color getShadowOuterColor()
   {
     return shadowOuter;
   }
-  
-  
+
+
   /**
    * Returns the appearance of this border, which is either {@link
    * #RAISED} or {@link #LOWERED}.
-   * 
+   *
    * @return The bevel type ({@link #RAISED} or {@link #LOWERED}).
    */
   public int getBevelType()
@@ -475,7 +475,7 @@ public class BevelBorder extends AbstractBorder
      * because Color.brighten() and Color.darken() always return an
      * opaque color.
      */
-    return 
+    return
       ((highlightOuter == null) || (highlightOuter.getAlpha() == 255))
       && ((highlightInner == null) || (highlightInner.getAlpha() == 255))
       && ((shadowInner == null) || (shadowInner.getAlpha() == 255))
@@ -523,7 +523,7 @@ public class BevelBorder extends AbstractBorder
 
   /**
    * Paints a two-pixel bevel in four colors.
-   * 
+   *
    * <pre>
    * ++++++++++++
    * +..........#    + = color a
@@ -582,4 +582,3 @@ public class BevelBorder extends AbstractBorder
     }
   }
 }
-
diff --git a/libjava/classpath/javax/swing/border/Border.java b/libjava/classpath/javax/swing/border/Border.java
index f4af3fb38bb..da25832ad92 100644
--- a/libjava/classpath/javax/swing/border/Border.java
+++ b/libjava/classpath/javax/swing/border/Border.java
@@ -1,4 +1,4 @@
-/* Border.java -- 
+/* Border.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,7 +79,7 @@ public interface Border
    */
   void paintBorder(Component c, Graphics g, int x, int y, int width,
                    int height);
-  
+
   /**
    * Measures the width of this border.
    *
@@ -90,7 +90,7 @@ public interface Border
    *         width of the border at the respective edge.
    */
   Insets getBorderInsets(Component c);
-  
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
diff --git a/libjava/classpath/javax/swing/border/CompoundBorder.java b/libjava/classpath/javax/swing/border/CompoundBorder.java
index ba2e745aab5..d811150ba70 100644
--- a/libjava/classpath/javax/swing/border/CompoundBorder.java
+++ b/libjava/classpath/javax/swing/border/CompoundBorder.java
@@ -1,4 +1,4 @@
-/* CompoundBorder.java -- 
+/* CompoundBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -115,7 +115,7 @@ public class CompoundBorder extends AbstractBorder
    */
   public boolean isBorderOpaque()
   {
-    // Although the API specification states that this method 
+    // Although the API specification states that this method
     // returns true if both the inside and outside borders are non-null
     // and opaque, and false otherwise, a mauve test shows that if both
     // the inside or outside borders are null, then true is returned.
@@ -137,7 +137,7 @@ public class CompoundBorder extends AbstractBorder
 
   /**
    * Paints the compound border by first painting the outside border,
-   * then painting the inside border tightly nested into the outside. 
+   * then painting the inside border tightly nested into the outside.
    *
    * @param c the component whose border is to be painted.
    * @param g the graphics for painting.
@@ -233,7 +233,7 @@ public class CompoundBorder extends AbstractBorder
    * Returns the outside border, which is painted outside both the
    * bordered Component and the inside border. It is valid for the
    * result to be <code>null</code>.
-   * 
+   *
    * @return The outside border (possibly <code>null</code>).
    */
   public Border getOutsideBorder()
@@ -245,7 +245,7 @@ public class CompoundBorder extends AbstractBorder
    * Returns the inside border, which is painted between the bordered
    * Component and the outside border. It is valid for the result to
    * be <code>null</code>.
-   * 
+   *
    * @return The inside border (possibly <code>null</code>).
    */
   public Border getInsideBorder()
diff --git a/libjava/classpath/javax/swing/border/EmptyBorder.java b/libjava/classpath/javax/swing/border/EmptyBorder.java
index c8e9c604469..da66511632c 100644
--- a/libjava/classpath/javax/swing/border/EmptyBorder.java
+++ b/libjava/classpath/javax/swing/border/EmptyBorder.java
@@ -1,4 +1,4 @@
-/* EmptyBorder.java -- 
+/* EmptyBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -202,8 +202,8 @@ public class EmptyBorder extends AbstractBorder
   {
     return getBorderInsets(null, null);
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting. Since an empty border does not paint any pixels
diff --git a/libjava/classpath/javax/swing/border/EtchedBorder.java b/libjava/classpath/javax/swing/border/EtchedBorder.java
index cd48b18dad3..e9ee9e218d9 100644
--- a/libjava/classpath/javax/swing/border/EtchedBorder.java
+++ b/libjava/classpath/javax/swing/border/EtchedBorder.java
@@ -1,4 +1,4 @@
-/* EtchedBorder.java -- 
+/* EtchedBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,8 +63,8 @@ public class EtchedBorder extends AbstractBorder
    * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
    */
   static final long serialVersionUID = 4001244046866360638L;
-  
-  
+
+
   /**
    * Indicates that the border appears as coming out of the
    * background.
@@ -78,13 +78,13 @@ public class EtchedBorder extends AbstractBorder
    */
   public static final int LOWERED = 1;
 
-  
+
   /**
    * The type of this EtchedBorder, which is either {@link #RAISED}
    * or {@link #LOWERED}.
    */
   protected int etchType;
-  
+
 
   /**
    * The highlight color, or <code>null</code> to indicate that the
@@ -139,8 +139,8 @@ public class EtchedBorder extends AbstractBorder
      * assign a value here.
      */
   }
-  
-  
+
+
   /**
    * Constructs a lowered EtchedBorder, explicitly selecting the
    * colors that will be used for highlight and shadow.
@@ -157,8 +157,8 @@ public class EtchedBorder extends AbstractBorder
   {
     this(LOWERED, highlight, shadow);
   }
-  
-  
+
+
   /**
    * Constructs an EtchedBorder with the specified appearance,
    * explicitly selecting the colors that will be used for
@@ -186,8 +186,8 @@ public class EtchedBorder extends AbstractBorder
     this.highlight = highlight;
     this.shadow = shadow;
   }
-  
-  
+
+
   /**
    * Paints the border for a given component.
    *
@@ -214,8 +214,8 @@ public class EtchedBorder extends AbstractBorder
       break;
     }
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -277,11 +277,11 @@ public class EtchedBorder extends AbstractBorder
       ((highlight == null) || (highlight.getAlpha() == 255))
       && ((shadow == null) || (shadow.getAlpha() == 255));
   }
-  
+
   /**
    * Returns the appearance of this EtchedBorder, which is either
    * {@link #RAISED} or {@link #LOWERED}.
-   * 
+   *
    * @return The type ({@link #RAISED} or {@link #LOWERED}).
    */
   public int getEtchType()
@@ -300,7 +300,7 @@ public class EtchedBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#brighter()
    */
@@ -316,7 +316,7 @@ public class EtchedBorder extends AbstractBorder
    * Returns the color that will be used for highlighted parts when
    * painting the border, or <code>null</code> if that color will be
    * derived from the background of the enclosed Component.
-   * 
+   *
    * @return The highlight color (possibly <code>null</code>).
    */
   public Color getHighlightColor()
@@ -335,7 +335,7 @@ public class EtchedBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The shadow color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#darker()
    */
@@ -346,13 +346,13 @@ public class EtchedBorder extends AbstractBorder
     else
       return c.getBackground().darker();
   }
-  
-  
+
+
   /**
    * Returns the color that will be used for shadowed parts when
    * painting the border, or <code>null</code> if that color will be
    * derived from the background of the enclosed Component.
-   * 
+   *
    * @return The shadow color (possibly <code>null</code>).
    */
   public Color getShadowColor()
diff --git a/libjava/classpath/javax/swing/border/LineBorder.java b/libjava/classpath/javax/swing/border/LineBorder.java
index 31e19fe1f2e..e78bbee3b9b 100644
--- a/libjava/classpath/javax/swing/border/LineBorder.java
+++ b/libjava/classpath/javax/swing/border/LineBorder.java
@@ -1,4 +1,4 @@
-/* LineBorder.java -- 
+/* LineBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -121,12 +121,12 @@ public class LineBorder extends AbstractBorder
   {
     this (color, thickness, /* roundedCorners */ false);
   }
-  
-  
+
+
   /**
    * Constructs a LineBorder given its color, thickness, and whether
    * it has rounded corners.
-   * 
+   *
    * <p><img src="doc-files/LineBorder-1.png" width="500" height="200"
    * alt="[An illustration of two LineBorders]" />
    *
@@ -159,12 +159,12 @@ public class LineBorder extends AbstractBorder
     this.thickness = thickness;
     this.roundedCorners = roundedCorners;
   }
-  
-  
+
+
   /**
    * Returns a black, one pixel thick, plain {@link LineBorder}. The method
    * may always return the same (singleton) {@link LineBorder} instance.
-   * 
+   *
    * @return The border.
    */
   public static Border createBlackLineBorder()
@@ -174,15 +174,15 @@ public class LineBorder extends AbstractBorder
      */
     if (blackLineBorder == null)
       blackLineBorder = new LineBorder(Color.black);
-    
+
     return blackLineBorder;
   }
-  
-  
+
+
   /**
    * Returns a gray, one pixel thick, plain {@link LineBorder}. The method
    * may always return the same (singleton) {@link LineBorder} instance.
-   * 
+   *
    * @return The border.
    */
   public static Border createGrayLineBorder()
@@ -192,11 +192,11 @@ public class LineBorder extends AbstractBorder
      */
     if (grayLineBorder == null)
       grayLineBorder = new LineBorder(Color.gray);
-    
+
     return grayLineBorder;
   }
-  
-  
+
+
   /**
    * Paints the line border around a given Component.
    *
@@ -255,8 +255,8 @@ public class LineBorder extends AbstractBorder
       g.setColor(oldColor);
     }
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -273,8 +273,8 @@ public class LineBorder extends AbstractBorder
   {
     return new Insets(thickness, thickness, thickness, thickness);
   }
-  
-  
+
+
   /**
    * Measures the width of this border, storing the results into a
    * pre-existing Insets object.
@@ -295,30 +295,30 @@ public class LineBorder extends AbstractBorder
     insets.left = insets.right = insets.top = insets.bottom = thickness;
     return insets;
   }
-  
-  
+
+
   /**
    * Returns the color of the line.
-   * 
+   *
    * @return The line color (never <code>null</code>).
    */
   public Color getLineColor()
   {
     return lineColor;
   }
-  
-  
+
+
   /**
    * Returns the thickness of the line in pixels.
-   * 
+   *
    * @return The line thickness (in pixels).
    */
   public int getThickness()
   {
     return thickness;
   }
-  
-  
+
+
   /**
    * Returns whether this LineBorder os drawm with rounded
    * or with plain corners.
@@ -330,8 +330,8 @@ public class LineBorder extends AbstractBorder
   {
     return roundedCorners;
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
diff --git a/libjava/classpath/javax/swing/border/MatteBorder.java b/libjava/classpath/javax/swing/border/MatteBorder.java
index 944cd2866db..c0c2d776053 100644
--- a/libjava/classpath/javax/swing/border/MatteBorder.java
+++ b/libjava/classpath/javax/swing/border/MatteBorder.java
@@ -1,4 +1,4 @@
-/* MatteBorder.java -- 
+/* MatteBorder.java --
    Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -61,8 +61,8 @@ public class MatteBorder extends EmptyBorder
    * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
    */
   static final long serialVersionUID = 4422248989617298224L;
-  
-  
+
+
   /**
    * The color that is used for filling the border, or
    * <code>null</code> if the border is filled with repetitions of a
@@ -71,8 +71,8 @@ public class MatteBorder extends EmptyBorder
    * @see #tileIcon
    */
   protected Color color;
-  
-  
+
+
   /**
    * The icon is used for filling the border with a tile, or
    * <code>null</code> if the border is filled with a solid
@@ -81,8 +81,8 @@ public class MatteBorder extends EmptyBorder
    * @see #color
    */
   protected Icon tileIcon;
-  
-  
+
+
   /**
    * Constructs a MatteBorder given the width on each side
    * and a fill color.
@@ -171,8 +171,8 @@ public class MatteBorder extends EmptyBorder
          borderInsets.bottom, borderInsets.right,
          tileIcon);
   }
-  
-  
+
+
   /**
    * Constructs a MatteBorder given an icon for tiling the
    * border area. The icon width is used for the border insets
@@ -188,8 +188,8 @@ public class MatteBorder extends EmptyBorder
   {
     this(-1, -1, -1, -1, tileIcon);
   }
-  
-  
+
+
   /**
    * Paints the border for a given component.
    *
@@ -215,8 +215,8 @@ public class MatteBorder extends EmptyBorder
               i.right, height - i.bottom,
               width - i.right, i.top);
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -236,8 +236,8 @@ public class MatteBorder extends EmptyBorder
      */
     return this.getBorderInsets(c, null);
   }
-  
-  
+
+
   /**
    * Measures the width of this border, storing the results into a
    * pre-existing Insets object.
@@ -271,8 +271,8 @@ public class MatteBorder extends EmptyBorder
      */
     return super.getBorderInsets(c, insets);
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -290,34 +290,34 @@ public class MatteBorder extends EmptyBorder
      */
     return this.getBorderInsets(null, null);
   }
-  
-  
+
+
   /**
    * Returns the color that is used for filling the border, or
    * <code>null</code> if the border is filled with repetitions of a
    * tile icon.
-   * 
+   *
    * @return The color (possibly <code>null</code>).
    */
   public Color getMatteColor()
   {
     return color;
   }
-  
-  
+
+
   /**
    * Returns the icon is used for tiling the border, or
    * <code>null</code> if the border is filled with a color instead of
    * an icon.
-   * 
+   *
    * @return The icon (possibly <code>null</code>).
    */
   public Icon getTileIcon()
   {
     return tileIcon;
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
@@ -330,7 +330,7 @@ public class MatteBorder extends EmptyBorder
   {
     return (color != null) && (color.getAlpha() == 255);
   }
-  
+
 
   /**
    * Paints a rectangular area of the border. This private helper
@@ -372,7 +372,7 @@ public class MatteBorder extends EmptyBorder
       }
       return;
     }
-    
+
     // If this border has no icon end painting here.
     if (tileIcon == null)
       return;
diff --git a/libjava/classpath/javax/swing/border/SoftBevelBorder.java b/libjava/classpath/javax/swing/border/SoftBevelBorder.java
index 028fd00e021..c0c9ae811dd 100644
--- a/libjava/classpath/javax/swing/border/SoftBevelBorder.java
+++ b/libjava/classpath/javax/swing/border/SoftBevelBorder.java
@@ -1,4 +1,4 @@
-/* SoftBevelBorder.java -- 
+/* SoftBevelBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -242,7 +242,7 @@ public class SoftBevelBorder extends BevelBorder
     return insets;
   }
 
-  
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
@@ -261,7 +261,7 @@ public class SoftBevelBorder extends BevelBorder
 
   /**
    * Paints a soft bevel in four colors.
-   * 
+   *
    * <pre>
    * +++++++++++.
    * ++.........#    + = color a
diff --git a/libjava/classpath/javax/swing/border/TitledBorder.java b/libjava/classpath/javax/swing/border/TitledBorder.java
index 38ccd720f16..4d4f3af7d26 100644
--- a/libjava/classpath/javax/swing/border/TitledBorder.java
+++ b/libjava/classpath/javax/swing/border/TitledBorder.java
@@ -1,4 +1,4 @@
-/* TitledBorder.java -- 
+/* TitledBorder.java --
    Copyright (C) 2003, 2004, 2005, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -241,7 +241,7 @@ public class TitledBorder extends AbstractBorder
    * on MacOS X 10.1.5.
    */
   static final long serialVersionUID = 8012999415147721601L;
-  
+
 
   /**
    * The title, or <code>null</code> to display no title.
@@ -257,7 +257,7 @@ public class TitledBorder extends AbstractBorder
    */
   protected Border border;
 
-  
+
   /**
    * The vertical position of the title text relative to the border,
    * which is one of {@link #ABOVE_TOP}, {@link #TOP}, {@link
@@ -318,7 +318,7 @@ public class TitledBorder extends AbstractBorder
     this(border, /* title */ "", LEADING, TOP,
          /* titleFont */ null, /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border and title text.
@@ -334,7 +334,7 @@ public class TitledBorder extends AbstractBorder
     this(border, title, LEADING, TOP,
          /* titleFont */ null, /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border, title text, horizontal
@@ -350,7 +350,7 @@ public class TitledBorder extends AbstractBorder
    *        text in relation to the border. The value must be one of
    *        {@link #LEFT}, {@link #CENTER}, {@link #RIGHT}, {@link #LEADING},
    *        {@link #TRAILING}, or {@link #DEFAULT_JUSTIFICATION}.
-   
+
    * @param titlePosition the vertical position of the title text
    *        in relation to the border. The value must be one of
    *        {@link #ABOVE_TOP}, {@link #TOP}, {@link #BELOW_TOP},
@@ -366,7 +366,7 @@ public class TitledBorder extends AbstractBorder
     this(border, title, titleJustification, titlePosition,
          /* titleFont */ null, /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border, title text, horizontal
@@ -401,7 +401,7 @@ public class TitledBorder extends AbstractBorder
     this(border, title, titleJustification, titlePosition, titleFont,
          /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border, title text, horizontal
@@ -448,8 +448,8 @@ public class TitledBorder extends AbstractBorder
     this.titleFont = titleFont;
     this.titleColor = titleColor;
   }
-  
-  
+
+
   /**
    * Paints the border and the title text.
    *
@@ -460,7 +460,7 @@ public class TitledBorder extends AbstractBorder
    * @param width the width of the available area for painting the border.
    * @param height the height of the available area for painting the border.
    */
-  public void paintBorder(Component c, Graphics  g, 
+  public void paintBorder(Component c, Graphics  g,
                           int x, int y, int width, int height)
   {
     Rectangle borderRect = new Rectangle(x + EDGE_SPACING, y + EDGE_SPACING,
@@ -666,7 +666,7 @@ public class TitledBorder extends AbstractBorder
                                   borderRect.width,
                                   borderRect.height);
                   }
-	                
+
               }
             else
               {
@@ -683,7 +683,7 @@ public class TitledBorder extends AbstractBorder
                                   borderRect.width,
                                   borderRect.height);
                   }
-	                
+
               }
             g.setClip(saved);
           }
@@ -710,7 +710,7 @@ public class TitledBorder extends AbstractBorder
   {
     return getBorderInsets(c, new Insets(0, 0, 0, 0));
   }
-  
+
 
   /**
    * Measures the width of this border, storing the results into a
@@ -795,8 +795,8 @@ public class TitledBorder extends AbstractBorder
       }
     return insets;
   }
-  
-  
+
+
   /**
    * Returns <code>false</code>, indicating that there are pixels inside
    * the area of this border where the background shines through.
@@ -961,7 +961,7 @@ public class TitledBorder extends AbstractBorder
   public void setTitlePosition(int titlePosition)
   {
     if ((titlePosition < DEFAULT_POSITION) || (titlePosition > BELOW_BOTTOM))
-      throw new IllegalArgumentException(titlePosition 
+      throw new IllegalArgumentException(titlePosition
           + " is not a valid title position.");
 
     // Swing borders are not JavaBeans, thus no need to fire an event.
@@ -983,7 +983,7 @@ public class TitledBorder extends AbstractBorder
   {
     if ((titleJustification < DEFAULT_JUSTIFICATION)
         || (titleJustification > TRAILING))
-      throw new IllegalArgumentException(titleJustification 
+      throw new IllegalArgumentException(titleJustification
           + " is not a valid title justification.");
 
     // Swing borders are not JavaBeans, thus no need to fire an event.
@@ -1027,7 +1027,7 @@ public class TitledBorder extends AbstractBorder
    *
    * @param c the Component for which this TitledBorder constitutes
    *        a border.
-   *        
+   *
    * @return The minimum size.
    */
   public Dimension getMinimumSize(Component c)