You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/01/07 10:39:55 UTC
svn commit: r1650021 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/co...
Author: lofwyr
Date: Wed Jan 7 09:39:54 2015
New Revision: 1650021
URL: http://svn.apache.org/r1650021
Log:
TOBAGO-1434: Move Layout-Manager-Logic from Server to Client
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Interval.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/IntervalList.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/IntervalListUnitTest.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBootstrapLayout.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java Wed Jan 7 09:39:54 2015
@@ -72,6 +72,8 @@ public final class Attributes {
public static final String FREQUENCY = "frequency";
public static final String FOCUS = "focus";
public static final String FOCUS_ID = "focusId";
+ /** @deprecated since Tobago 3.0.0 */
+ @Deprecated
public static final String FORCE_VERTICAL_SCROLLBAR = "forceVerticalScrollbar";
public static final String FORMAT_PATTERN = "formatPattern";
public static final String FOR = "for";
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Wed Jan 7 09:39:54 2015
@@ -57,13 +57,6 @@ public class ClientProperties implements
private Theme theme;
private UserAgent userAgent = UserAgent.DEFAULT;
- /** @deprecated since Tobago 3.0 */
- @Deprecated
- private Measure verticalScrollbarWeight;
- /** @deprecated since Tobago 3.0 */
- @Deprecated
- private Measure horizontalScrollbarWeight;
-
private Measure pageWidth;
private Measure pageHeight;
@@ -156,25 +149,27 @@ public class ClientProperties implements
/** @deprecated since Tobago 3.0 */
@Deprecated
public Measure getVerticalScrollbarWeight() {
- return verticalScrollbarWeight;
+ Deprecation.LOG.error("verticalScrollbarWeight");
+ return Measure.ZERO;
}
/** @deprecated since Tobago 3.0 */
@Deprecated
public void setVerticalScrollbarWeight(final Measure verticalScrollbarWeight) {
- this.verticalScrollbarWeight = verticalScrollbarWeight;
+ Deprecation.LOG.error("verticalScrollbarWeight");
}
/** @deprecated since Tobago 3.0 */
@Deprecated
public Measure getHorizontalScrollbarWeight() {
- return horizontalScrollbarWeight;
+ Deprecation.LOG.error("horizontalScrollbarWeight");
+ return Measure.ZERO;
}
/** @deprecated since Tobago 3.0 */
@Deprecated
public void setHorizontalScrollbarWeight(final Measure horizontalScrollbarWeight) {
- this.horizontalScrollbarWeight = horizontalScrollbarWeight;
+ Deprecation.LOG.error("horizontalScrollbarWeight");
}
public Measure getPageWidth() {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBootstrapLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBootstrapLayout.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBootstrapLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBootstrapLayout.java Wed Jan 7 09:39:54 2015
@@ -23,7 +23,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
-import org.apache.myfaces.tobago.layout.Orientation;
/**
* TODO
@@ -40,6 +39,7 @@ public abstract class AbstractUIBootstra
}
}
+/*
public void fixRelativeInsideAuto(final Orientation orientation, final boolean auto) {
}
@@ -51,4 +51,5 @@ public abstract class AbstractUIBootstra
public void postProcessing(final Orientation orientation) {
}
+*/
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java Wed Jan 7 09:39:54 2015
@@ -40,6 +40,7 @@ public abstract class AbstractUIFlexLayo
}
}
+/*
public void fixRelativeInsideAuto(final Orientation orientation, final boolean auto) {
}
@@ -51,4 +52,5 @@ public abstract class AbstractUIFlexLayo
public void postProcessing(final Orientation orientation) {
}
+*/
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlowLayout.java Wed Jan 7 09:39:54 2015
@@ -37,6 +37,7 @@ public abstract class AbstractUIFlowLayo
}
}
+/*
public void fixRelativeInsideAuto(final Orientation orientation, final boolean auto) {
}
@@ -49,4 +50,5 @@ public abstract class AbstractUIFlowLayo
public void postProcessing(final Orientation orientation) {
}
+*/
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Wed Jan 7 09:39:54 2015
@@ -20,26 +20,16 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportsMarkup;
-import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.internal.layout.BankHead;
-import org.apache.myfaces.tobago.internal.layout.Cell;
-import org.apache.myfaces.tobago.internal.layout.FactorList;
import org.apache.myfaces.tobago.internal.layout.Grid;
-import org.apache.myfaces.tobago.internal.layout.Interval;
-import org.apache.myfaces.tobago.internal.layout.IntervalList;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.internal.util.StringUtils;
-import org.apache.myfaces.tobago.layout.AutoLayoutToken;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
-import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.layout.Orientation;
-import org.apache.myfaces.tobago.layout.PixelLayoutToken;
-import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,6 +73,7 @@ public abstract class AbstractUIGridLayo
grid.setRowOverflow(isRowOverflow());
}
+/*
public void fixRelativeInsideAuto(final Orientation orientation, final boolean auto) {
if (!getLayoutContainer().isLayoutChildren()) {
@@ -130,7 +121,9 @@ public abstract class AbstractUIGridLayo
}
}
}
+*/
+/*
public void preProcessing(final Orientation orientation) {
if (!getLayoutContainer().isLayoutChildren()) {
@@ -201,6 +194,7 @@ public abstract class AbstractUIGridLayo
i++;
}
+*/
/*
IntervalList relatives = new IntervalList();
for (BankHead head : heads) {
@@ -213,7 +207,8 @@ public abstract class AbstractUIGridLayo
}
}
relatives.evaluate();
-*/
+*//*
+
// set the size if all sizes of the grid are set
Measure sum = Measure.ZERO;
@@ -245,7 +240,9 @@ public abstract class AbstractUIGridLayo
LayoutUtils.setCurrentSize(orientation, getLayoutContainer(), sum);
}
}
+*/
+/*
public void mainProcessing(final Orientation orientation) {
if (!getLayoutContainer().isLayoutChildren()) {
@@ -344,7 +341,9 @@ public abstract class AbstractUIGridLayo
grid.setOverflow(true, orientation);
}
}
+*/
+/*
public void postProcessing(final Orientation orientation) {
if (!getLayoutContainer().isLayoutChildren()) {
@@ -398,6 +397,7 @@ public abstract class AbstractUIGridLayo
}
}
}
+*/
public LayoutContainer getLayoutContainer() {
return ComponentUtils.findAncestor(getParent(), LayoutContainer.class);
@@ -407,6 +407,7 @@ public abstract class AbstractUIGridLayo
return orientation == Orientation.HORIZONTAL ? getColumnSpacing() : getRowSpacing();
}
+/*
public Measure getMarginBegin(final Orientation orientation) {
return orientation == Orientation.HORIZONTAL ? getMarginLeft() : getMarginTop();
}
@@ -414,11 +415,13 @@ public abstract class AbstractUIGridLayo
public Measure getMarginEnd(final Orientation orientation) {
return orientation == Orientation.HORIZONTAL ? getMarginRight() : getMarginBottom();
}
+*/
/**
* Compute the sum of the space between the cells.
* There is one "space" less than cells that are not void.
*/
+/*
private Measure computeSpacing(final Orientation orientation, final int startIndex, final int length) {
final BankHead[] heads = grid.getBankHeads(orientation);
@@ -436,6 +439,7 @@ public abstract class AbstractUIGridLayo
return Measure.ZERO;
}
}
+*/
public abstract String getRows();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Wed Jan 7 09:39:54 2015
@@ -93,8 +93,6 @@ public abstract class AbstractUISheet ex
private transient List<LayoutComponent> layoutComponents;
- private transient Boolean needVerticalScrollbar;
-
private transient Grid headerGrid;
public LayoutComponentRenderer getLayoutComponentRenderer(final FacesContext context) {
@@ -646,14 +644,6 @@ public abstract class AbstractUISheet ex
public abstract boolean isShowHeader();
- public Boolean getNeedVerticalScrollbar() {
- return needVerticalScrollbar;
- }
-
- public void setNeedVerticalScrollbar(final Boolean needVerticalScrollbar) {
- this.needVerticalScrollbar = needVerticalScrollbar;
- }
-
@Override
public ExpandedState getExpandedState() {
return getState().getExpandedState();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Wed Jan 7 09:39:54 2015
@@ -21,19 +21,15 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.internal.layout.Grid;
-import org.apache.myfaces.tobago.internal.layout.IntervalList;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.AutoLayoutToken;
-import org.apache.myfaces.tobago.layout.LayoutBox;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.layout.Orientation;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
import org.apache.myfaces.tobago.model.SheetState;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer;
@@ -41,7 +37,6 @@ import org.apache.myfaces.tobago.util.La
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.util.List;
@@ -54,8 +49,10 @@ public abstract class AbstractUISheetLay
private static final Logger LOG = LoggerFactory.getLogger(AbstractUISheetLayout.class);
+/*
private boolean horizontalAuto;
private boolean verticalAuto;
+*/
public void init() {
@@ -68,6 +65,7 @@ public abstract class AbstractUISheetLay
}
}
+/*
public void fixRelativeInsideAuto(final Orientation orientation, final boolean auto) {
if (orientation == Orientation.HORIZONTAL) {
@@ -94,15 +92,18 @@ public abstract class AbstractUISheetLay
((LayoutContainer) component).getLayoutManager().preProcessing(orientation);
}
+*/
/*
if (orientation == Orientation.HORIZONTAL && horizontalAuto
|| orientation == Orientation.VERTICAL && verticalAuto) {
intervals.add(new Interval(component, orientation));
}
-*/
+*//*
+
}
}
+*/
/*
if (intervals.size() >= 1) {
intervals.evaluate();
@@ -111,7 +112,8 @@ public abstract class AbstractUISheetLay
size = size.add(LayoutUtils.getBorderEnd(orientation, getLayoutContainer()));
LayoutUtils.setCurrentSize(orientation, getLayoutContainer(), size);
}
-*/
+*//*
+
}
public void mainProcessing(final Orientation orientation) {
@@ -193,6 +195,7 @@ public abstract class AbstractUISheetLay
}
}
}
+*/
@Override
public boolean getRendersChildren() {
@@ -229,11 +232,6 @@ public abstract class AbstractUISheetLay
final LayoutComponentRenderer renderer = data.getLayoutComponentRenderer(facesContext);
space = space.subtractNotNegative(renderer.getBorderLeft(facesContext, data));
space = space.subtractNotNegative(renderer.getBorderRight(facesContext, data));
- Measure verticalScrollbarWeight = renderer.getVerticalScrollbarWeight(facesContext, data);
- boolean needVerticalScrollbar = needVerticalScrollbar(facesContext, data);
- if (needVerticalScrollbar) {
- space = space.subtractNotNegative(verticalScrollbarWeight);
- }
if (currentWidthList == null) {
final LayoutTokens tokens = data.getColumnLayout();
@@ -258,10 +256,6 @@ public abstract class AbstractUISheetLay
}
}
-/*
- // todo: not nice: 1 left + 1 right border
- space = space.subtract(renderedColumns.size() * 2);
-*/
final LayoutInfo layoutInfo =
new LayoutInfo(newTokens.getSize(), space.getPixel(), newTokens, data.getClientId(facesContext), false);
final Measure columnSelectorWidth
@@ -275,15 +269,7 @@ public abstract class AbstractUISheetLay
freeWidth -= width;
}
- if (needVerticalScrollbar) {
- if (freeWidth > 0) {
- currentWidthList.add(freeWidth + verticalScrollbarWeight.getPixel()); // filler column
- } else {
- currentWidthList.add(verticalScrollbarWeight.getPixel()); // filler column
- }
- } else {
- currentWidthList.add(Math.max(freeWidth, 0)); // empty filler column
- }
+ currentWidthList.add(Math.max(freeWidth, 0)); // empty filler column
}
if (renderedColumns.size() + 1 != currentWidthList.size()) {
@@ -295,56 +281,6 @@ public abstract class AbstractUISheetLay
}
}
- // todo: remove
- /** @deprecated since Tobago 3.0 */
- @Deprecated
- public boolean needVerticalScrollbar(final FacesContext facesContext, final AbstractUISheet sheet) {
- // estimate need of height-scrollbar on client, if yes we have to consider
- // this when calculating column width's
-
- if (sheet.getNeedVerticalScrollbar() != null) {
- return sheet.getNeedVerticalScrollbar();
- }
-
- Boolean result = null;
-
- final Object forceScrollbar = sheet.getAttributes().get(Attributes.FORCE_VERTICAL_SCROLLBAR);
- if (forceScrollbar != null) {
- if ("true".equals(forceScrollbar)) {
- result = true;
- } else if ("false".equals(forceScrollbar)) {
- result = false;
- } else if (!"auto".equals(forceScrollbar)) {
- LOG.warn("Illegal value for attribute 'forceVerticalScrollbar': '" + forceScrollbar + "'");
- }
- }
-
- if (result == null && !sheet.hasRowCount()) {
- result = true;
- }
-
- if (result == null) {
- if (sheet.getCurrentHeight() != null) {
- final int first = sheet.getFirst();
- final int rows = sheet.isRowsUnlimited()
- ? sheet.getRowCount()
- : Math.min(sheet.getRowCount(), first + sheet.getRows()) - first;
- Measure heightNeeded = getRowHeight(facesContext, sheet).multiply(rows);
- if (sheet.isShowHeader()) {
- heightNeeded = heightNeeded.add(getHeaderHeight(facesContext, sheet));
- }
- if (sheet.isPagingVisible()) {
- heightNeeded = heightNeeded.add(getFooterHeight(facesContext, sheet));
- }
- result = heightNeeded.greaterThan(sheet.getCurrentHeight());
- } else {
- result = false;
- }
- }
- sheet.setNeedVerticalScrollbar(result);
- return result;
- }
-
private void parseFixedWidth(
final LayoutInfo layoutInfo, final List<AbstractUIColumn> renderedColumns, final Measure columnSelectorWidth) {
final LayoutTokens tokens = layoutInfo.getLayoutTokens();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java Wed Jan 7 09:39:54 2015
@@ -19,14 +19,9 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.internal.layout.Interval;
-import org.apache.myfaces.tobago.internal.layout.IntervalList;
-import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
-import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.layout.Orientation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,6 +40,7 @@ public abstract class AbstractUITabGroup
}
}
+/*
public void fixRelativeInsideAuto(final Orientation orientation, final boolean auto) {
if (orientation == Orientation.HORIZONTAL) {
@@ -79,10 +75,12 @@ public abstract class AbstractUITabGroup
if (intervals.size() >= 1) {
intervals.evaluate();
final Measure size = intervals.getCurrent();
+*/
/*
size = size.add(LayoutUtils.getBorderBegin(orientation, getLayoutContainer()));
size = size.add(LayoutUtils.getBorderEnd(orientation, getLayoutContainer()));
-*/
+*//*
+
LayoutUtils.setCurrentSize(orientation, getLayoutContainer(), size);
}
}
@@ -124,6 +122,7 @@ public abstract class AbstractUITabGroup
// todo: optimize: the AutoLayoutTokens with columnSpan=1 are already called
}
}
+*/
@Override
public boolean getRendersChildren() {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/BankHead.java Wed Jan 7 09:39:54 2015
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.internal.layout;
import org.apache.myfaces.tobago.layout.LayoutToken;
-import org.apache.myfaces.tobago.layout.Measure;
/**
* BankHead represents the head information of a bank like the token for this bank, the computed
@@ -30,10 +29,6 @@ public class BankHead {
private LayoutToken token;
- private IntervalList intervalList;
-
- private Measure current;
-
private boolean rendered;
public BankHead(final LayoutToken token) {
@@ -49,22 +44,6 @@ public class BankHead {
this.token = token;
}
- public IntervalList getIntervalList() {
- return intervalList;
- }
-
- public void setIntervalList(final IntervalList intervalList) {
- this.intervalList = intervalList;
- }
-
- public Measure getCurrent() {
- return current;
- }
-
- public void setCurrent(final Measure current) {
- this.current = current;
- }
-
public boolean isRendered() {
return rendered;
}
@@ -75,11 +54,6 @@ public class BankHead {
@Override
public String toString() {
- return "BankHead{"
- + token
- + "," + intervalList
- + "," + current
- + "," + rendered
- + '}';
+ return "BankHead{" + token + "," + rendered + '}';
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutManager.java Wed Jan 7 09:39:54 2015
@@ -25,6 +25,7 @@ public interface LayoutManager extends C
void init();
+/*
void fixRelativeInsideAuto(Orientation orientation, boolean auto);
void preProcessing(Orientation orientation);
@@ -32,4 +33,5 @@ public interface LayoutManager extends C
void mainProcessing(Orientation orientation);
void postProcessing(Orientation orientation);
+*/
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java Wed Jan 7 09:39:54 2015
@@ -111,10 +111,4 @@ public abstract class AbstractLayoutable
public Measure getPaddingBottom(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPaddingBottom(facesContext, component);
}
-
- /** @deprecated since Tobago 3.0 */
- @Deprecated
- public Measure getVerticalScrollbarWeight(final FacesContext facesContext, final Configurable component) {
- return ((LayoutComponentRenderer) getRenderer(facesContext)).getVerticalScrollbarWeight(facesContext, component);
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java Wed Jan 7 09:39:54 2015
@@ -67,8 +67,4 @@ public interface LayoutComponentRenderer
Measure getPaddingTop(FacesContext facesContext, Configurable component);
Measure getPaddingBottom(FacesContext facesContext, Configurable component);
-
- /** @deprecated since Tobago 3.0 */
- @Deprecated
- Measure getVerticalScrollbarWeight(FacesContext facesContext, Configurable component);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java Wed Jan 7 09:39:54 2015
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.config.Configurable;
-import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.layout.Measure;
import javax.faces.context.FacesContext;
@@ -111,16 +110,4 @@ public abstract class LayoutComponentRen
public Measure getPaddingBottom(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PADDING_BOTTOM, Measure.ZERO);
}
-
- /** @deprecated since Tobago 3.0 */
- @Deprecated
- public Measure getVerticalScrollbarWeight(final FacesContext facesContext, final Configurable component) {
- final ClientProperties clientProperties = ClientProperties.getInstance(facesContext);
- final Measure weight = clientProperties.getVerticalScrollbarWeight();
- if (weight != null) {
- return weight;
- } else { // default
- return getResourceManager().getThemeMeasure(facesContext, component, "verticalScrollbarWeight", Measure.ZERO);
- }
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Wed Jan 7 09:39:54 2015
@@ -156,8 +156,6 @@ Sheet.borderLeft=0
Sheet.borderTop=0
Sheet.borderRight=0
Sheet.borderBottom=0
-Sheet.verticalScrollbarWeight=17
-Sheet.horizontalScrollbarWeight=17
Tab.headerHeight=0
Tab.borderLeft=5
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Wed Jan 7 09:39:54 2015
@@ -44,14 +44,12 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.component.AbstractUIMenu;
import org.apache.myfaces.tobago.internal.component.AbstractUIOut;
import org.apache.myfaces.tobago.internal.component.AbstractUISheet;
-import org.apache.myfaces.tobago.internal.component.AbstractUISheetLayout;
import org.apache.myfaces.tobago.internal.layout.Cell;
import org.apache.myfaces.tobago.internal.layout.Grid;
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Display;
import org.apache.myfaces.tobago.layout.LayoutBase;
-import org.apache.myfaces.tobago.layout.LayoutManager;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.layout.TextAlign;
import org.apache.myfaces.tobago.model.ExpandedState;
@@ -789,9 +787,6 @@ public class SheetRenderer extends Layou
LOG.debug("*****************************************************");
}
- final boolean needVerticalScrollbar = needVerticalScrollbar(facesContext, sheet);
- int verticalScrollbarWidth = 0;
-
writer.startElement(HtmlElements.DIV, sheet);
writer.writeClassAttribute(Classes.create(sheet, "headerDiv"));
writer.startElement(HtmlElements.TABLE, sheet);
@@ -799,10 +794,6 @@ public class SheetRenderer extends Layou
writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", false);
writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
writer.writeClassAttribute(Classes.create(sheet, "headerTable table")); // XXX table comes from bootstrap
- if (needVerticalScrollbar) {
- verticalScrollbarWidth = getVerticalScrollbarWeight(facesContext, sheet).getPixel();
- writer.writeAttribute("data-tobago-sheet-verticalscrollbarwidth", String.valueOf(verticalScrollbarWidth), false);
- }
if (columnWidths != null) {
writer.startElement(HtmlElements.COLGROUP, null);
@@ -970,17 +961,6 @@ public class SheetRenderer extends Layou
writer.endElement(HtmlElements.DIV);
}
- // todo: remove
- private boolean needVerticalScrollbar(final FacesContext facesContext, final UISheet sheet) {
- final LayoutManager layoutManager = sheet.getLayoutManager();
- if (layoutManager instanceof AbstractUISheetLayout) {
- return ((AbstractUISheetLayout) layoutManager).needVerticalScrollbar(facesContext, sheet);
- } else {
- LOG.error("Sheet must use a sheet layout, but found: " + layoutManager.getClass().getName());
- return true;
- }
- }
-
private void encodeResizing(final TobagoResponseWriter writer, final AbstractUISheet sheet, final int columnIndex)
throws IOException {
writer.startElement(HtmlElements.SPAN, null);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js?rev=1650021&r1=1650020&r2=1650021&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js Wed Jan 7 09:39:54 2015
@@ -252,18 +252,6 @@ Tobago.Sheet.setup2 = function (sheets)
Tobago.Sheet.resetInputFieldSize(jQuery(this));
});
-
- // todo: remove this for Tobago 3.0
- // adjust body row filler cells if no scrollbar present but was calculated
- jQuery(sheets).find("[data-tobago-sheet-verticalscrollbarwidth]").each(function() {
- var table = jQuery(this);
- var verticalScrollbarWidth = table.data("tobago-sheet-verticalscrollbarwidth");
- if (verticalScrollbarWidth !== undefined) {
- var bodyDiv = table.parent().next();
- Tobago.Sheet.adjustTableWidth(bodyDiv);
- }
- });
-
// resize: mouse events
jQuery(sheets).find(".tobago-sheet-headerResize").each(function () {
jQuery(this).click(function () {
@@ -350,24 +338,14 @@ Tobago.Sheet.setup2 = function (sheets)
var scrollHeight = bodyDiv.prop("scrollHeight");
console.log("bodyHeight : " + bodyHeight); // @DEV_ONLY
console.log("scrollHeight : " + scrollHeight); // @DEV_ONLY
- var verticalScrollbarWidth = 0;
- if (bodyHeight < scrollHeight) {
- verticalScrollbarWidth = headerTable.data("tobago-sheet-verticalscrollbarwidth");
- if (verticalScrollbarWidth) {
- bodyDivWidth -= verticalScrollbarWidth;
- }
- }
var headerFillerWidth = 0;
var bodyFillerWidth = 0;
if (usedWidth <= bodyDivWidth) {
bodyFillerWidth = bodyDivWidth - usedWidth;
- headerFillerWidth = bodyFillerWidth + verticalScrollbarWidth;
+ headerFillerWidth = bodyFillerWidth;
bodyTable.css("width", bodyDivWidth);
} else {
- if (usedWidth >= (bodyDivWidth - verticalScrollbarWidth)) {
- headerFillerWidth = verticalScrollbarWidth;
- }
bodyTable.css("width", usedWidth);
}