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 2016/11/23 09:54:16 UTC
svn commit: r1770938 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal:
component/ renderkit/renderer/
Author: lofwyr
Date: Wed Nov 23 09:54:15 2016
New Revision: 1770938
URL: http://svn.apache.org/viewvc?rev=1770938&view=rev
Log:
TOBAGO-1543: Paradigm: The clientId shoud be rendered in the local root element in HTML
* suffix (fieldid) must not be used, when labelLayout=skip
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java Wed Nov 23 09:54:15 2016
@@ -62,6 +62,10 @@ public abstract class AbstractUICommand
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "command";
+ if(isParentOfCommands()) {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "command";
+ } else {
+ return getClientId(facesContext);
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.Visual;
@@ -32,7 +33,7 @@ import javax.faces.context.FacesContext;
import javax.servlet.http.Part;
public abstract class AbstractUIFile extends UIInput implements SupportsLabelLayout, Visual, ClientBehaviorHolder,
- SupportFieldId {
+ SupportFieldId {
@Override
public void validate(final FacesContext facesContext) {
@@ -66,6 +67,10 @@ public abstract class AbstractUIFile ext
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "real";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "real";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.component.SupportsAccessKey;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
@@ -43,6 +44,10 @@ public abstract class AbstractUIInput ex
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.component.SupportsAccessKey;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
@@ -32,7 +33,7 @@ import javax.faces.component.behavior.Cl
import javax.faces.context.FacesContext;
public abstract class AbstractUISelectBooleanCheckbox extends UISelectBoolean
- implements Visual, ClientBehaviorHolder, SupportFieldId, SupportsAccessKey, SupportsLabelLayout {
+ implements Visual, ClientBehaviorHolder, SupportFieldId, SupportsAccessKey, SupportsLabelLayout {
@Override
public boolean isSelected() {
@@ -78,6 +79,10 @@ public abstract class AbstractUISelectBo
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -28,6 +29,10 @@ public abstract class AbstractUISelectMa
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -36,6 +37,10 @@ public abstract class AbstractUISelectMa
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "unselected";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "unselected";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -28,6 +29,10 @@ public abstract class AbstractUISelectOn
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java Wed Nov 23 09:54:15 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -28,6 +29,10 @@ public abstract class AbstractUISelectOn
@Override
public String getFieldId(final FacesContext facesContext) {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ if (getLabelLayout() == LabelLayout.skip) {
+ return getClientId(facesContext);
+ } else {
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
+ }
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java?rev=1770938&r1=1770937&r2=1770938&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java Wed Nov 23 09:54:15 2016
@@ -81,11 +81,7 @@ public abstract class CommandRendererBas
writer.startElement(HtmlElements.BUTTON);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
}
- if (parentOfCommands) {
- writer.writeIdAttribute(command.getFieldId(facesContext));
- } else {
- writer.writeIdAttribute(clientId);
- }
+ writer.writeIdAttribute(command.getFieldId(facesContext));
writer.writeNameAttribute(clientId);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);