diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-06-17 07:07:55 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-06-17 07:07:55 +0000 |
| commit | a6a0751edf4259b352dd8cf8771b6256aaf7e589 (patch) | |
| tree | 64b75c4e93abdda602c190c4e6e5f66f0674d974 | |
| parent | b3c6ce551291efba5b723155ac210f8881d7d723 (diff) | |
| download | vaadin-framework-a6a0751edf4259b352dd8cf8771b6256aaf7e589.tar.gz vaadin-framework-a6a0751edf4259b352dd8cf8771b6256aaf7e589.zip | |
avoiding ArrayOutOfBounds exception in some situations
svn changeset:4903/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java index 4e6a55541c..ac3a888831 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java @@ -137,32 +137,9 @@ public class IGridLayout extends SimplePanel implements Paintable, Container, } else { w = 1; } - AlignmentInfo alignmentInfo = new AlignmentInfo( - alignments[alignmentIndex++]); - - VerticalAlignmentConstant va; - if (alignmentInfo.isBottom()) { - va = HasVerticalAlignment.ALIGN_BOTTOM; - } else if (alignmentInfo.isTop()) { - va = HasVerticalAlignment.ALIGN_TOP; - } else { - va = HasVerticalAlignment.ALIGN_MIDDLE; - } - - HorizontalAlignmentConstant ha; - - if (alignmentInfo.isLeft()) { - ha = HasHorizontalAlignment.ALIGN_LEFT; - } else if (alignmentInfo.isHorizontalCenter()) { - ha = HasHorizontalAlignment.ALIGN_CENTER; - } else { - ha = HasHorizontalAlignment.ALIGN_RIGHT; - } FlexCellFormatter formatter = (FlexCellFormatter) getCellFormatter(); - formatter.setAlignment(row, column, ha, va); - // set col span formatter.setColSpan(row, column, w); @@ -187,6 +164,31 @@ public class IGridLayout extends SimplePanel implements Paintable, Container, final UIDL u = c.getChildUIDL(0); if (u != null) { + + AlignmentInfo alignmentInfo = new AlignmentInfo( + alignments[alignmentIndex++]); + + VerticalAlignmentConstant va; + if (alignmentInfo.isBottom()) { + va = HasVerticalAlignment.ALIGN_BOTTOM; + } else if (alignmentInfo.isTop()) { + va = HasVerticalAlignment.ALIGN_TOP; + } else { + va = HasVerticalAlignment.ALIGN_MIDDLE; + } + + HorizontalAlignmentConstant ha; + + if (alignmentInfo.isLeft()) { + ha = HasHorizontalAlignment.ALIGN_LEFT; + } else if (alignmentInfo.isHorizontalCenter()) { + ha = HasHorizontalAlignment.ALIGN_CENTER; + } else { + ha = HasHorizontalAlignment.ALIGN_RIGHT; + } + + formatter.setAlignment(row, column, ha, va); + final Paintable child = client.getPaintable(u); CaptionWrapper wr; if (widgetToCaptionWrapper.containsKey(child)) { |