diff options
Diffstat (limited to 'jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout')
22 files changed, 98 insertions, 108 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java index 55faec578..7cb5efdf4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java @@ -220,9 +220,8 @@ public class BlockFlowContext implements FlowContext { _currentLine.getFragments().size() - 1); if (box != null) { return box._marginInsets.right; - } else { - return 0; } + return 0; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java index 8647f293c..f50ee6093 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java @@ -236,6 +236,7 @@ public class BlockFlowLayout extends FlowContainerLayout { * @see org.eclipse.jst.pagedesigner.css2.layout.FlowFigureLayout#dispose() */ public void dispose() { + // TODO: anything to dispose? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java index 6460f5ffd..8e6fa4c2b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java @@ -77,10 +77,9 @@ public class CSSBlockFlowLayout extends CSSLayout implements ICSSPainter2 { ICSSStyle style = getCSSStyle(); if (style == null) { return false; - } else { - return "block".equalsIgnoreCase(style.getDisplay()) - || "list-item".equalsIgnoreCase(style.getDisplay()); } + return "block".equalsIgnoreCase(style.getDisplay()) + || "list-item".equalsIgnoreCase(style.getDisplay()); } // --------------------------------------------------------------------------------------------------- diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java index 60580d2bb..1a258153f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java @@ -137,9 +137,8 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { .getDisplay(), old); if (layout != null) { return layout; - } else { - return new CSSInlineFlowLayout(this); } + return new CSSInlineFlowLayout(this); } /* @@ -186,15 +185,14 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { if (list == null || list.size() == 0) { // should not happen. but still handle it. return new Rectangle[] { getBounds() }; - } else { - Rectangle[] ret = new Rectangle[list.size()]; - for (int i = 0, size = list.size(); i < size; i++) { - FlowBox box = (FlowBox) list.get(i); - ret[i] = new Rectangle(box._x, box._y, box.getWidth(), box - .getHeight()); - } - return ret; } + Rectangle[] ret = new Rectangle[list.size()]; + for (int i = 0, size = list.size(); i < size; i++) { + FlowBox box = (FlowBox) list.get(i); + ret[i] = new Rectangle(box._x, box._y, box.getWidth(), box + .getHeight()); + } + return ret; } /* @@ -247,9 +245,8 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { CSSLayout layout = (CSSLayout) getLayoutManager(); if (layout == null) { return false; - } else { - return layout.useLocalCoordinates(); } + return layout.useLocalCoordinates(); } /* @@ -471,8 +468,8 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { ICSSStyle style = this.getCSSStyle(); if (style != null) { - CSSBorder border = new CSSBorder(this.getCSSStyle()); - border.paint(this, graphics, NO_INSETS); + CSSBorder border1 = new CSSBorder(this.getCSSStyle()); + border1.paint(this, graphics, NO_INSETS); // draw a border for those special elements like <h:form>, etc. ITagEditInfo editInfo = (ITagEditInfo) style diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java index c38052946..99081a798 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java @@ -188,9 +188,8 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext public FlowContext getFlowContext() { if (_absoluteContext != null) { return _absoluteContext; - } else { - return getOriginalFlowContext(); } + return getOriginalFlowContext(); } public FlowContext getParentFigureContext() { @@ -272,7 +271,7 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext } // xOffset is relative to the first box of the containing figure - List fragments = ((ICSSFigure) containingPositionedFigure) + List fragments = containingPositionedFigure .getFragmentsForRead(); if (fragments.size() > 0) { FlowBox box = (FlowBox) fragments.get(0); @@ -360,9 +359,8 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext _currentLine.getFragments().size() - 1); if (box != null) { return box._marginInsets.right; - } else { - return 0; } + return 0; } public void setCalculatingMaxWidth(boolean c) { @@ -425,6 +423,7 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext * @param invalidate */ public void setBoundsCalled(Rectangle rect, boolean invalidate) { + // TODO: dead? } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java index a5a2871d1..9994cbbe5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java @@ -181,6 +181,7 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { * @param relative * @return */ + // TODO: refactoring? public int getNewInsertionOffset(Point relative) { TextFragmentBox closestBox = null; // if there is one which are at the same line with relative, calculate @@ -193,46 +194,45 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { - box._x, TextLayoutSupport .getAverageCharWidth(box)); return box._offset + index; - } else { - if (closestBox == null) { - closestBox = box; - } else { - // box is above point - TextFragmentBox tempBox = box; - int offset1 = Math - .abs(CaretPositionResolver.getYDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - tempBox = closestBox; - int offset2 = Math - .abs(CaretPositionResolver.getYDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - if (offset1 < offset2) { - closestBox = box; - } - } - // at the same line - if (box.containsPoint(box._x, relative.y)) { - TextFragmentBox tempBox = box; - int offset1 = Math - .abs(CaretPositionResolver.getXDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - tempBox = closestBox; - int offset2 = Math - .abs(CaretPositionResolver.getXDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - if (offset1 < offset2) { - closestBox = box; - } - } } + if (closestBox == null) { + closestBox = box; + } else { + // box is above point + TextFragmentBox tempBox = box; + int offset1 = Math + .abs(CaretPositionResolver.getYDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + tempBox = closestBox; + int offset2 = Math + .abs(CaretPositionResolver.getYDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + if (offset1 < offset2) { + closestBox = box; + } + } + // at the same line + if (box.containsPoint(box._x, relative.y)) { + TextFragmentBox tempBox = box; + int offset1 = Math + .abs(CaretPositionResolver.getXDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + tempBox = closestBox; + int offset2 = Math + .abs(CaretPositionResolver.getXDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + if (offset1 < offset2) { + closestBox = box; + } + } } if (closestBox.containsPoint(closestBox._x, relative.y) @@ -242,9 +242,8 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { getCSSStyle().getCSSFont().getSwtFont(), offset, TextLayoutSupport.getAverageCharWidth(closestBox)); return closestBox._offset + index; - } else { - return -1; } + return -1; } public int getInsertionOffset(Point relative) { @@ -278,14 +277,13 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { if (box._offset + box._length < offset) { return new Rectangle(box._x + box._width, box._y, 1, box._height); - } else { - String s = box.getTextData().substring(0, - offset - box._offset); - int width = FlowUtilities.getTextExtents(s, - getCSSStyle().getCSSFont().getSwtFont()).width; - return new Rectangle(box._x + width, box._y, 1, - box._height); } + String s = box.getTextData().substring(0, + offset - box._offset); + int width = FlowUtilities.getTextExtents(s, + getCSSStyle().getCSSFont().getSwtFont()).width; + return new Rectangle(box._x + width, box._y, 1, + box._height); } } } else { @@ -295,8 +293,7 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { } } // should only reach here when there is no fragments. - Rectangle bounds = this.getBounds(); - return new Rectangle(bounds.x, bounds.y, 1, bounds.height); + return new Rectangle(getBounds().x, getBounds().y, 1, getBounds().height); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java index b61a37a94..d452e0dc2 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java @@ -172,5 +172,6 @@ public class CSSTextLayout extends FlowFigureLayout { } public void dispose() { + // TODO: anything to dispose? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java index 1c83653d2..ef573ee78 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java @@ -107,6 +107,7 @@ public class CSSWidgetLayout extends CSSBlockFlowLayout implements ICSSPainter { * @see org.eclipse.jst.pagedesigner.css2.layout.FlowFigureLayout#dispose() */ public void dispose() { + // TODO: anything to dispose? } // public int getSuggestedWidth(LineBox line, ICSSStyle style, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java index de2eaa8d9..d67849b11 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java @@ -93,8 +93,7 @@ public class DisplayToLayout { Object position = style.getStyleProperty(ICSSPropertyID.ATTR_POSITION); if (PositionMeta.STATIC.equalsIgnoreCase((String) position)) { return false; - } else { - return true; } + return true; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java index b53cf7f2c..aa17d120a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java @@ -14,8 +14,6 @@ package org.eclipse.jst.pagedesigner.css2.layout; import java.util.List; import org.eclipse.draw2d.Figure; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; /** * A layout for FlowFigures with children. @@ -27,7 +25,7 @@ import org.eclipse.jst.pagedesigner.common.logging.Logger; */ public abstract class FlowContainerLayout extends FlowFigureLayout implements FlowContext { - private static Logger _log = PDPlugin.getLogger(FlowContainerLayout.class); +// private static Logger _log = PDPlugin.getLogger(FlowContainerLayout.class); /** * the current line @@ -134,9 +132,8 @@ public abstract class FlowContainerLayout extends FlowFigureLayout implements _currentLine.getFragments().size() - 1); if (box != null) { return box._marginInsets.right; - } else { - return 0; } + return 0; } public void setCalculatingMaxWidth(boolean c) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java index 7c15e1278..e231a6f76 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java @@ -116,9 +116,10 @@ public abstract class FlowFigure extends Figure { public String toString() { if (_displayString == null) + { return super.toString(); - else - return _displayString + " " + getClass().getName(); + } + return _displayString + " " + getClass().getName(); } String _displayString; // for debug diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java index 24ed25588..4ea41d981 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java @@ -26,10 +26,10 @@ public class MultiLineLabel extends Label { if (isOpaque()) { graphics.fillRectangle(getBounds()); } - Rectangle bounds = getBounds(); - graphics.translate(bounds.x, bounds.y); + Rectangle bounds1 = getBounds(); + graphics.translate(bounds1.x, bounds1.y); drawText(graphics); - graphics.translate(-bounds.x, -bounds.y); + graphics.translate(-bounds1.x, -bounds1.y); } private void drawText(Graphics graphics) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java index 54dedbfaf..33ff6a106 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java @@ -38,12 +38,14 @@ public class PageFlowLayout extends BlockFlowLayout { * @see BlockFlowLayout#endBlock() */ protected void endBlock() { + // do nothing } /** - * TODO: This method is not being called. + * */ public void postValidate() { + // TODO: This method is not being called. } protected void setupLine(LineBox line, int topMargin) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java index 00b181da8..80907513f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java @@ -34,6 +34,7 @@ public class TextFragmentBox extends FlowBox { * Creates a new TextFragmentBox */ public TextFragmentBox() { + // do nothgin } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java index 7143e83d2..5be873bb9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java @@ -23,9 +23,8 @@ public class WidgetBox extends FlowBox { public int getAscent() { if (_ascent < 0) { return super.getAscent(); - } else { - return _ascent; } + return _ascent; } public void setAscent(int ascent) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java index 814c7026a..febcc180e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java @@ -19,7 +19,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jst.pagedesigner.css2.layout.CSSBlockFlowLayout; import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.FlowFigure; -import org.eclipse.jst.pagedesigner.css2.layout.ICSSFigure; /** * @author mengbo @@ -98,7 +97,7 @@ public class CSSTRGroupLayout extends CSSBlockFlowLayout { for (int k = 0; k < rowCount; k++) { height += tableLayout.getRowHeights()[rowIndex + k]; } - ICSSFigure figure = groupinfo.getFigure(); + //ICSSFigure figure = groupinfo.getFigure(); return new Rectangle(tableLayout.getRowX(), y, tableLayout .getRowWidth(), height); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java index d29fdfcf4..9bf3fc6a0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java @@ -19,7 +19,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jst.pagedesigner.css2.layout.CSSBlockFlowLayout; import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.FlowFigure; -import org.eclipse.jst.pagedesigner.css2.layout.ICSSFigure; /** * @author mengbo @@ -128,7 +127,7 @@ public class CSSTRLayout extends CSSBlockFlowLayout { } int height = tableLayout.getRowHeights()[rowIndex]; - ICSSFigure figure = rowinfo.getFigure(); + //ICSSFigure figure = rowinfo.getFigure(); return new Rectangle(tableLayout.getRowX(), y, tableLayout .getRowWidth(), height); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java index 5acdfb1af..4c4a7a3ab 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java @@ -513,15 +513,14 @@ public class CSSTableLayout2 extends CSSBlockFlowLayout implements ICSSPainter { if (spanwidth >= width) { return; - } else { - int delta = width - spanwidth; - int deltaeach = delta / colspan; - for (int i = 0; i < colspan - 1; i++) { - columnWidths[column + i] += deltaeach; - } - columnWidths[column + colspan - 1] += (delta - (colspan - 1) - * deltaeach); } + int delta = width - spanwidth; + int deltaeach = delta / colspan; + for (int i = 0; i < colspan - 1; i++) { + columnWidths[column + i] += deltaeach; + } + columnWidths[column + colspan - 1] += (delta - (colspan - 1) + * deltaeach); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java index 40c734e00..6a6ac4d6a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java @@ -184,9 +184,8 @@ public abstract class CachedTableCellLayout extends CSSBlockFlowLayout { } if (h > _pageSizeCacheValues[0].height) { return new Dimension(_pageSizeCacheValues[0].width, h); - } else { - return _pageSizeCacheValues[0]; } + return _pageSizeCacheValues[0]; } finally { _calculatingSize = false; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java index 8a8b5c18f..985aba4d5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java @@ -56,8 +56,7 @@ public class TableCaptionInfo extends TableItemInfo { if ("bottom".equalsIgnoreCase(_align)) //$NON-NLS-1$ { return _align; - } else { - return "top"; //$NON-NLS-1$ } + return "top"; //$NON-NLS-1$ } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java index cc41b1f92..72172c846 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java @@ -88,10 +88,10 @@ public class TableCellInfo extends TableItemInfo { Dimension d = ((CSSTableCellLayout) layout).getMaxContentWidthSize( figure, _cellWidth, _cellHeight); return d; - } else { - // should not happen - return getMinCWDimension(); } + + // should not happen + return getMinCWDimension(); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java index 4cd3fbdd2..f9a358dac 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java @@ -36,6 +36,7 @@ public class TableInfoContext { * */ public TableInfoContext() { + // do nothing } /** @@ -101,6 +102,7 @@ public class TableInfoContext { * */ public void finishRowGroup() { + // TODO: does nothing; only called in one places } /** |