diff options
| author | Roman Kennke <roman@kennke.org> | 2005-08-15 09:13:54 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2005-08-15 09:13:54 +0000 |
| commit | 30b95045cd03ba8d0a1740a3be549a943f05cf38 (patch) | |
| tree | c4cf02ed5a454f3990a1de767dbdf673a7b63e4d /java/awt/FlowLayout.java | |
| parent | 9a2755145a320911a9c170f24638033bef42a208 (diff) | |
| download | classpath-30b95045cd03ba8d0a1740a3be549a943f05cf38.tar.gz | |
2005-08-15 Roman Kennke <roman@kennke.org>
* java/awt/FlowLayout.java
(setAlignment): Removed check for illegal values. These values
are treated as LEFT alignment instead.
(layoutContainer): Treat unknown align values as LEFT in default
clause of if-else statement.
Diffstat (limited to 'java/awt/FlowLayout.java')
| -rw-r--r-- | java/awt/FlowLayout.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/awt/FlowLayout.java b/java/awt/FlowLayout.java index 4674990ac..84b46139e 100644 --- a/java/awt/FlowLayout.java +++ b/java/awt/FlowLayout.java @@ -205,12 +205,12 @@ public class FlowLayout implements LayoutManager, Serializable else if (align == TRAILING) myalign = left_to_right ? RIGHT : LEFT; - if (myalign == LEFT) - x = ins.left + hgap; + if (myalign == RIGHT) + x = ins.left + (d.width - new_w) + hgap; else if (myalign == CENTER) x = ins.left + (d.width - new_w) / 2 + hgap; - else - x = ins.left + (d.width - new_w) + hgap; + else // LEFT and all other values of align. + x = ins.left + hgap; for (int k = i; k < j; ++k) { @@ -269,9 +269,6 @@ public class FlowLayout implements LayoutManager, Serializable */ public void setAlignment (int align) { - if (align != LEFT && align != RIGHT && align != CENTER - && align != LEADING && align != TRAILING) - throw new IllegalArgumentException ("invalid alignment: " + align); this.align = align; } |