diff options
Diffstat (limited to 'libjava/classpath/javax/swing')
| -rw-r--r-- | libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java | 22 | ||||
| -rw-r--r-- | libjava/classpath/javax/swing/text/html/parser/AttributeList.java | 2 |
2 files changed, 19 insertions, 5 deletions
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java index df4c3aebdfd..12bbe013c5e 100644 --- a/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java +++ b/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java @@ -600,8 +600,13 @@ public class BasicProgressBarUI extends ProgressBarUI int y, int width, int height) { Rectangle tr = new Rectangle(); - Rectangle vr = new Rectangle(x, y, width, height); + Rectangle vr = new Rectangle(); Rectangle ir = new Rectangle(); + + if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) + vr.setBounds(x, y, width, height); + else + vr.setBounds(y, x, height, width); Font f = g.getFont(); FontMetrics fm = g.getFontMetrics(f); @@ -611,7 +616,11 @@ public class BasicProgressBarUI extends ProgressBarUI SwingConstants.CENTER, SwingConstants.CENTER, SwingConstants.CENTER, vr, ir, tr, 0); - return new Point(tr.x, tr.y); + + if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) + return new Point(tr.x, tr.y); + else + return new Point(tr.y, tr.x); } /** @@ -741,14 +750,19 @@ public class BasicProgressBarUI extends ProgressBarUI { AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2); g.setFont(progressBar.getFont().deriveFont(rotate)); + placement.x = width - placement.x - fm.getAscent(); + } + else + { + placement.y += fm.getAscent(); } g.setColor(getSelectionForeground()); g.setClip(0, 0, full + b.left, height); - g.drawString(str, placement.x, placement.y + fm.getAscent()); + g.drawString(str, placement.x, placement.y); g.setColor(getSelectionBackground()); g.setClip(full + b.left, 0, width - full, height); - g.drawString(str, placement.x, placement.y + fm.getAscent()); + g.drawString(str, placement.x, placement.y); g.setClip(savedClip); g.setColor(savedColor); } diff --git a/libjava/classpath/javax/swing/text/html/parser/AttributeList.java b/libjava/classpath/javax/swing/text/html/parser/AttributeList.java index d48266d4730..a943f056de1 100644 --- a/libjava/classpath/javax/swing/text/html/parser/AttributeList.java +++ b/libjava/classpath/javax/swing/text/html/parser/AttributeList.java @@ -253,7 +253,7 @@ public final class AttributeList */ public Enumeration<?> getValues() { - return values.elements(); + return (values != null) ? values.elements() : null; } /** |
