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/09/18 11:02:29 UTC
svn commit: r1703781 [3/3] - 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/facelets/
tobago-core/src/main/java/org/apache/myfaces/tobago/i...
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -29,7 +29,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import javax.faces.component.UIOutput;
@@ -46,7 +45,7 @@ import javax.faces.component.UIOutput;
allowedChildComponenents = "NONE"
)
public interface TreeLabelTagDeclaration
- extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent, HasStyle {
+ extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, HasStyle {
/**
* Text value to display as label.
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import javax.faces.component.UIData;
@@ -53,7 +52,7 @@ import javax.faces.component.UIData;
"org.apache.myfaces.tobago.TreeData"
})
public interface TreeListboxTagDeclaration
- extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup,
+ extends HasIdBindingAndRendered, HasValue, HasVar, HasStyle, HasMarkup, HasCurrentMarkup,
IsRequired {
/**
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRoot;
import javax.faces.component.UIData;
@@ -54,7 +53,7 @@ import javax.faces.component.UIData;
"org.apache.myfaces.tobago.TreeData"
})
public interface TreeMenuTagDeclaration
- extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup,
+ extends HasIdBindingAndRendered, HasValue, HasVar, HasStyle, HasMarkup, HasCurrentMarkup,
IsShowRoot {
/**
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
import javax.faces.component.UIColumn;
@@ -53,7 +52,7 @@ import javax.faces.component.UIColumn;
"org.apache.myfaces.tobago.TreeData"
})
public interface TreeNodeTagDeclaration
- extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, IsGridLayoutContainer, HasStyle {
+ extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, HasStyle {
@Deprecated
@TagAttribute()
@@ -70,7 +69,9 @@ public interface TreeNodeTagDeclaration
methodSignature = "org.apache.myfaces.tobago.event.TreeExpansionEvent")
void setTreeExpansionListener(String treeExpansionListener);
+/* TBD
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
void setWidth(String width);
+*/
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRoot;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRootJunction;
@@ -55,7 +54,7 @@ import javax.faces.component.UIData;
"org.apache.myfaces.tobago.TreeData"
})
public interface TreeTagDeclaration
- extends HasIdBindingAndRendered, HasValue, HasVar, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup,
+ extends HasIdBindingAndRendered, HasValue, HasVar, HasStyle, HasMarkup, HasCurrentMarkup,
IsShowRoot, IsShowRootJunction {
/**
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
public interface InputTagDeclaration
- extends HasValidator, HasValue, HasValueChangeListener,
- HasValidatorMessage, HasConverterMessage, HasRequiredMessage,
- HasTabIndex, IsFocus, IsGridLayoutComponent, HasStyle {
+ extends HasValidator, HasValue, HasValueChangeListener, HasTabIndex, IsFocus, HasStyle,
+ HasValidatorMessage, HasConverterMessage, HasRequiredMessage {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutContainer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutContainer.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutContainer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsGridLayoutContainer.java Fri Sep 18 09:02:27 2015
@@ -105,22 +105,4 @@ public interface IsGridLayoutContainer {
+ "getRenderer(getFacesContext())).getPaddingBottom(getFacesContext(), this) : Measure.ZERO")
void setPaddingBottom(String paddingBottom);
- /**
- * This attribute is for internal use only.
- *
- * @param overflowX Does the component need a horizontal scollbar.
- */
- @UIComponentTagAttribute(
- type = "boolean")
- void setOverflowX(String overflowX);
-
- /**
- * This attribute is for internal use only.
- *
- * @param overflowY Does the component need a vertical scollbar.
- */
- @UIComponentTagAttribute(
- type = "boolean")
- void setOverflowY(String overflowY);
-
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java Fri Sep 18 09:02:27 2015
@@ -22,12 +22,9 @@ package org.apache.myfaces.tobago.util;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.component.OnComponentCreated;
-import org.apache.myfaces.tobago.component.OnComponentPopulated;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIMenuSelectOne;
import org.apache.myfaces.tobago.internal.component.AbstractUISelectBooleanCheckbox;
-import org.apache.myfaces.tobago.layout.LayoutManager;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -105,19 +102,4 @@ public final class CreateComponentUtils
}
return checkbox;
}
-
- public static LayoutManager createAndInitLayout(
- final FacesContext facesContext, final String componentType, final String rendererType,
- final UIComponent parent) {
-
- final LayoutManager layoutManager = (LayoutManager) CreateComponentUtils.createComponent(
- facesContext, componentType, rendererType, facesContext.getViewRoot().createUniqueId());
- if (layoutManager instanceof OnComponentCreated) {
- ((OnComponentCreated) layoutManager).onComponentCreated(facesContext, parent);
- }
- if (layoutManager instanceof OnComponentPopulated) {
- ((OnComponentPopulated) layoutManager).onComponentPopulated(facesContext, parent);
- }
- return layoutManager;
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java Fri Sep 18 09:02:27 2015
@@ -22,12 +22,12 @@ package org.apache.myfaces.tobago.exampl
import org.apache.commons.collections.KeyValue;
import org.apache.commons.collections.keyvalue.DefaultKeyValue;
import org.apache.commons.io.IOUtils;
+import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
+import org.apache.myfaces.tobago.layout.Measure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.component.RendererTypes;
-import org.apache.myfaces.tobago.layout.LayoutBase;
-import org.apache.myfaces.tobago.layout.Measure;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -169,7 +169,7 @@ public class ThemeConfigViewController {
for (final String propertyName : propertyNames) {
try {
final Measure measure
- = ResourceManagerUtils.getThemeMeasure(facesContext, (LayoutBase) component, propertyName);
+ = ResourceManagerUtils.getThemeMeasure(facesContext, (Configurable) component, propertyName);
found.add(new DefaultKeyValue(propertyName, measure.toString()));
} catch (final Exception e) {
if (LOG.isDebugEnabled()) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java Fri Sep 18 09:02:27 2015
@@ -20,14 +20,14 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportsStyle;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.config.Configurable;
import javax.faces.context.FacesContext;
import javax.faces.validator.LongRangeValidator;
import javax.faces.validator.ValidatorException;
public abstract class AbstractUINumberSlider extends javax.faces.component.UIInput
- implements LayoutComponent, SupportsStyle {
+ implements Configurable, SupportsStyle {
public abstract Integer getMin();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java Fri Sep 18 09:02:27 2015
@@ -19,9 +19,8 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.config.Configurable;
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.Measure;
import org.apache.myfaces.tobago.layout.Orientation;
@@ -36,14 +35,14 @@ public abstract class AbstractUISplitLay
private String submittedLayout;
public void updateLayout(final int position) {
- final LayoutContainer container = (LayoutContainer) getParent();
- final List<UIComponent> components = LayoutUtils.findLayoutChildren(container);
- final LayoutComponent firstComponent = (LayoutComponent) components.get(0);
- final LayoutComponent secondComponent = (LayoutComponent) components.get(1);
+ final List<UIComponent> components = LayoutUtils.findLayoutChildren(getParent());
+ final Configurable firstComponent = (Configurable) components.get(0);
+ final Configurable secondComponent = (Configurable) components.get(1);
final int oldPosition;
final int currentSize1;
final int currentSize2;
+/* XXX to be reimplemented: not using GridLayout, it might be better using flex?!
if (getOrientation() == Orientation.horizontal) {
oldPosition = secondComponent.getLeft().getPixel() - 5;
currentSize1 = firstComponent.getCurrentWidth().getPixel();
@@ -60,6 +59,7 @@ public abstract class AbstractUISplitLay
final int ggt = gcd(newSize1, newSize2);
submittedLayout = Integer.toString(newSize1 / ggt) + "*;" + Integer.toString(newSize2 / ggt) + "*";
+*/
}
// TODO: MathUtils
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -30,7 +30,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import javax.faces.component.UIInput;
@@ -47,7 +46,7 @@ import javax.faces.component.UIInput;
rendererType = "NumberSlider")
public interface NumberSliderTagDeclaration
extends HasIdBindingAndRendered, IsReadonly, IsDisabled, HasMarkup, HasCurrentMarkup,
- HasValue, HasValueChangeListener, IsGridLayoutComponent, HasStyle {
+ HasValue, HasValueChangeListener, HasStyle {
/**
* The minimum integer that can be entered and which represents the left
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java Fri Sep 18 09:02:27 2015
@@ -21,13 +21,6 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.internal.component.AbstractUISplitLayout;
import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
-import org.apache.myfaces.tobago.layout.Display;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
-import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.layout.Orientation;
-import org.apache.myfaces.tobago.layout.Position;
-import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -64,9 +57,9 @@ public class SplitLayoutRenderer extends
@Override
public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
- final LayoutContainer container = (LayoutContainer) component.getParent();
- if (container.isLayoutChildren()) {
- final List<UIComponent> components = LayoutUtils.findLayoutChildren(container);
+ final UIComponent parent = component.getParent();
+ if (parent.isRendered()) {
+ final List<UIComponent> components = LayoutUtils.findLayoutChildren(parent);
if (components.size() != 2) {
LOG.warn("Illegal component count in splitLayout: {}", components.size());
}
@@ -87,6 +80,7 @@ public class SplitLayoutRenderer extends
writer.writeIdAttribute(id);
writer.writeAttribute("data-tobago-split-layout", layout.getOrientation().name(), false);
writer.writeAttribute("data-tobago-split-layout-containment", createDraggableContainment(layout), true);
+/* XXX todo not implemented currently
final Style style = calculateHandleStyle(layout);
writer.writeStyleAttribute(style);
writer.writeClassAttribute(Classes.create(layout, layout.getOrientation().name()));
@@ -97,46 +91,51 @@ public class SplitLayoutRenderer extends
} else {
position = style.getTop().getPixel();
}
+*/
writer.startElement(HtmlElements.INPUT, null);
writer.writeIdAttribute(id + POSITION_ID_POSTFIX);
writer.writeNameAttribute(id + POSITION_ID_POSTFIX);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
- writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(position), false);
+// writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(position), false);
writer.endElement(HtmlElements.INPUT);
-
-
writer.endElement(HtmlElements.SPAN);
-
}
private String createDraggableContainment(final AbstractUISplitLayout layout) {
- final LayoutContainer container = (LayoutContainer) layout.getParent();
- final List<UIComponent> components = LayoutUtils.findLayoutChildren(container);
- final LayoutComponent firstComponent = (LayoutComponent) components.get(0);
- final LayoutComponent secondComponent = (LayoutComponent) components.get(1);
+/* XXX todo not implemented currently
+ final UIComponent parent = layout.getParent();
+ final LayoutContainer container = (LayoutContainer) parent;
+ final List<UIComponent> components = LayoutUtils.findLayoutChildren(parent);
+ final Style firstComponent = ((SupportsStyle) components.get(0)).getStyle();
+ final Style secondComponent = ((SupportsStyle) components.get(1)).getStyle();
Measure minimum;
+
if (layout.getOrientation() == Orientation.horizontal) {
- minimum = firstComponent.getMinimumWidth();
+ minimum = firstComponent.getMinWidth();
final int minimumSize1 = minimum != null ? minimum.getPixel() : 0;
- minimum = secondComponent.getMinimumWidth();
+ minimum = secondComponent.getMinWidth();
final int minimumSize2 = minimum != null ? minimum.getPixel() : 0;
- final int totalSize = container.getCurrentWidth().getPixel();
+ final int totalSize = container.getWidth().getPixel();
return "[" + minimumSize1 + ", 0, " + (totalSize - minimumSize2) + ", 0]";
} else {
- minimum = firstComponent.getMinimumHeight();
+ minimum = firstComponent.getMinHeight();
final int minimumSize1 = minimum != null ? minimum.getPixel() : 0;
- minimum = secondComponent.getMinimumHeight();
+ minimum = secondComponent.getMinHeight();
final int minimumSize2 = minimum != null ? minimum.getPixel() : 0;
- final int totalSize = container.getCurrentHeight().getPixel();
+ final int totalSize = container.getHeight().getPixel();
return "[0, " + minimumSize1 + ", 0, " + (totalSize - minimumSize2) + "]";
}
+*/return "";
}
private Style calculateHandleStyle(final AbstractUISplitLayout layout) {
- final LayoutContainer container = (LayoutContainer) layout.getParent();
- final LayoutComponent secondComponent = (LayoutComponent) LayoutUtils.findLayoutChildren(container).get(1);
+/* XXX todo not implemented currently
+ final UIComponent parent = layout.getParent();
+ final LayoutContainer container = (LayoutContainer) parent;
+ final LayoutComponent secondComponent = (LayoutComponent) LayoutUtils.findLayoutChildren(parent).get(1);
final Style style = new Style();
+
if (layout.getOrientation() == Orientation.horizontal) {
style.setWidth(Measure.valueOf(5));
style.setHeight(container.getCurrentHeight());
@@ -152,5 +151,7 @@ public class SplitLayoutRenderer extends
style.setDisplay(Display.block);
style.setPosition(Position.absolute);
return style;
+*/
+ return null;
}
}
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/FlexLayoutRenderer.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/FlexLayoutRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/FlexLayoutRenderer.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/FlexLayoutRenderer.java Fri Sep 18 09:02:27 2015
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.UIFlexLayout;
import org.apache.myfaces.tobago.context.Markup;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -93,7 +92,7 @@ public class FlexLayoutRenderer extends
@Override
public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIComponent container = component.getParent();
- if (container instanceof LayoutContainer && !((LayoutContainer) container).isLayoutChildren()) {
+ if (!container.isRendered()) {
return;
}
RenderUtils.encodeChildren(facesContext, container);
@@ -101,7 +100,7 @@ public class FlexLayoutRenderer extends
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final AbstractUIBootstrapLayout bootstrapLayout = (AbstractUIBootstrapLayout) component;
final UIComponent container = bootstrapLayout.getParent();
- if (container instanceof LayoutContainer && !((LayoutContainer) container).isLayoutChildren()) {
+ if (!container.isRendered()) {
return;
}
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/FlowLayoutRenderer.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/FlowLayoutRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/FlowLayoutRenderer.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/FlowLayoutRenderer.java Fri Sep 18 09:02:27 2015
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UIFlowLayout;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -46,7 +45,7 @@ public class FlowLayoutRenderer extends
@Override
public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIComponent container = component.getParent();
- if (container instanceof LayoutContainer && !((LayoutContainer) container).isLayoutChildren()) {
+ if (!container.isRendered()) {
return;
}
RenderUtils.encodeChildren(facesContext, container);
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/GridLayoutRenderer.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/GridLayoutRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/GridLayoutRenderer.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/GridLayoutRenderer.java Fri Sep 18 09:02:27 2015
@@ -115,7 +115,7 @@ public class GridLayoutRenderer extends
final AbstractUIGridLayout gridLayout = (AbstractUIGridLayout) component;
/*
final UIComponent container = gridLayout.getParent();
- if (container instanceof LayoutContainer && !((LayoutContainer) container).isLayoutChildren()) {
+ if (!container.isRendered()) {
return;
}
RenderUtils.encodeChildren(facesContext, container);
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/ImageRenderer.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/ImageRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/ImageRenderer.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/ImageRenderer.java Fri Sep 18 09:02:27 2015
@@ -25,9 +25,8 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.internal.component.AbstractUIImage;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
-import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
+import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
@@ -89,10 +88,12 @@ public class ImageRenderer extends Layou
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
writer.writeAttribute(HtmlAttributes.BORDER, border, false);
+/*
final Style style = new Style();
style.setWidth(image.getWidth());
style.setHeight(image.getHeight());
writer.writeStyleAttribute(style);
+*/
// todo: may set a marker in the context in the
// todo: NavRenderer, or the additional class, to avoid tree traversing
writer.writeClassAttribute(
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/MessagesRenderer.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/MessagesRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/MessagesRenderer.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/MessagesRenderer.java Fri Sep 18 09:02:27 2015
@@ -21,11 +21,9 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.ajax.AjaxUtils;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIBox;
import org.apache.myfaces.tobago.component.UIButton;
-import org.apache.myfaces.tobago.component.UIGridLayout;
import org.apache.myfaces.tobago.component.UIMessages;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.component.UIPopup;
@@ -33,18 +31,17 @@ import org.apache.myfaces.tobago.context
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
-import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
+import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.Aria;
-import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
-import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.CreateComponentUtils;
@@ -186,11 +183,6 @@ public class MessagesRenderer extends La
// TODO: set string resources in renderer
box.getAttributes().put(Attributes.LABEL, ResourceManagerUtils.getPropertyNotNull(
facesContext, "tobago", "tobago.message.confirmation.title"));
- UIComponent layout = CreateComponentUtils.createComponent(
- facesContext, UIGridLayout.COMPONENT_TYPE, RendererTypes.GRID_LAYOUT, "layout");
- box.getFacets().put(Facets.LAYOUT, layout);
- layout.getAttributes().put(Attributes.ROWS, "*;auto");
- layout.getAttributes().put(Attributes.MARGIN, Measure.valueOf(10));
final UIPanel scrollPanel = (UIPanel)
CreateComponentUtils.createComponent(facesContext, UIPanel.COMPONENT_TYPE, "Panel", "messagePanel");
@@ -203,11 +195,6 @@ public class MessagesRenderer extends La
final UIComponent buttonPanel = CreateComponentUtils.createComponent(
facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL, "buttonPanel");
- layout = CreateComponentUtils.createComponent(
- facesContext, UIGridLayout.COMPONENT_TYPE, RendererTypes.GRID_LAYOUT, "buttonPanelLayout");
- buttonPanel.getFacets().put(Facets.LAYOUT, layout);
- layout.getAttributes().put(Attributes.COLUMNS, "*;100px");
- layout.getAttributes().put(Attributes.ROWS, "auto");
box.getChildren().add(buttonPanel);
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/PageRenderer.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/PageRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/PageRenderer.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/PageRenderer.java Fri Sep 18 09:02:27 2015
@@ -299,61 +299,8 @@ public class PageRenderer extends Layout
writer.endElement(HtmlElements.INPUT);
}
*/
-
- encodePageMenu(facesContext, page);
- // write the previously rendered page content
-// AbstractUILayoutBase.getLayout(component).encodeChildrenOfComponent(facesContext, component);
-
-// page.encodeLayoutBegin(facesContext);
-
-/*
- writer.startElement(HtmlElements.DIV, page);
- if (portlet) {
- writer.writeClassAttribute(Classes.create(page, "content", Markup.PORTLET));
- } else {
- writer.writeClassAttribute(Classes.create(page, "content"));
- }
- writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "content");
- final Style style = page.getStyle();
- // XXX position the div, so that the scrollable area is correct.
- // XXX better to take this fact into layout management.
- // XXX is also useful in boxes, etc.
- final Measure border = getBorderBottom(facesContext, page);
- style.setHeight(page.getCurrentHeight().subtract(border));
- style.setTop(border);
- writer.writeStyleAttribute(style);
-*/
- }
-
- protected void encodePageMenu(FacesContext facesContext, UIPage page) throws IOException {
-
-/*
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
-
- writer.startElement(HtmlElements.NAV, null);
- writer.writeClassAttribute(BootstrapClass.NAVBAR, BootstrapClass.NAVBAR_INVERSE, BootstrapClass.NAVBAR_FIXED_TOP);
- writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.NAVIGATION.toString(), false);
-
- writer.startElement(HtmlElements.DIV, null);
- writer.writeClassAttribute(BootstrapClass.CONTAINER_FLUID);
-
- writer.startElement(HtmlElements.DIV, null);
- writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_COLLAPSE);
-
- final UIMenuBar menuBar = ComponentUtils.findFacetDescendant(page, Facets.MENUBAR, UIMenuBar.class);
- if (menuBar != null) {
- RenderUtils.encode(facesContext, menuBar);
- }
-
- writer.endElement(HtmlElements.DIV);
-
- writer.endElement(HtmlElements.DIV);
-
- writer.endElement(HtmlElements.NAV);
-*/
}
-
private void checkDuplicates(final String[] resources, final Collection<String> files) {
for (final String resource : resources) {
if (files.contains(resource)) {
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/PanelRenderer.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/PanelRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/PanelRenderer.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/PanelRenderer.java Fri Sep 18 09:02:27 2015
@@ -24,7 +24,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UIReload;
import org.apache.myfaces.tobago.internal.component.AbstractUIPanel;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
-import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
@@ -33,8 +32,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -43,8 +40,6 @@ import java.io.IOException;
public class PanelRenderer extends LayoutComponentRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(PanelRenderer.class);
-
@Override
public boolean getRendersChildren() {
return true;
@@ -85,35 +80,11 @@ public class PanelRenderer extends Layou
}
HtmlRendererUtils.renderCommandFacet(panel, facesContext, writer);
HtmlRendererUtils.encodeContextMenu(facesContext, writer, panel);
-
- //HtmlRendererUtils.checkForCommandFacet(panel, facesContext, writer);
-
- final Measure borderLeft = panel.getBorderLeft();
- final Measure borderRight = panel.getBorderRight();
- final Measure borderTop = panel.getBorderTop();
- final Measure borderBottom = panel.getBorderBottom();
-
- if (borderLeft.greaterThan(Measure.ZERO) || borderRight.greaterThan(Measure.ZERO)
- || borderTop.greaterThan(Measure.ZERO) || borderBottom.greaterThan(Measure.ZERO)) {
- writer.startElement(HtmlElements.DIV, panel);
- writer.writeClassAttribute(Classes.create(panel, "content")); // needed to be scrollable inside of the panel
- }
}
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final ResponseWriter writer = facesContext.getResponseWriter();
- final AbstractUIPanel panel = (AbstractUIPanel) component;
-
- final Measure borderLeft = panel.getBorderLeft();
- final Measure borderRight = panel.getBorderRight();
- final Measure borderTop = panel.getBorderTop();
- final Measure borderBottom = panel.getBorderBottom();
-
- if (borderLeft.greaterThan(Measure.ZERO) || borderRight.greaterThan(Measure.ZERO)
- || borderTop.greaterThan(Measure.ZERO) || borderBottom.greaterThan(Measure.ZERO)) {
- writer.endElement(HtmlElements.DIV);
- }
writer.endElement(HtmlElements.DIV);
}
}
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/PopupRenderer.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/PopupRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/PopupRenderer.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/PopupRenderer.java Fri Sep 18 09:02:27 2015
@@ -22,12 +22,11 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.UIPopup;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
-import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
+import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
-import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -59,10 +58,12 @@ public class PopupRenderer extends Layou
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.MODAL_DIALOG);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.DOCUMENT.toString(), false);
+/*
final Style style = new Style();
style.setWidth(popup.getWidth());
style.setHeight(popup.getHeight());
writer.writeStyleAttribute(style);
+*/
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.MODAL_CONTENT);
}
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/SegmentLayoutRenderer.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/SegmentLayoutRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/SegmentLayoutRenderer.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/SegmentLayoutRenderer.java Fri Sep 18 09:02:27 2015
@@ -19,13 +19,11 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.UIExtensionPanel;
import org.apache.myfaces.tobago.component.UISegmentLayout;
import org.apache.myfaces.tobago.internal.component.AbstractUISegmentLayout;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClassGenerator;
@@ -71,20 +69,11 @@ public class SegmentLayoutRenderer exten
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final UISegmentLayout segmentLayout = (UISegmentLayout) component;
- UIComponent container = segmentLayout.getParent();
- if (container.getFacet(Facets.LAYOUT) == segmentLayout) {
- // case (old style): layout manager over facet
- LOG.warn("Using this layout via a facet is deprecated. Please put the layout around the components.");
- } else {
- // case (modern style): the segmentLayout contains the content to be layed out.
- container = segmentLayout;
- }
-
- if (container instanceof LayoutContainer && !((LayoutContainer) container).isLayoutChildren()) {
+ if (!segmentLayout.isRendered()) {
return;
}
- final List<UIComponent> children = container.getChildren();
+ final List<UIComponent> children = segmentLayout.getChildren();
final BootstrapClassGenerator generator = new BootstrapClassGenerator(
segmentLayout.getExtraSmall(),
segmentLayout.getSmall(),
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=1703781&r1=1703780&r2=1703781&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 Fri Sep 18 09:02:27 2015
@@ -48,7 +48,6 @@ import org.apache.myfaces.tobago.interna
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.Measure;
import org.apache.myfaces.tobago.layout.TextAlign;
import org.apache.myfaces.tobago.model.ExpandedState;
@@ -358,6 +357,7 @@ public class SheetRenderer extends Layou
// set height to 0 to prevent use of layoutheight from parent
grandKid.getAttributes().put(Attributes.LAYOUT_HEIGHT, HEIGHT_0);
// XXX hotfix
+/* XXX broken
if (grandKid instanceof LayoutBase) {
final LayoutBase base = (LayoutBase) grandKid;
if (base.getLeft() != null) {
@@ -367,6 +367,7 @@ public class SheetRenderer extends Layou
base.setTop(null);
}
}
+*/
EncodeUtils.prepareRendererAll(facesContext, grandKid);
RenderUtils.encode(facesContext, grandKid);
}
@@ -418,11 +419,11 @@ public class SheetRenderer extends Layou
// END RENDER BODY CONTENT
if (sheet.isPagingVisible()) {
- final Style footerStyle = new Style();
- footerStyle.setWidth(sheet.getCurrentWidth());
+// final Style footerStyle = new Style();
+// footerStyle.setWidth(sheet.getCurrentWidth());
writer.startElement(HtmlElements.DIV, sheet);
writer.writeClassAttribute(Classes.create(sheet, "footer"));
- writer.writeStyleAttribute(footerStyle);
+// writer.writeStyleAttribute(footerStyle);
// show row range
final Markup showRowRange = markupForLeftCenterRight(sheet.getShowRowRange());
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/TreeListboxRenderer.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/TreeListboxRenderer.java?rev=1703781&r1=1703780&r2=1703781&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/TreeListboxRenderer.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/TreeListboxRenderer.java Fri Sep 18 09:02:27 2015
@@ -24,10 +24,8 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UITreeNode;
import org.apache.myfaces.tobago.component.UITreeSelect;
import org.apache.myfaces.tobago.internal.component.AbstractUITree;
-import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -116,16 +114,16 @@ public class TreeListboxRenderer extends
? tree.getTreeDataModel().getDepth()
: 7; // XXX not a fix value!!!
// todo: use (TreeListbox ?)Layout
- final Measure currentWidth = tree.getCurrentWidth();
- final Measure width = currentWidth.divide(depth);
+// final Measure currentWidth = tree.getCurrentWidth();
+// final Measure width = currentWidth.divide(depth);
for (int level = 0; level < depth; level++) {
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(tree, "level"));
- final Style levelStyle = new Style();
- levelStyle.setLeft(width.multiply(level));
- levelStyle.setWidth(width);
- writer.writeStyleAttribute(levelStyle);
+// final Style levelStyle = new Style();
+// levelStyle.setLeft(width.multiply(level));
+// levelStyle.setWidth(width);
+// writer.writeStyleAttribute(levelStyle);
// at the start of each div there is an empty and disabled select tag to show empty area.
// this is not needed for the 1st level.
if (level > 0) {