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 2018/08/07 13:52:54 UTC
[myfaces-tobago] branch master updated: TOBAGO-1908: LabelLayout
attributes gridLeft, gridRight * clean up
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 3411b77 TOBAGO-1908: LabelLayout attributes gridLeft, gridRight * clean up
3411b77 is described below
commit 3411b7705896b91f77903f6f334ad45bd6f68f8b
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Tue Aug 7 15:51:26 2018 +0200
TOBAGO-1908: LabelLayout attributes gridLeft, gridRight
* clean up
---
.../renderkit/renderer/LabelLayoutRendererBase.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index a906727..66e5d0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -121,13 +121,8 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
flex = true;
break;
case segmentLeft:
- if (LabelLayout.getSegment(facesContext) == LabelLayout.segmentLeft) {
- clientId += ComponentUtils.SUB_SEPARATOR + "label";
- }
- flex = false;
- break;
case segmentRight:
- if (LabelLayout.getSegment(facesContext) == LabelLayout.segmentRight) {
+ if (LabelLayout.getSegment(facesContext) == labelLayout) {
clientId += ComponentUtils.SUB_SEPARATOR + "label";
}
flex = false;
@@ -136,7 +131,7 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
case top:
case flowLeft:
case flowRight:
- default: // none, top, segmentLeft, segmentRight, flowLeft, flowRight
+ default:
flex = false;
}
@@ -159,12 +154,8 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
case flowRight:
break;
case segmentLeft:
- if (LabelLayout.getSegment(facesContext) == LabelLayout.segmentLeft) {
- encodeLabel(facesContext, component, writer, labelLayout);
- }
- break;
case segmentRight:
- if (LabelLayout.getSegment(facesContext) == LabelLayout.segmentRight) {
+ if (LabelLayout.getSegment(facesContext) == labelLayout) {
encodeLabel(facesContext, component, writer, labelLayout);
}
break;