jdk-sandbox: comparison jdk/src/share/classes/javax/swing/border/TitledBorder.java

equal deleted inserted replaced

-:d3bfe856b893
+:33ad0303d717
 /*
-* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 package javax.swing.border;
-import sun.swing.SwingUtilities2;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.Rectangle;
-import java.awt.Color;
+import java.awt.geom.Path2D;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.Component;
-import java.awt.Dimension;
 import java.beans.ConstructorProperties;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.UIManager;
+import javax.swing.plaf.basic.BasicHTML;
 /**
 * A class which implements an arbitrary border
 * with the addition of a String title in a
 * specified position and justification.
 */
 public class TitledBorder extends AbstractBorder
 {
 protected String title;
 protected Border border;
-protected int    titlePosition;
+protected int titlePosition;
-protected int    titleJustification;
+protected int titleJustification;
-protected Font   titleFont;
+protected Font titleFont;
-protected Color  titleColor;
+protected Color titleColor;
-private Point textLoc = new Point();
+private final JLabel label;
 /**
 * Use the default vertical orientation for the title text.
 */
 static public final int     DEFAULT_POSITION        = 0;
 /** Position the title above the border's top line. */
-static public final int     ABOVE_TOP       = 1;
+static public final int     ABOVE_TOP               = 1;
 /** Position the title in the middle of the border's top line. */
-static public final int     TOP             = 2;
+static public final int     TOP                     = 2;
 /** Position the title below the border's top line. */
-static public final int     BELOW_TOP       = 3;
+static public final int     BELOW_TOP               = 3;
 /** Position the title above the border's bottom line. */
-static public final int     ABOVE_BOTTOM    = 4;
+static public final int     ABOVE_BOTTOM            = 4;
 /** Position the title in the middle of the border's bottom line. */
-static public final int     BOTTOM          = 5;
+static public final int     BOTTOM                  = 5;
 /** Position the title below the border's bottom line. */
-static public final int     BELOW_BOTTOM    = 6;
+static public final int     BELOW_BOTTOM            = 6;
 /**
 * Use the default justification for the title text.
 */
 static public final int     DEFAULT_JUSTIFICATION   = 0;
 /** Position title text at the left side of the border line. */
-static public final int     LEFT    = 1;
+static public final int     LEFT                    = 1;
 /** Position title text in the center of the border line. */
-static public final int     CENTER  = 2;
+static public final int     CENTER                  = 2;
 /** Position title text at the right side of the border line. */
-static public final int     RIGHT   = 3;
+static public final int     RIGHT                   = 3;
 /** Position title text at the left side of the border line
 *  for left to right orientation, at the right side of the
 *  border line for right to left orientation.
 */
 static public final int     LEADING = 4;
 /**
 * Creates a TitledBorder instance.
 *
 * @param title  the title the border should display
 */
-public TitledBorder(String title)     {
+public TitledBorder(String title) {
 this(null, title, LEADING, DEFAULT_POSITION, null, null);
 }
 /**
 * Creates a TitledBorder instance with the specified border
 * and an empty title.
 *
 * @param border  the border
 */
-public TitledBorder(Border border)       {
+public TitledBorder(Border border) {
 this(border, "", LEADING, DEFAULT_POSITION, null, null);
 }
 /**
 * Creates a TitledBorder instance with the specified border
 * @param title  the title the border should display
 * @param titleJustification the justification for the title
 * @param titlePosition the position for the title
 */
 public TitledBorder(Border border,
 String title,
 int titleJustification,
-int titlePosition)      {
+int titlePosition) {
 this(border, title, titleJustification,
 titlePosition, null, null);
 }
 /**
 * @param titleJustification the justification for the title
 * @param titlePosition the position for the title
 * @param titleFont the font for rendering the title
 */
 public TitledBorder(Border border,
 String title,
 int titleJustification,
 int titlePosition,
 Font titleFont) {
 this(border, title, titleJustification,
 titlePosition, titleFont, null);
 }
 /**
 * @param titleFont the font of the title
 * @param titleColor the color of the title
 */
 @ConstructorProperties({"border", "title", "titleJustification", "titlePosition", "titleFont", "titleColor"})
 public TitledBorder(Border border,
 String title,
 int titleJustification,
 int titlePosition,
 Font titleFont,
-Color titleColor)       {
+Color titleColor) {
 this.title = title;
 this.border = border;
 this.titleFont = titleFont;
 this.titleColor = titleColor;
 setTitleJustification(titleJustification);
 setTitlePosition(titlePosition);
+this.label = new JLabel();
+this.label.setOpaque(false);
+this.label.putClientProperty(BasicHTML.propertyKey, null);
 }
 /**
 * Paints the border for the specified component with the
 * specified position and size.
 * @param y the y position of the painted border
 * @param width the width of the painted border
 * @param height the height of the painted border
 */
 public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+Border border = getBorderUI();
-Border border = getBorder();
+String title = getTitle();
+if ((title != null) && !title.isEmpty()) {
-if (getTitle() == null || getTitle().equals("")) {
+int edge = (border instanceof TitledBorder) ? 0 : EDGE_SPACING;
+JLabel label = getLabel(c);
+Dimension size = label.getPreferredSize();
+Insets insets = (border != null)
+? border.getBorderInsets(c)
+: new Insets(0, 0, 0, 0);
+int borderX = x + edge;
+int borderY = y + edge;
+int borderW = width - edge - edge;
+int borderH = height - edge - edge;
+int labelY = y;
+int labelH = size.height;
+int position = getPosition();
+switch (position) {
+case ABOVE_TOP:
+insets.left = 0;
+insets.right = 0;
+borderY += labelH - edge;
+borderH -= labelH - edge;
+break;
+case TOP:
+insets.top = edge + insets.top/2 - labelH/2;
+if (insets.top < edge) {
+borderY -= insets.top;
+borderH += insets.top;
+}
+else {
+labelY += insets.top;
+}
+break;
+case BELOW_TOP:
+labelY += insets.top + edge;
+break;
+case ABOVE_BOTTOM:
+labelY += height - labelH - insets.bottom - edge;
+break;
+case BOTTOM:
+labelY += height - labelH;
+insets.bottom = edge + (insets.bottom - labelH) / 2;
+if (insets.bottom < edge) {
+borderH += insets.bottom;
+}
+else {
+labelY -= insets.bottom;
+}
+break;
+case BELOW_BOTTOM:
+insets.left = 0;
+insets.right = 0;
+labelY += height - labelH;
+borderH -= labelH - edge;
+break;
+}
+insets.left += edge + TEXT_INSET_H;
+insets.right += edge + TEXT_INSET_H;
+int labelX = x;
+int labelW = width - insets.left - insets.right;
+if (labelW > size.width) {
+labelW = size.width;
+}
+switch (getJustification(c)) {
+case LEFT:
+labelX += insets.left;
+break;
+case RIGHT:
+labelX += width - insets.right - labelW;
+break;
+case CENTER:
+labelX += (width - labelW) / 2;
+break;
+}
 if (border != null) {
-border.paintBorder(c, g, x, y, width, height);
+if ((position != TOP) && (position != BOTTOM)) {
-}
+border.paintBorder(c, g, borderX, borderY, borderW, borderH);
-return;
-}
-Rectangle grooveRect = new Rectangle(x + EDGE_SPACING, y + EDGE_SPACING,
-width - (EDGE_SPACING * 2),
-height - (EDGE_SPACING * 2));
-Font font = g.getFont();
-Color color = g.getColor();
-g.setFont(getFont(c));
-JComponent jc = (c instanceof JComponent) ? (JComponent)c : null;
-FontMetrics fm = SwingUtilities2.getFontMetrics(jc, g);
-int         fontHeight = fm.getHeight();
-int         descent = fm.getDescent();
-int         ascent = fm.getAscent();
-int         diff;
-int         stringWidth = SwingUtilities2.stringWidth(jc, fm,
-getTitle());
-Insets      insets;
-if (border != null) {
-insets = border.getBorderInsets(c);
-} else {
-insets = new Insets(0, 0, 0, 0);
-}
-int titlePos = getTitlePosition();
-switch (titlePos) {
-case ABOVE_TOP:
-diff = ascent + descent + (Math.max(EDGE_SPACING,
-TEXT_SPACING*2) - EDGE_SPACING);
-grooveRect.y += diff;
-grooveRect.height -= diff;
-textLoc.y = grooveRect.y - (descent + TEXT_SPACING);
-break;
-case TOP:
-case DEFAULT_POSITION:
-diff = Math.max(0, ((ascent/2) + TEXT_SPACING) - EDGE_SPACING);
-grooveRect.y += diff;
-grooveRect.height -= diff;
-textLoc.y = (grooveRect.y - descent) +
-(insets.top + ascent + descent)/2;
-break;
-case BELOW_TOP:
-textLoc.y = grooveRect.y + insets.top + ascent + TEXT_SPACING;
-break;
-case ABOVE_BOTTOM:
-textLoc.y = (grooveRect.y + grooveRect.height) -
-(insets.bottom + descent + TEXT_SPACING);
-break;
-case BOTTOM:
-grooveRect.height -= fontHeight/2;
-textLoc.y = ((grooveRect.y + grooveRect.height) - descent) +
-((ascent + descent) - insets.bottom)/2;
-break;
-case BELOW_BOTTOM:
-grooveRect.height -= fontHeight;
-textLoc.y = grooveRect.y + grooveRect.height + ascent +
-TEXT_SPACING;
-break;
-}
-int justification = getTitleJustification();
-if(isLeftToRight(c)) {
-if(justification==LEADING ||
-justification==DEFAULT_JUSTIFICATION) {
-justification = LEFT;
-}
-else if(justification==TRAILING) {
-justification = RIGHT;
-}
-}
-else {
-if(justification==LEADING ||
-justification==DEFAULT_JUSTIFICATION) {
-justification = RIGHT;
-}
-else if(justification==TRAILING) {
-justification = LEFT;
-}
-}
-switch (justification) {
-case LEFT:
-textLoc.x = grooveRect.x + TEXT_INSET_H + insets.left;
-break;
-case RIGHT:
-textLoc.x = (grooveRect.x + grooveRect.width) -
-(stringWidth + TEXT_INSET_H + insets.right);
-break;
-case CENTER:
-textLoc.x = grooveRect.x +
-((grooveRect.width - stringWidth) / 2);
-break;
-}
-// If title is positioned in middle of border AND its fontsize
-// is greater than the border's thickness, we'll need to paint
-// the border in sections to leave space for the component's background
-// to show through the title.
-//
-if (border != null) {
-if (((titlePos == TOP || titlePos == DEFAULT_POSITION) &&
-(grooveRect.y > textLoc.y - ascent)) ||
-(titlePos == BOTTOM &&
-(grooveRect.y + grooveRect.height < textLoc.y + descent))) {
-Rectangle clipRect = new Rectangle();
-// save original clip
-Rectangle saveClip = g.getClipBounds();
-// paint strip left of text
-clipRect.setBounds(saveClip);
-if (computeIntersection(clipRect, x, y, textLoc.x-1-x, height)) {
-g.setClip(clipRect);
-border.paintBorder(c, g, grooveRect.x, grooveRect.y,
-grooveRect.width, grooveRect.height);
 }
+else {
-// paint strip right of text
+Graphics g2 = g.create();
-clipRect.setBounds(saveClip);
+if (g2 instanceof Graphics2D) {
-if (computeIntersection(clipRect, textLoc.x+stringWidth+1, y,
+Graphics2D g2d = (Graphics2D) g2;
-x+width-(textLoc.x+stringWidth+1), height)) {
+Path2D path = new Path2D.Float();
-g.setClip(clipRect);
+path.append(new Rectangle(borderX, borderY, borderW, labelY - borderY), false);
-border.paintBorder(c, g, grooveRect.x, grooveRect.y,
+path.append(new Rectangle(borderX, labelY, labelX - borderX - TEXT_SPACING, labelH), false);
-grooveRect.width, grooveRect.height);
+path.append(new Rectangle(labelX + labelW + TEXT_SPACING, labelY, borderX - labelX + borderW - labelW - TEXT_SPACING, labelH), false);
+path.append(new Rectangle(borderX, labelY + labelH, borderW, borderY - labelY + borderH - labelH), false);
+g2d.clip(path);
+}
+border.paintBorder(c, g2, borderX, borderY, borderW, borderH);
+g2.dispose();
 }
+}
-if (titlePos == TOP || titlePos == DEFAULT_POSITION) {
+g.translate(labelX, labelY);
-// paint strip below text
+label.setSize(labelW, labelH);
-clipRect.setBounds(saveClip);
+label.paint(g);
-if (computeIntersection(clipRect, textLoc.x-1, textLoc.y+descent,
+g.translate(-labelX, -labelY);
-stringWidth+2, y+height-textLoc.y-descent)) {
+}
-g.setClip(clipRect);
+else if (border != null) {
-border.paintBorder(c, g, grooveRect.x, grooveRect.y,
+border.paintBorder(c, g, x, y, width, height);
-grooveRect.width, grooveRect.height);
+}
-}
-} else { // titlePos == BOTTOM
-// paint strip above text
-clipRect.setBounds(saveClip);
-if (computeIntersection(clipRect, textLoc.x-1, y,
-stringWidth+2, textLoc.y - ascent - y)) {
-g.setClip(clipRect);
-border.paintBorder(c, g, grooveRect.x, grooveRect.y,
-grooveRect.width, grooveRect.height);
-}
-}
-// restore clip
-g.setClip(saveClip);
-} else {
-border.paintBorder(c, g, grooveRect.x, grooveRect.y,
-grooveRect.width, grooveRect.height);
-}
-}
-g.setColor(getTitleColor());
-SwingUtilities2.drawString(jc, g, getTitle(), textLoc.x, textLoc.y);
-g.setFont(font);
-g.setColor(color);
 }
 /**
 * Reinitialize the insets parameter with this Border's current Insets.
 * @param c the component for which this border insets value applies
 * @param insets the object to be reinitialized
 */
 public Insets getBorderInsets(Component c, Insets insets) {
-FontMetrics fm;
+Border border = getBorderUI();
-int         descent = 0;
+if (border == null) {
-int         ascent = 16;
+insets.set(0, 0, 0, 0);
-int         height = 16;
+}
+else if (border instanceof AbstractBorder) {
-Border border = getBorder();
+AbstractBorder ab = (AbstractBorder) border;
-if (border != null) {
+insets = ab.getBorderInsets(c, insets);
-if (border instanceof AbstractBorder) {
+}
-((AbstractBorder)border).getBorderInsets(c, insets);
+else {
-} else {
+Insets i = border.getBorderInsets(c);
-// Can't reuse border insets because the Border interface
+insets.set(i.top, i.left, i.bottom, i.right);
-// can't be enhanced.
+}
-Insets i = border.getBorderInsets(c);
+String title = getTitle();
-insets.top = i.top;
+if ((title != null) && !title.isEmpty()) {
-insets.right = i.right;
+int edge = (border instanceof TitledBorder) ? 0 : EDGE_SPACING;
-insets.bottom = i.bottom;
+JLabel label = getLabel(c);
-insets.left = i.left;
+Dimension size = label.getPreferredSize();
-}
-} else {
+switch (getPosition()) {
-insets.left = insets.top = insets.right = insets.bottom = 0;
+case ABOVE_TOP:
-}
+insets.top += size.height - edge;
+break;
-insets.left += EDGE_SPACING + TEXT_SPACING;
+case TOP: {
-insets.right += EDGE_SPACING + TEXT_SPACING;
+if (insets.top < size.height) {
-insets.top += EDGE_SPACING + TEXT_SPACING;
+insets.top = size.height - edge;
-insets.bottom += EDGE_SPACING + TEXT_SPACING;
+}
+break;
-if(c == null || getTitle() == null || getTitle().equals(""))    {
+}
-return insets;
+case BELOW_TOP:
-}
+insets.top += size.height;
+break;
-Font font = getFont(c);
+case ABOVE_BOTTOM:
+insets.bottom += size.height;
-fm = c.getFontMetrics(font);
+break;
+case BOTTOM: {
-if(fm != null) {
+if (insets.bottom < size.height) {
-descent = fm.getDescent();
+insets.bottom = size.height - edge;
-ascent = fm.getAscent();
+}
-height = fm.getHeight();
+break;
 }
+case BELOW_BOTTOM:
-switch (getTitlePosition()) {
+insets.bottom += size.height - edge;
-case ABOVE_TOP:
+break;
-insets.top += ascent + descent
+}
-+ (Math.max(EDGE_SPACING, TEXT_SPACING*2)
+insets.top += edge + TEXT_SPACING;
-- EDGE_SPACING);
+insets.left += edge + TEXT_SPACING;
-break;
+insets.right += edge + TEXT_SPACING;
-case TOP:
+insets.bottom += edge + TEXT_SPACING;
-case DEFAULT_POSITION:
-insets.top += ascent + descent;
-break;
-case BELOW_TOP:
-insets.top += ascent + descent + TEXT_SPACING;
-break;
-case ABOVE_BOTTOM:
-insets.bottom += ascent + descent + TEXT_SPACING;
-break;
-case BOTTOM:
-insets.bottom += ascent + descent;
-break;
-case BELOW_BOTTOM:
-insets.bottom += height;
-break;
 }
 return insets;
 }
 /**
 public String getTitle()        {       return title;   }
 /**
 * Returns the border of the titled border.
 */
-public Border getBorder()       {
+public Border getBorder() {
-Border b = border;
+return border;
-if (b == null)
-b = UIManager.getBorder("TitledBorder.border");
-return b;
 }
 /**
 * Returns the title-position of the titled border.
 */
 public int getTitlePosition() {
-if (titlePosition == DEFAULT_POSITION) {
-Object value = UIManager.get("TitledBorder.position");
-if (value instanceof String) {
-String s = (String)value;
-if ("ABOVE_TOP".equalsIgnoreCase(s)) {
-return ABOVE_TOP;
-} else if ("TOP".equalsIgnoreCase(s)) {
-return TOP;
-} else if ("BELOW_TOP".equalsIgnoreCase(s)) {
-return BELOW_TOP;
-} else if ("ABOVE_BOTTOM".equalsIgnoreCase(s)) {
-return ABOVE_BOTTOM;
-} else if ("BOTTOM".equalsIgnoreCase(s)) {
-return BOTTOM;
-} else if ("BELOW_BOTTOM".equalsIgnoreCase(s)) {
-return BELOW_BOTTOM;
-}
-} else if (value instanceof Integer) {
-int i = (Integer)value;
-if (i >= 0 && i <= 6) {
-return i;
-}
-}
-}
 return titlePosition;
 }
 /**
 * Returns the title-justification of the titled border.
 /**
 * Returns the title-font of the titled border.
 */
 public Font getTitleFont()      {
-Font f = titleFont;
+return titleFont;
-if (f == null)
-f = UIManager.getFont("TitledBorder.font");
-return f;
 }
 /**
 * Returns the title-color of the titled border.
 */
 public Color getTitleColor()    {
-Color c = titleColor;
+return titleColor;
-if (c == null)
-c = UIManager.getColor("TitledBorder.titleColor");
-return c;
 }
 // REMIND(aim): remove all or some of these set methods?
 * Sets the title-position of the titled border.
 * @param titlePosition the position for the border
 */
 public void setTitlePosition(int titlePosition) {
 switch (titlePosition) {
 case ABOVE_TOP:
 case TOP:
 case BELOW_TOP:
 case ABOVE_BOTTOM:
 case BOTTOM:
 case BELOW_BOTTOM:
 case DEFAULT_POSITION:
 this.titlePosition = titlePosition;
 break;
 default:
 throw new IllegalArgumentException(titlePosition +
 " is not a valid title position.");
 }
 }
 /**
 * Sets the title-justification of the titled border.
 /**
 * Sets the title-color of the titled border.
 * @param titleColor the color for the border title
 */
 public void setTitleColor(Color titleColor) {
 this.titleColor = titleColor;
 }
 /**
 * Returns the minimum dimensions this border requires
 * in order to fully display the border and title.
 */
 public Dimension getMinimumSize(Component c) {
 Insets insets = getBorderInsets(c);
 Dimension minSize = new Dimension(insets.right+insets.left,
 insets.top+insets.bottom);
-Font font = getFont(c);
+String title = getTitle();
-FontMetrics fm = c.getFontMetrics(font);
+if ((title != null) && !title.isEmpty()) {
-JComponent jc = (c instanceof JComponent) ? (JComponent)c : null;
+JLabel label = getLabel(c);
-switch (getTitlePosition()) {
+Dimension size = label.getPreferredSize();
-case ABOVE_TOP:
-case BELOW_BOTTOM:
+int position = getPosition();
-minSize.width = Math.max(SwingUtilities2.stringWidth(jc, fm,
+if ((position != ABOVE_TOP) && (position != BELOW_BOTTOM)) {
-getTitle()), minSize.width);
+minSize.width += size.width;
-break;
+}
-case BELOW_TOP:
+else if (minSize.width < size.width) {
-case ABOVE_BOTTOM:
+minSize.width += size.width;
-case TOP:
+}
-case BOTTOM:
-case DEFAULT_POSITION:
-default:
-minSize.width += SwingUtilities2.stringWidth(jc, fm, getTitle());
 }
 return minSize;
 }
 /**
 throw new IllegalArgumentException("Width must be >= 0");
 }
 if (height < 0) {
 throw new IllegalArgumentException("Height must be >= 0");
 }
+Border border = getBorderUI();
 String title = getTitle();
-if (title != null && !"".equals(title)) {
+if ((title != null) && !title.isEmpty()) {
-Font font = getFont(c);
+int edge = (border instanceof TitledBorder) ? 0 : EDGE_SPACING;
-Border border2 = getBorder();
+JLabel label = getLabel(c);
-Insets borderInsets;
+Dimension size = label.getPreferredSize();
-if (border2 != null) {
+Insets insets = (border != null)
-borderInsets = border2.getBorderInsets(c);
+? border.getBorderInsets(c)
-}
+: new Insets(0, 0, 0, 0);
-else {
-borderInsets = new Insets(0, 0, 0, 0);
+int baseline = label.getBaseline(size.width, size.height);
-}
+switch (getPosition()) {
-FontMetrics fm = c.getFontMetrics(font);
+case ABOVE_TOP:
-int fontHeight = fm.getHeight();
+return baseline;
-int descent = fm.getDescent();
+case TOP:
-int ascent = fm.getAscent();
+insets.top = edge + (insets.top - size.height) / 2;
-int y = EDGE_SPACING;
+return (insets.top < edge)
-int h = height - EDGE_SPACING * 2;
+? baseline
-int diff;
+: baseline + insets.top;
-switch (getTitlePosition()) {
+case BELOW_TOP:
-case ABOVE_TOP:
+return baseline + insets.top + edge;
-diff = ascent + descent + (Math.max(EDGE_SPACING,
+case ABOVE_BOTTOM:
-TEXT_SPACING * 2) -
+return baseline + height - size.height - insets.bottom - edge;
-EDGE_SPACING);
+case BOTTOM:
-return y + diff - (descent + TEXT_SPACING);
+insets.bottom = edge + (insets.bottom - size.height) / 2;
-case TOP:
+return (insets.bottom < edge)
-case DEFAULT_POSITION:
+? baseline + height - size.height
-diff = Math.max(0, ((ascent/2) + TEXT_SPACING) -
+: baseline + height - size.height + insets.bottom;
-EDGE_SPACING);
+case BELOW_BOTTOM:
-return (y + diff - descent) +
+return baseline + height - size.height;
-(borderInsets.top + ascent + descent)/2;
-case BELOW_TOP:
-return y + borderInsets.top + ascent + TEXT_SPACING;
-case ABOVE_BOTTOM:
-return (y + h) - (borderInsets.bottom + descent +
-TEXT_SPACING);
-case BOTTOM:
-h -= fontHeight / 2;
-return ((y + h) - descent) +
-((ascent + descent) - borderInsets.bottom)/2;
-case BELOW_BOTTOM:
-h -= fontHeight;
-return y + h + ascent + TEXT_SPACING;
 }
 }
 return -1;
 }
 * @since 1.6
 */
 public Component.BaselineResizeBehavior getBaselineResizeBehavior(
 Component c) {
 super.getBaselineResizeBehavior(c);
-switch(getTitlePosition()) {
+switch (getPosition()) {
 case TitledBorder.ABOVE_TOP:
 case TitledBorder.TOP:
-case TitledBorder.DEFAULT_POSITION:
+case TitledBorder.BELOW_TOP:
-case TitledBorder.BELOW_TOP:
+return Component.BaselineResizeBehavior.CONSTANT_ASCENT;
-return Component.BaselineResizeBehavior.CONSTANT_ASCENT;
+case TitledBorder.ABOVE_BOTTOM:
-case TitledBorder.ABOVE_BOTTOM:
+case TitledBorder.BOTTOM:
-case TitledBorder.BOTTOM:
+case TitledBorder.BELOW_BOTTOM:
-case TitledBorder.BELOW_BOTTOM:
+return JComponent.BaselineResizeBehavior.CONSTANT_DESCENT;
-return JComponent.BaselineResizeBehavior.CONSTANT_DESCENT;
 }
 return Component.BaselineResizeBehavior.OTHER;
 }
+private Border getBorderUI() {
+Border border = getBorder();
+return border != null
+? border
+: UIManager.getBorder("TitledBorder.border");
+}
+private int getPosition() {
+int position = getTitlePosition();
+if (position != DEFAULT_POSITION) {
+return position;
+}
+Object value = UIManager.get("TitledBorder.position");
+if (value instanceof Integer) {
+int i = (Integer) value;
+if ((0 < i) && (i <= 6)) {
+return i;
+}
+}
+else if (value instanceof String) {
+String s = (String) value;
+if (s.equalsIgnoreCase("ABOVE_TOP")) {
+return ABOVE_TOP;
+}
+if (s.equalsIgnoreCase("TOP")) {
+return TOP;
+}
+if (s.equalsIgnoreCase("BELOW_TOP")) {
+return BELOW_TOP;
+}
+if (s.equalsIgnoreCase("ABOVE_BOTTOM")) {
+return ABOVE_BOTTOM;
+}
+if (s.equalsIgnoreCase("BOTTOM")) {
+return BOTTOM;
+}
+if (s.equalsIgnoreCase("BELOW_BOTTOM")) {
+return BELOW_BOTTOM;
+}
+}
+return TOP;
+}
+private int getJustification(Component c) {
+int justification = getTitleJustification();
+if ((justification == LEADING) || (justification == DEFAULT_JUSTIFICATION)) {
+return c.getComponentOrientation().isLeftToRight() ? LEFT : RIGHT;
+}
+if (justification == TRAILING) {
+return c.getComponentOrientation().isLeftToRight() ? RIGHT : LEFT;
+}
+return justification;
+}
 protected Font getFont(Component c) {
-Font font;
+Font font = getTitleFont();
-if ((font = getTitleFont()) != null) {
+if (font != null) {
 return font;
-} else if (c != null && (font = c.getFont()) != null) {
+}
+font = UIManager.getFont("TitledBorder.font");
+if (font != null) {
 return font;
 }
+if (c != null) {
+font = c.getFont();
+if (font != null) {
+return font;
+}
+}
 return new Font(Font.DIALOG, Font.PLAIN, 12);
 }
-private static boolean computeIntersection(Rectangle dest,
+private Color getColor(Component c) {
-int rx, int ry, int rw, int rh) {
+Color color = getTitleColor();
-int x1 = Math.max(rx, dest.x);
+if (color != null) {
-int x2 = Math.min(rx + rw, dest.x + dest.width);
+return color;
-int y1 = Math.max(ry, dest.y);
+}
-int y2 = Math.min(ry + rh, dest.y + dest.height);
+color = UIManager.getColor("TitledBorder.titleColor");
-dest.x = x1;
+if (color != null) {
-dest.y = y1;
+return color;
-dest.width = x2 - x1;
+}
-dest.height = y2 - y1;
+return (c != null)
+? c.getForeground()
-if (dest.width <= 0 || dest.height <= 0) {
+: null;
-return false;
+}
-}
-return true;
+private JLabel getLabel(Component c) {
+this.label.setText(getTitle());
+this.label.setFont(getFont(c));
+this.label.setForeground(getColor(c));
+this.label.setComponentOrientation(c.getComponentOrientation());
+this.label.setEnabled(c.isEnabled());
+return this.label;
 }
 }

changeset 5953	33ad0303d717
parent 5506	202f599c92aa
child 7263	3da4189127ac