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/10/12 10:11:58 UTC
svn commit: r1708048 [2/3] - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
tobago-core/src/main/java/org/apache/myfaces...
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/LabelLayoutRendererBase.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/LabelLayoutRendererBase.java?rev=1708048&r1=1708047&r2=1708048&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/LabelLayoutRendererBase.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/LabelLayoutRendererBase.java Mon Oct 12 08:11:57 2015
@@ -118,7 +118,7 @@ public abstract class LabelLayoutRendere
}
// if (labelLayout != LabelLayout.none) {
- writer.startElement(HtmlElements.DIV, component);
+ writer.startElement(HtmlElements.DIV);
// }
// writer.writeClassAttribute(divClass, BootstrapClass.maximumSeverity(component));
// todo: check if BootstrapClass.FORM_GROUP is needed, I've removed it, because of it's margin-bottom: 15px;
@@ -183,7 +183,7 @@ public abstract class LabelLayoutRendere
// TBD: maybe use an interface for getLabel()
final String label = ComponentUtils.getStringAttribute(component, Attributes.LABEL);
if (StringUtils.isNotBlank(label)) {
- writer.startElement(HtmlElements.LABEL, component);
+ writer.startElement(HtmlElements.LABEL);
writer.writeAttribute(HtmlAttributes.FOR, component.getClientId(), false);
writer.writeClassAttribute(TobagoClass.LABEL);
// todo: label with accesskey
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/LabelRenderer.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/LabelRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/LabelRenderer.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/LabelRenderer.java Mon Oct 12 08:11:57 2015
@@ -67,7 +67,7 @@ public class LabelRenderer extends Rende
final String forValue = ComponentUtils.findClientIdFor(label, facesContext);
final String clientId = label.getClientId(facesContext);
- writer.startElement(HtmlElements.LABEL, label);
+ writer.startElement(HtmlElements.LABEL);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
writer.writeClassAttribute(Classes.create(label), BootstrapClass.CONTROL_LABEL, label.getCustomClass());
writer.writeStyleAttribute(label.getStyle());
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/LinkRenderer.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/LinkRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/LinkRenderer.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/LinkRenderer.java Mon Oct 12 08:11:57 2015
@@ -32,18 +32,13 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
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;
-import javax.faces.context.ResponseWriter;
import java.io.IOException;
public class LinkRenderer extends CommandRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(LinkRenderer.class);
-
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUILink link = (AbstractUILink) component;
@@ -54,9 +49,9 @@ public class LinkRenderer extends Comman
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (disabled) {
- writer.startElement(HtmlElements.SPAN, link);
+ writer.startElement(HtmlElements.SPAN);
} else {
- writer.startElement(HtmlElements.A, link);
+ writer.startElement(HtmlElements.A);
final CommandMap map = new CommandMap(new Command(facesContext, link));
writer.writeAttribute(DataAttributes.COMMANDS, JsonUtils.encode(map), true);
@@ -91,7 +86,7 @@ public class LinkRenderer extends Comman
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUILink link = (AbstractUILink) component;
- final ResponseWriter writer = facesContext.getResponseWriter();
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (link.isDisabled()) {
writer.endElement(HtmlElements.SPAN);
} else {
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/MediatorRenderer.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/MediatorRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/MediatorRenderer.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/MediatorRenderer.java Mon Oct 12 08:11:57 2015
@@ -40,7 +40,7 @@ public class MediatorRenderer extends Re
final UIMediator mediator = (UIMediator) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, mediator);
+ writer.startElement(HtmlElements.DIV);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, mediator);
writer.writeStyleAttribute(mediator.getStyle());
writer.writeClassAttribute(mediator.getCustomClass());
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/MenuBarRenderer.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/MenuBarRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/MenuBarRenderer.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/MenuBarRenderer.java Mon Oct 12 08:11:57 2015
@@ -40,7 +40,7 @@ public class MenuBarRenderer extends Ren
final UIMenuBar menuBar = (UIMenuBar) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.OL, menuBar);
+ writer.startElement(HtmlElements.OL);
writer.writeIdAttribute(menuBar.getClientId(facesContext));
writer.writeClassAttribute(
Classes.create(menuBar),
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/MenuCommandRenderer.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/MenuCommandRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/MenuCommandRenderer.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/MenuCommandRenderer.java Mon Oct 12 08:11:57 2015
@@ -122,8 +122,8 @@ public class MenuCommandRenderer extends
private void encodeHidden(final TobagoResponseWriter writer, final String hiddenId, final Object value)
throws IOException {
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeNameAttribute(hiddenId);
if (value != null) {
writer.writeAttribute(HtmlAttributes.VALUE, value.toString(), true);
@@ -138,7 +138,7 @@ public class MenuCommandRenderer extends
final String sub, final String clientId)
throws IOException {
- writer.startElement(HtmlElements.LI, null);
+ writer.startElement(HtmlElements.LI);
if (command != null && !command.isTransient()) {
writer.writeIdAttribute(command.getClientId(facesContext));
}
@@ -173,7 +173,7 @@ public class MenuCommandRenderer extends
iconStyle.setHeight(Measure.valueOf(16));
iconStyle.setWidth(Measure.valueOf(16));
- writer.startElement(HtmlElements.IMG, null);
+ writer.startElement(HtmlElements.IMG);
final String imageWithPath
= ResourceManagerUtils.getImageOrDisabledImage(facesContext, image, disabled);
writer.writeAttribute(HtmlAttributes.SRC, imageWithPath, false);
@@ -196,7 +196,7 @@ public class MenuCommandRenderer extends
}
}
- writer.startElement(HtmlElements.A, null);
+ writer.startElement(HtmlElements.A);
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
if (image != null && firstLevel) {
writer.writeStyleAttribute("vertical-align:top");
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/MenuRenderer.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/MenuRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/MenuRenderer.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/MenuRenderer.java Mon Oct 12 08:11:57 2015
@@ -63,7 +63,7 @@ public class MenuRenderer extends Render
final boolean firstLevel = !RendererTypes.MENU.equals(menu.getParent().getRendererType());
final boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
- writer.startElement(HtmlElements.LI, menu);
+ writer.startElement(HtmlElements.LI);
writer.writeClassAttribute(Classes.create(menu), BootstrapClass.DROPDOWN, menu.getCustomClass());
StringBuilder backgroundImage = null;
StringBuilder backgroundPosition = null;
@@ -98,7 +98,7 @@ public class MenuRenderer extends Render
style.setBackgroundPosition(backgroundPosition.toString());
writer.writeStyleAttribute(style);
}
- writer.startElement(HtmlElements.A, menu);
+ writer.startElement(HtmlElements.A);
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
if (!component.isTransient()) {
writer.writeIdAttribute(component.getClientId(facesContext));
@@ -114,7 +114,7 @@ public class MenuRenderer extends Render
writer.endElement(HtmlElements.A);
if (isParentMenu) {
- writer.startElement(HtmlElements.OL, menu);
+ writer.startElement(HtmlElements.OL);
writer.writeClassAttribute(BootstrapClass.DROPDOWN_MENU);
}
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/MenuSeparatorRenderer.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/MenuSeparatorRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/MenuSeparatorRenderer.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/MenuSeparatorRenderer.java Mon Oct 12 08:11:57 2015
@@ -34,9 +34,9 @@ public class MenuSeparatorRenderer exten
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.LI, component);
+ writer.startElement(HtmlElements.LI);
writer.writeClassAttribute(Classes.create(component));
- writer.startElement(HtmlElements.HR, component);
+ writer.startElement(HtmlElements.HR);
writer.endElement(HtmlElements.HR);
writer.endElement(HtmlElements.LI);
}
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=1708048&r1=1708047&r2=1708048&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 Mon Oct 12 08:11:57 2015
@@ -93,7 +93,7 @@ public class MessagesRenderer extends Re
clientIds = facesContext.getClientIdsWithMessages();
}*/
- writer.startElement(HtmlElements.DIV, messages);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(messages.getClientId(facesContext));
writer.writeClassAttribute(TobagoClass.MESSAGES);
@@ -109,18 +109,18 @@ public class MessagesRenderer extends Re
}
if (first || lastSeverity != severity) {
- writer.startElement(HtmlElements.DIV, messages);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(TobagoClass.MESSAGES,
BootstrapClass.ALERT, BootstrapClass.ALERT_DISMISSIBLE, BootstrapClass.alert(severity));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, messages);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.ALERT.toString(), false);
- writer.startElement(HtmlElements.BUTTON, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON, false);
+ writer.startElement(HtmlElements.BUTTON);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
writer.writeClassAttribute(BootstrapClass.CLOSE);
writer.writeAttribute(DataAttributes.DISMISS, "alert", false);
writer.writeAttribute(Aria.ACTIVEDESCENDANT, "Close", false); // todo: i18n
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeAttribute(Aria.HIDDEN, Boolean.TRUE.toString(), false);
writer.writeText("Ã"); // times
writer.endElement(HtmlElements.SPAN);
@@ -151,11 +151,11 @@ public class MessagesRenderer extends Re
*/
if (messages.getFor() == null) {
final String id = messages.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "messagesExists";
- writer.startElement(HtmlElements.INPUT, null);
+ writer.startElement(HtmlElements.INPUT);
writer.writeAttribute(HtmlAttributes.VALUE, Boolean.TRUE.toString(), false);
writer.writeAttribute(HtmlAttributes.ID, id, false);
writer.writeAttribute(HtmlAttributes.NAME, id, false);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.endElement(HtmlElements.INPUT);
}
}
@@ -237,7 +237,7 @@ public class MessagesRenderer extends Re
final String summary = message.getSummary();
final String detail = message.getDetail();
- writer.startElement(HtmlElements.LABEL, null);
+ writer.startElement(HtmlElements.LABEL);
if (clientId != null) {
writer.writeAttribute(HtmlAttributes.FOR, clientId, false);
}
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/NavRenderer.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/NavRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/NavRenderer.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/NavRenderer.java Mon Oct 12 08:11:57 2015
@@ -50,16 +50,16 @@ public class NavRenderer extends Rendere
final String clientId = nav.getClientId(facesContext);
final String navbarId = clientId + "::navbar";
- writer.startElement(HtmlElements.NAV, null);
+ writer.startElement(HtmlElements.NAV);
writer.writeIdAttribute(clientId);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.NAVIGATION.toString(), false);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.CONTAINER_FLUID);
encodeOpener(facesContext, nav, writer, navbarId);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(navbarId);
writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_COLLAPSE);
// XXX writer.writeClassAttribute(BootstrapClass.COLLAPSE, BootstrapClass.NAVBAR_COLLAPSE, BootstrapClass.NAVBAR_TEXT);
@@ -108,24 +108,24 @@ public class NavRenderer extends Rendere
// todo: consolidate this rendering with ToolBarRenderer
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.NAVBAR_HEADER);
- writer.startElement(HtmlElements.BUTTON, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON, false);
+ writer.startElement(HtmlElements.BUTTON);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
writer.writeClassAttribute(BootstrapClass.NAVBAR_TOGGLE, BootstrapClass.COLLAPSED);
writer.writeAttribute(DataAttributes.TOGGLE, "collapse", false);
writer.writeAttribute(DataAttributes.TARGET, JQueryUtils.escapeIdForHtml(navbarId), true);
writer.writeAttribute(Aria.EXPANDED, Boolean.FALSE.toString(), false);
writer.writeAttribute(Aria.CONTROLS, navbarId, false);
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(BootstrapClass.SR_ONLY);
writer.writeText("Toggle navigation"); // todo: i18n
writer.endElement(HtmlElements.SPAN);
for (int i = 0; i < 3; i++) {
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(BootstrapClass.ICON_BAR);
writer.endElement(HtmlElements.SPAN);
}
@@ -136,7 +136,7 @@ public class NavRenderer extends Rendere
if (image != null) {
final String src = ResourceManagerUtils.getImageWithPath(facesContext, image);
if (src != null) {
- writer.startElement(HtmlElements.IMG, null);
+ writer.startElement(HtmlElements.IMG);
writer.writeClassAttribute(BootstrapClass.NAVBAR_BRAND);
writer.writeAttribute(HtmlAttributes.SRC, src, true);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
@@ -146,7 +146,7 @@ public class NavRenderer extends Rendere
final String label = nav.getLabel();
if (label != null) {
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(BootstrapClass.NAVBAR_BRAND);
writer.writeText(label);
writer.endElement(HtmlElements.SPAN);
@@ -171,7 +171,7 @@ public class NavRenderer extends Rendere
public void mayStart() throws IOException {
if (!isInDiv) {
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.NAVBAR_FORM);
isInDiv = true;
}
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/ObjectRenderer.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/ObjectRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/ObjectRenderer.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/ObjectRenderer.java Mon Oct 12 08:11:57 2015
@@ -37,7 +37,7 @@ public class ObjectRenderer extends Rend
final UIObject object = (UIObject) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.IFRAME, object);
+ writer.startElement(HtmlElements.IFRAME);
writer.writeAttribute(HtmlAttributes.FRAMEBORDER, "0", false);
final String clientId = object.getClientId(facesContext);
writer.writeIdAttribute(clientId);
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/OutRenderer.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/OutRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/OutRenderer.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/OutRenderer.java Mon Oct 12 08:11:57 2015
@@ -54,7 +54,7 @@ public class OutRenderer extends LabelLa
if (createSpan) {
final String id = out.getClientId(facesContext);
- writer.startElement(HtmlElements.SPAN, out);
+ writer.startElement(HtmlElements.SPAN);
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, out);
writer.writeStyleAttribute(out.getStyle());
@@ -70,7 +70,7 @@ public class OutRenderer extends LabelLa
final String token = tokenizer.nextToken();
writer.writeText(token);
if (tokenizer.hasMoreTokens()) {
- writer.startElement(HtmlElements.BR, null);
+ writer.startElement(HtmlElements.BR);
writer.endElement(HtmlElements.BR);
}
}
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=1708048&r1=1708047&r2=1708048&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 Mon Oct 12 08:11:57 2015
@@ -150,18 +150,18 @@ public class PageRenderer extends Render
if (!FacesContextUtils.isAjax(facesContext)) {
final String title = (String) page.getAttributes().get(Attributes.LABEL);
- writer.startElement(HtmlElements.HEAD, null);
+ writer.startElement(HtmlElements.HEAD);
// meta tags
// this is needed, because websphere 6.0? ignores the setting of the content type on the response
- writer.startElement(HtmlElements.META, null);
+ writer.startElement(HtmlElements.META);
writer.writeAttribute(HtmlAttributes.HTTP_EQUIV, "Content-Type", false);
writer.writeAttribute(HtmlAttributes.CONTENT, contentType, false);
writer.endElement(HtmlElements.META);
// title
- writer.startElement(HtmlElements.TITLE, null);
+ writer.startElement(HtmlElements.TITLE);
writer.writeText(title != null ? title : "");
writer.endElement(HtmlElements.TITLE);
final Theme theme = client.getTheme();
@@ -189,7 +189,7 @@ public class PageRenderer extends Render
}
if (href != null) {
- writer.startElement(HtmlElements.LINK, null);
+ writer.startElement(HtmlElements.LINK);
if (href.endsWith(".ico")) {
writer.writeAttribute(HtmlAttributes.REL, "shortcut icon", false);
writer.writeAttribute(HtmlAttributes.HREF, href, true);
@@ -221,7 +221,7 @@ public class PageRenderer extends Render
writer.endElement(HtmlElements.HEAD);
}
- writer.startElement(portlet ? HtmlElements.DIV : HtmlElements.BODY, page);
+ writer.startElement(portlet ? HtmlElements.DIV : HtmlElements.BODY);
writer.writeClassAttribute(
portlet ? Classes.create(page, Markup.PORTLET) : Classes.create(page),
BootstrapClass.CONTAINER_FLUID,
@@ -230,7 +230,7 @@ public class PageRenderer extends Render
HtmlRendererUtils.writeDataAttributes(facesContext, writer, page);
HtmlRendererUtils.renderCommandFacet(page, facesContext, writer);
- writer.startElement(HtmlElements.FORM, page);
+ writer.startElement(HtmlElements.FORM);
if (preventFrameAttacks && !FacesContextUtils.isAjax(facesContext)) {
writer.writeClassAttribute(Classes.create(page, "preventFrameAttacks", Markup.NULL));
}
@@ -251,21 +251,21 @@ public class PageRenderer extends Render
writer.writeAttribute(HtmlAttributes.ACCEPT_CHARSET, AbstractUIPage.FORM_ACCEPT_CHARSET, false);
// TODO evaluate 'accept' attribute usage
//writer.writeAttribute(HtmlAttributes.ACCEPT, );
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeNameAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-action");
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-action");
writer.endElement(HtmlElements.INPUT);
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeNameAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "context-path");
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "context-path");
writer.writeAttribute(HtmlAttributes.VALUE, externalContext.getRequestContextPath(), true);
writer.endElement(HtmlElements.INPUT);
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeNameAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-clientDimension");
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-clientDimension");
writer.endElement(HtmlElements.INPUT);
@@ -312,7 +312,7 @@ public class PageRenderer extends Render
final List<String> styles = ResourceManagerUtils.getStyles(facesContext, styleFile);
for (final String styleString : styles) {
if (styleString.length() > 0) {
- writer.startElement(HtmlElements.LINK, null);
+ writer.startElement(HtmlElements.LINK);
writer.writeAttribute(HtmlAttributes.REL, "stylesheet", false);
writer.writeAttribute(HtmlAttributes.HREF, styleString, true);
// writer.writeAttribute(HtmlAttributes.MEDIA, "screen", false);
@@ -353,8 +353,8 @@ public class PageRenderer extends Render
// avoid submit page in ie if the form contains only one input and you press the enter key in the input
if (clientProperties.getUserAgent().isMsie()) {
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.TEXT, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.TEXT);
writer.writeAttribute(HtmlAttributes.NAME, "tobago.dummy", false);
writer.writeAttribute(HtmlAttributes.TABINDEX, -1);
writer.writeAttribute(HtmlAttributes.STYLE, "visibility:hidden;display:none;", false);
@@ -363,23 +363,23 @@ public class PageRenderer extends Render
final List<String> messageClientIds = AjaxInternalUtils.getMessagesClientIds(facesContext);
if (messageClientIds != null) {
- writer.startElement(HtmlElements.INPUT, null);
+ writer.startElement(HtmlElements.INPUT);
writer.writeAttribute(HtmlAttributes.VALUE, StringUtils.join(messageClientIds, ','), true);
writer.writeAttribute(HtmlAttributes.ID, clientId + ComponentUtils.SUB_SEPARATOR + "messagesClientIds", false);
writer.writeAttribute(HtmlAttributes.NAME, clientId + ComponentUtils.SUB_SEPARATOR + "messagesClientIds", false);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.endElement(HtmlElements.INPUT);
}
// placeholder for menus
- writer.startElement(HtmlElements.DIV, page);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(page, "menuStore"));
writer.endElement(HtmlElements.DIV);
final Application application = facesContext.getApplication();
final ViewHandler viewHandler = application.getViewHandler();
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "jsf-state-container");
writer.flush();
if (!FacesContextUtils.isAjax(facesContext)) {
@@ -390,15 +390,15 @@ public class PageRenderer extends Render
writer.endElement(HtmlElements.FORM);
- writer.startElement(HtmlElements.IMG, null);
+ writer.startElement(HtmlElements.IMG);
writer.writeClassAttribute(Classes.create(page, "overlayBackgroundImage"));
final String overlayBackgroundImage = ResourceManagerUtils.getImage(facesContext,
"image/tobago-overlay-background");
writer.writeAttribute(HtmlAttributes.SRC, overlayBackgroundImage, true);
writer.endElement(HtmlElements.IMG);
- writer.startElement(HtmlElements.NOSCRIPT, null);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.NOSCRIPT);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(page, "noscript"));
writer.writeText(ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "pageNoscript"));
writer.endElement(HtmlElements.DIV);
@@ -462,7 +462,7 @@ public class PageRenderer extends Render
}
for (final String src : list) {
if (StringUtils.isNotBlank(src)) {
- writer.startElement(HtmlElements.SCRIPT, null);
+ writer.startElement(HtmlElements.SCRIPT);
writer.writeAttribute(HtmlAttributes.SRC, src, true);
// TODO test defer attribute
//writer.writeAttribute(HtmlAttributes.DEFER, true);
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=1708048&r1=1708047&r2=1708048&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 Mon Oct 12 08:11:57 2015
@@ -34,7 +34,6 @@ import org.apache.myfaces.tobago.webapp.
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import java.io.IOException;
public class PanelRenderer extends RendererBase {
@@ -59,7 +58,7 @@ public class PanelRenderer extends Rende
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final String clientId = panel.getClientId(facesContext);
- writer.startElement(HtmlElements.DIV, panel);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(clientId);
writer.writeClassAttribute(Classes.create(panel), panel.getCustomClass());
writer.writeStyleAttribute(panel.getStyle());
@@ -83,7 +82,7 @@ public class PanelRenderer extends Rende
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final ResponseWriter writer = facesContext.getResponseWriter();
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
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=1708048&r1=1708047&r2=1708048&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 Mon Oct 12 08:11:57 2015
@@ -49,13 +49,13 @@ public class PopupRenderer extends Rende
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
final UIPopup popup = (UIPopup) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(TobagoClass.POPUP, BootstrapClass.MODAL, BootstrapClass.FADE);
writer.writeIdAttribute(popup.getClientId(facesContext));
writer.writeAttribute(HtmlAttributes.TABINDEX, -1);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.DIALOG.toString(), false);
// todo: aria-labelledby
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.MODAL_DIALOG);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.DOCUMENT.toString(), false);
/*
@@ -64,7 +64,7 @@ public class PopupRenderer extends Rende
style.setHeight(popup.getHeight());
writer.writeStyleAttribute(style);
*/
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
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/ProgressRenderer.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/ProgressRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/ProgressRenderer.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/ProgressRenderer.java Mon Oct 12 08:11:57 2015
@@ -61,7 +61,7 @@ public class ProgressRenderer extends Re
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, progress);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(progress), progress.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, progress);
writer.writeStyleAttribute(progress.getStyle());
@@ -72,7 +72,7 @@ public class ProgressRenderer extends Re
if (model.getValue() == model.getMaximum() && facet instanceof UICommand) {
HtmlRendererUtils.renderCommandFacet(progress, facesContext, writer);
}
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(progress, "value"));
writer.writeStyleAttribute("width: " + percent + "%");
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/SectionRenderer.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/SectionRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SectionRenderer.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/SectionRenderer.java Mon Oct 12 08:11:57 2015
@@ -39,14 +39,14 @@ public class SectionRenderer extends Ren
final UISection section = (UISection) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, section);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(section.getClientId(facesContext));
writer.writeClassAttribute(Classes.create(section), section.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, section);
String label = section.getLabelToRender();
CssItem clazz = null;
- final String tag;
+ final HtmlElements tag;
switch (section.getLevel()) {
case 1:
tag = HtmlElements.H1;
@@ -68,7 +68,7 @@ public class SectionRenderer extends Ren
tag = HtmlElements.H6;
}
- writer.startElement(tag, section);
+ writer.startElement(tag);
if (clazz != null) {
writer.writeClassAttribute(clazz);
}
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=1708048&r1=1708047&r2=1708048&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 Mon Oct 12 08:11:57 2015
@@ -57,7 +57,7 @@ public class SegmentLayoutRenderer exten
final AbstractUISegmentLayout segmentLayout = (AbstractUISegmentLayout) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, segmentLayout);
+ writer.startElement(HtmlElements.DIV);
// writer.writeClassAttribute("row");
// writer.writeClassAttribute(BootstrapClass.FORM_HORIZONTAL, BootstrapClass.CONTAINER_FLUID);
writer.writeClassAttribute(BootstrapClass.FORM_GROUP);
@@ -119,7 +119,7 @@ public class SegmentLayoutRenderer exten
private void encodeDiv(
FacesContext facesContext, TobagoResponseWriter writer, BootstrapClassGenerator generator, UIComponent child)
throws IOException {
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute((CssItem) null, generator.generate());
RenderUtils.encode(facesContext, child);
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/SelectBooleanCheckboxRenderer.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/SelectBooleanCheckboxRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectBooleanCheckboxRenderer.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/SelectBooleanCheckboxRenderer.java Mon Oct 12 08:11:57 2015
@@ -81,7 +81,7 @@ public class SelectBooleanCheckboxRender
final boolean disabled = select.isDisabled();
final LabelWithAccessKey label = new LabelWithAccessKey(select);
- writer.startElement(HtmlElements.DIV, select);
+ writer.startElement(HtmlElements.DIV);
writer.writeStyleAttribute(select.getStyle());
writer.writeClassAttribute(
Classes.create(select),
@@ -93,14 +93,14 @@ public class SelectBooleanCheckboxRender
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- writer.startElement(HtmlElements.LABEL, select);
+ writer.startElement(HtmlElements.LABEL);
if (!disabled && label.getAccessKey() != null) {
writer.writeAttribute(HtmlAttributes.ACCESSKEY, Character.toString(label.getAccessKey()), false);
AccessKeyLogger.addAccessKey(facesContext, label.getAccessKey(), clientId);
}
- writer.startElement(HtmlElements.INPUT, select);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
writer.writeAttribute(HtmlAttributes.VALUE, "true", false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
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/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java Mon Oct 12 08:11:57 2015
@@ -59,7 +59,7 @@ public class SelectManyCheckboxRenderer
final boolean readonly = select.isReadonly();
final boolean required = select.isRequired();
- writer.startElement(HtmlElements.OL, select);
+ writer.startElement(HtmlElements.OL);
writer.writeIdAttribute(id);
writer.writeStyleAttribute(select.getStyle());
writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
@@ -74,15 +74,15 @@ public class SelectManyCheckboxRenderer
for (final SelectItem item : SelectItemUtils.getItemIterator(facesContext, select)) {
final boolean itemDisabled = item.isDisabled() || disabled;
final String itemId = id + ComponentUtils.SUB_SEPARATOR + i++;
- writer.startElement(HtmlElements.LI, select);
+ writer.startElement(HtmlElements.LI);
if (itemDisabled) {
writer.writeClassAttribute(BootstrapClass.CHECKBOX, BootstrapClass.DISABLED);
} else {
writer.writeClassAttribute(BootstrapClass.CHECKBOX);
}
- writer.startElement(HtmlElements.LABEL, select);
- writer.startElement(HtmlElements.INPUT, select);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX, false);
+ writer.startElement(HtmlElements.LABEL);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
final String formattedValue = RenderUtils.getFormattedValue(facesContext, select, item.getValue());
boolean checked;
if (submittedValues == 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/SelectManyListboxRenderer.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/SelectManyListboxRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectManyListboxRenderer.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/SelectManyListboxRenderer.java Mon Oct 12 08:11:57 2015
@@ -52,7 +52,7 @@ public class SelectManyListboxRenderer e
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || readonly;
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
- writer.startElement(HtmlElements.SELECT, select);
+ writer.startElement(HtmlElements.SELECT);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
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/SelectManyShuttleRenderer.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/SelectManyShuttleRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectManyShuttleRenderer.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/SelectManyShuttleRenderer.java Mon Oct 12 08:11:57 2015
@@ -42,7 +42,7 @@ public class SelectManyShuttleRenderer e
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyShuttle select = (UISelectManyShuttle) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, select);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
final String clientId = select.getClientId(facesContext);
writer.writeIdAttribute(clientId);
@@ -57,13 +57,13 @@ public class SelectManyShuttleRenderer e
final String unselectedLabel = select.getUnselectedLabel();
if (unselectedLabel != null) {
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(select, "unselectedLabel"));
writer.flush(); // is needed in some cases, e. g. TOBAGO-1094
writer.write(unselectedLabel);
writer.endElement(HtmlElements.DIV);
}
- writer.startElement(HtmlElements.SELECT, null);
+ writer.startElement(HtmlElements.SELECT);
final String unselectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "unselected";
writer.writeIdAttribute(unselectedClientId);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
@@ -83,7 +83,7 @@ public class SelectManyShuttleRenderer e
HtmlRendererUtils.renderSelectItems(select, items, values, submittedValues, false, writer, facesContext);
writer.endElement(HtmlElements.SELECT);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(select, "toolBar"));
createButton(facesContext, component, writer, disabled, "image/selectManyShuttleAddAll", "addAll");
createButton(facesContext, component, writer, disabled, "image/selectManyShuttleAdd", "add");
@@ -92,14 +92,14 @@ public class SelectManyShuttleRenderer e
writer.endElement(HtmlElements.DIV);
final String selectedLabel = select.getSelectedLabel();
if (selectedLabel != null) {
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(select, "selectedLabel"));
writer.flush(); // is needed in some cases, e. g. TOBAGO-1094
writer.write(selectedLabel);
writer.endElement(HtmlElements.DIV);
}
- writer.startElement(HtmlElements.SELECT, select);
+ writer.startElement(HtmlElements.SELECT);
final String selectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "selected";
writer.writeIdAttribute(selectedClientId);
@@ -113,7 +113,7 @@ public class SelectManyShuttleRenderer e
HtmlRendererUtils.renderSelectItems(select, items, values, submittedValues, true, writer, facesContext);
writer.endElement(HtmlElements.SELECT);
- writer.startElement(HtmlElements.SELECT, select);
+ writer.startElement(HtmlElements.SELECT);
writer.writeClassAttribute(Classes.create(component, "hidden"));
final String hiddenClientId = clientId + ComponentUtils.SUB_SEPARATOR + "hidden";
writer.writeIdAttribute(hiddenClientId);
@@ -135,13 +135,13 @@ public class SelectManyShuttleRenderer e
private void createButton(final FacesContext context, final UIComponent component, final TobagoResponseWriter writer,
final boolean disabled, final String image, final String sub) throws IOException {
- writer.startElement(HtmlElements.BUTTON, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON, false);
+ writer.startElement(HtmlElements.BUTTON);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
writer.writeClassAttribute(Classes.create(component, sub));
writer.writeIdAttribute(component.getClientId(context) + ComponentUtils.SUB_SEPARATOR + sub);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
final String imagePath = ResourceManagerUtils.getImageOrDisabledImage(context, image, disabled);
- writer.startElement(HtmlElements.IMG, null);
+ writer.startElement(HtmlElements.IMG);
writer.writeAttribute(HtmlAttributes.SRC, imagePath, true);
writer.endElement(HtmlElements.IMG);
writer.endElement(HtmlElements.BUTTON);
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/SelectOneChoiceRenderer.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/SelectOneChoiceRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectOneChoiceRenderer.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/SelectOneChoiceRenderer.java Mon Oct 12 08:11:57 2015
@@ -49,7 +49,7 @@ public class SelectOneChoiceRenderer ext
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || select.isReadonly();
- writer.startElement(HtmlElements.SELECT, select);
+ writer.startElement(HtmlElements.SELECT);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
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/SelectOneListboxRenderer.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/SelectOneListboxRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectOneListboxRenderer.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/SelectOneListboxRenderer.java Mon Oct 12 08:11:57 2015
@@ -48,7 +48,7 @@ public class SelectOneListboxRenderer ex
final Iterable<SelectItem> items = SelectItemUtils.getItemIterator(facesContext, select);
final boolean disabled = !items.iterator().hasNext() || select.isDisabled() || select.isReadonly();
- writer.startElement(HtmlElements.SELECT, select);
+ writer.startElement(HtmlElements.SELECT);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java Mon Oct 12 08:11:57 2015
@@ -61,7 +61,7 @@ public class SelectOneRadioRenderer exte
final boolean readonly = select.isReadonly();
final boolean required = select.isRequired();
- writer.startElement(HtmlElements.OL, select);
+ writer.startElement(HtmlElements.OL);
writer.writeIdAttribute(id);
writer.writeStyleAttribute(select.getStyle());
writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
@@ -76,15 +76,15 @@ public class SelectOneRadioRenderer exte
for (final SelectItem item : items) {
final boolean itemDisabled = item.isDisabled() || disabled;
final String itemId = id + ComponentUtils.SUB_SEPARATOR + i++;
- writer.startElement(HtmlElements.LI, select);
+ writer.startElement(HtmlElements.LI);
if (itemDisabled) {
writer.writeClassAttribute(BootstrapClass.RADIO, BootstrapClass.DISABLED);
} else {
writer.writeClassAttribute(BootstrapClass.RADIO);
}
- writer.startElement(HtmlElements.LABEL, null);
- writer.startElement(HtmlElements.INPUT, select);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.RADIO, false);
+ writer.startElement(HtmlElements.LABEL);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.RADIO);
final String formattedValue = RenderUtils.getFormattedValue(facesContext, select, item.getValue());
boolean checked;
if (submittedValue == null) {
@@ -116,7 +116,7 @@ public class SelectOneRadioRenderer exte
if (image != null) {
final String imageToRender
= ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, item.isDisabled());
- writer.startElement(HtmlElements.IMG, select);
+ writer.startElement(HtmlElements.IMG);
writer.writeAttribute(HtmlAttributes.SRC, imageToRender, true);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.endElement(HtmlElements.IMG);
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/SeparatorRenderer.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/SeparatorRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/SeparatorRenderer.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/SeparatorRenderer.java Mon Oct 12 08:11:57 2015
@@ -43,20 +43,20 @@ public class SeparatorRenderer extends R
final String label = getLabel(separator);
if (label != null) {
- writer.startElement(HtmlElements.FIELDSET, separator);
+ writer.startElement(HtmlElements.FIELDSET);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.PRESENTATION.toString(), false);
writer.writeIdAttribute(separator.getClientId(facesContext));
writer.writeClassAttribute(Classes.create(separator), separator.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, separator);
- writer.startElement(HtmlElements.LEGEND, separator);
+ writer.startElement(HtmlElements.LEGEND);
writer.writeClassAttribute(Classes.create(separator, "label"));
writer.writeText(label);
writer.endElement(HtmlElements.LEGEND);
writer.endElement(HtmlElements.FIELDSET);
} else {
- writer.startElement(HtmlElements.HR , separator);
+ writer.startElement(HtmlElements.HR);
writer.writeIdAttribute(separator.getClientId(facesContext));
writer.writeClassAttribute(Classes.create(separator), separator.getCustomClass());
writer.endElement(HtmlElements.HR);
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=1708048&r1=1708047&r2=1708048&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 Mon Oct 12 08:11:57 2015
@@ -143,7 +143,7 @@ public class SheetRenderer extends Rende
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
// Outer sheet div
- writer.startElement(HtmlElements.DIV, sheet);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(sheetId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, sheet);
writer.writeClassAttribute(Classes.create(sheet), sheet.getCustomClass());
@@ -181,27 +181,27 @@ public class SheetRenderer extends Rende
final List<Integer> selectedRows = getSelectedRows(sheet, state);
final List<AbstractUIColumn> renderedColumnList = sheet.getRenderedColumns();
- writer.startElement(HtmlElements.INPUT, null);
+ writer.startElement(HtmlElements.INPUT);
writer.writeIdAttribute(sheetId + WIDTHS_POSTFIX);
writer.writeNameAttribute(sheetId + WIDTHS_POSTFIX);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeAttribute(HtmlAttributes.VALUE, StringUtils.joinWithSurroundingSeparator(columnWidths), false);
writer.endElement(HtmlElements.INPUT);
RenderUtils.writeScrollPosition(facesContext, writer, sheet, sheet.getScrollPosition());
if (selectable != Selectable.none) {
- writer.startElement(HtmlElements.INPUT, null);
+ writer.startElement(HtmlElements.INPUT);
writer.writeIdAttribute(sheetId + SELECTED_POSTFIX);
writer.writeNameAttribute(sheetId + SELECTED_POSTFIX);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeAttribute(
HtmlAttributes.VALUE, StringUtils.joinWithSurroundingSeparator(selectedRows), true);
writer.endElement(HtmlElements.INPUT);
}
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
final String hiddenId = sheetId + UINamingContainer.getSeparatorChar(facesContext)
+ PageAction.TO_PAGE.getToken() + ComponentUtils.SUB_SEPARATOR + "value";
writer.writeAttribute(HtmlAttributes.NAME, hiddenId, false);
@@ -223,11 +223,11 @@ public class SheetRenderer extends Rende
renderColumnHeaders(facesContext, sheet, writer, renderedColumnList);
}
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(sheetId + ComponentUtils.SUB_SEPARATOR + "data_div");
writer.writeClassAttribute(Classes.create(sheet, "body"));
- writer.startElement(HtmlElements.TABLE, null);
+ writer.startElement(HtmlElements.TABLE);
writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", false);
writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", false);
writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
@@ -277,7 +277,7 @@ public class SheetRenderer extends Rende
}
}
- writer.startElement(HtmlElements.TR, null);
+ writer.startElement(HtmlElements.TR);
if (rowRendered instanceof Boolean) {
// if rowRendered attribute is set we need the rowIndex on the client
writer.writeAttribute(DataAttributes.ROW_INDEX, rowIndex);
@@ -306,7 +306,7 @@ public class SheetRenderer extends Rende
for (final UIColumn column : renderedColumnList) {
columnIndex++;
- writer.startElement(HtmlElements.TD, column);
+ writer.startElement(HtmlElements.TD);
Markup markup = column instanceof Visual ? ((Visual) column).getMarkup() : Markup.NULL;
if (markup == null) {
@@ -341,8 +341,8 @@ public class SheetRenderer extends Rende
if (column instanceof UIColumnSelector) {
final boolean disabled = ComponentUtils.getBooleanAttribute(column, Attributes.DISABLED);
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
writer.writeAttribute(HtmlAttributes.CHECKED, selected);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
writer.writeIdAttribute(sheetId + "_data_row_selector_" + rowIndex);
@@ -376,10 +376,10 @@ public class SheetRenderer extends Rende
writer.endElement(HtmlElements.TD);
}
- writer.startElement(HtmlElements.TD, null);
+ writer.startElement(HtmlElements.TD);
writer.writeClassAttribute(Classes.create(sheet, "cell", Markup.FILLER));
// writer.write(" ");
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.TD);
@@ -389,12 +389,12 @@ public class SheetRenderer extends Rende
sheet.setRowIndex(-1);
if (emptySheet && showHeader) {
- writer.startElement(HtmlElements.TR, null);
+ writer.startElement(HtmlElements.TR);
int columnIndex = -1;
for (final UIColumn ignored : renderedColumnList) {
columnIndex++;
- writer.startElement(HtmlElements.TD, null);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.TD);
+ writer.startElement(HtmlElements.DIV);
if (columnWidths != null) {
final Integer divWidth = columnWidths.get(columnIndex);
final Style divStyle = new Style();
@@ -404,10 +404,10 @@ public class SheetRenderer extends Rende
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.TD);
}
- writer.startElement(HtmlElements.TD, null);
+ writer.startElement(HtmlElements.TD);
writer.writeClassAttribute(Classes.create(sheet, "cell", Markup.FILLER));
// writer.write(" ");
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.TD);
writer.endElement(HtmlElements.TR);
@@ -421,7 +421,7 @@ public class SheetRenderer extends Rende
if (sheet.isPagingVisible()) {
// final Style footerStyle = new Style();
// footerStyle.setWidth(sheet.getCurrentWidth());
- writer.startElement(HtmlElements.FOOTER, sheet);
+ writer.startElement(HtmlElements.FOOTER);
writer.writeClassAttribute(Classes.create(sheet, "footer"));
// writer.writeStyleAttribute(footerStyle);
@@ -435,7 +435,7 @@ public class SheetRenderer extends Rende
}
final String pagerCommandId = pagerCommand.getClientId(facesContext);
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(Classes.create(sheet, "pagingOuter", showRowRange));
writer.writeAttribute(HtmlAttributes.TITLE,
ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetPagingInfoRowPagingTip"), true);
@@ -447,7 +447,7 @@ public class SheetRenderer extends Rende
// show direct links
final Markup showDirectLinks = markupForLeftCenterRight(sheet.getShowDirectLinks());
if (showDirectLinks != Markup.NULL) {
- writer.startElement(HtmlElements.UL, null);
+ writer.startElement(HtmlElements.UL);
writer.writeClassAttribute(
Classes.create(sheet, "pagingOuter", showDirectLinks),
BootstrapClass.PAGINATION, TobagoClass.SHEET__PAGING_LINKS);
@@ -477,7 +477,7 @@ public class SheetRenderer extends Rende
}
final String pagerCommandId = pagerCommand.getClientId(facesContext);
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(
Classes.create(sheet, "pagingOuter", showPageRange), TobagoClass.SHEET__PAGING_PAGES);
String areaId = "pagingPages";
@@ -489,7 +489,7 @@ public class SheetRenderer extends Rende
link(facesContext, application, areaId, atBeginning, PageAction.FIRST, sheet);
link(facesContext, application, areaId, atBeginning, PageAction.PREV, sheet);
}
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(Classes.create(sheet, "pagingText"));
writer.writeAttribute(HtmlAttributes.TITLE,
ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetPagingInfoPagePagingTip"), true);
@@ -523,13 +523,13 @@ public class SheetRenderer extends Rende
final MessageFormat detail2 = new MessageFormat(
ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", key + "2"), locale);
writer.write(detail1.format(args));
- writer.startElement(HtmlElements.SPAN, null);
- writer.writeClassAttribute("tobago-sheet-pagingOutput"); // todo
+ writer.startElement(HtmlElements.SPAN);
+ writer.writeClassAttribute(TobagoClass.SHEET__PAGING_OUTPUT);
writer.writeText(Integer.toString(first));
writer.endElement(HtmlElements.SPAN);
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.TEXT, false);
- writer.writeClassAttribute("tobago-sheet-pagingInput"); // todo
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.TEXT);
+ writer.writeClassAttribute(TobagoClass.SHEET__PAGING_INPUT);
writer.writeAttribute(HtmlAttributes.VALUE, first);
if (!unknown) {
writer.writeAttribute(HtmlAttributes.MAXLENGTH, Integer.toString(pages).length());
@@ -552,8 +552,8 @@ public class SheetRenderer extends Rende
}
if (sheet.isTreeModel()) {
- writer.startElement(HtmlElements.INPUT, sheet);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
final String expandedId = sheetId + ComponentUtils.SUB_SEPARATOR + AbstractUIData.SUFFIX_EXPANDED;
writer.writeNameAttribute(expandedId);
writer.writeIdAttribute(expandedId);
@@ -565,7 +565,7 @@ public class SheetRenderer extends Rende
private void writeColgroup(final TobagoResponseWriter writer, final List<Integer> columnWidths) throws IOException {
if (columnWidths != null) {
- writer.startElement(HtmlElements.COLGROUP, null);
+ writer.startElement(HtmlElements.COLGROUP);
for (final Integer columnWidth : columnWidths) {
writeCol(writer, columnWidth);
}
@@ -577,7 +577,7 @@ public class SheetRenderer extends Rende
}
private void writeCol(final TobagoResponseWriter writer, final Integer columnWidth) throws IOException {
- writer.startElement(HtmlElements.COL, null);
+ writer.startElement(HtmlElements.COL);
if (columnWidth != null) {
writer.writeAttribute(HtmlAttributes.WIDTH, columnWidth);
}
@@ -736,7 +736,7 @@ public class SheetRenderer extends Rende
"image/sheet" + command.getToken() + (disabled ? "Disabled" : ""));
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.IMG, null);
+ writer.startElement(HtmlElements.IMG);
writer.writeIdAttribute(data.getClientId(facesContext)
+ ComponentUtils.SUB_SEPARATOR + areaId + ComponentUtils.SUB_SEPARATOR + "pagingArrows"
+ ComponentUtils.SUB_SEPARATOR + command.getToken());
@@ -773,9 +773,9 @@ public class SheetRenderer extends Rende
LOG.debug("*****************************************************");
}
- writer.startElement(HtmlElements.HEADER, sheet);
+ writer.startElement(HtmlElements.HEADER);
writer.writeClassAttribute(Classes.create(sheet, "header"));
- writer.startElement(HtmlElements.TABLE, sheet);
+ writer.startElement(HtmlElements.TABLE);
writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", false);
writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", false);
writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
@@ -784,14 +784,14 @@ public class SheetRenderer extends Rende
writeColgroup(writer, columnWidths);
- writer.startElement(HtmlElements.TBODY, sheet);
+ writer.startElement(HtmlElements.TBODY);
for (int i = 0; i < grid.getRowCount(); i++) {
- writer.startElement(HtmlElements.TR, null);
+ writer.startElement(HtmlElements.TR);
for (int j = 0; j < grid.getColumnCount(); j++) {
final Cell cell = grid.getCell(j, i);
if (cell instanceof OriginCell) {
// writer.startElement(HtmlElements.TD, null);
- writer.startElement(HtmlElements.TH, null);
+ writer.startElement(HtmlElements.TH);
if (cell.getColumnSpan() > 1) {
writer.writeAttribute(HtmlAttributes.COLSPAN, cell.getColumnSpan());
}
@@ -802,9 +802,9 @@ public class SheetRenderer extends Rende
final UIComponent cellComponent = cell.getComponent();
final boolean pure = !(cellComponent instanceof UIOut);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(sheet, "headerCell"));
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
final Style headerStyle = new Style();
Measure headerHeight = Measure.valueOf(20).multiply(cell.getRowSpan());
if (!pure) {
@@ -884,10 +884,10 @@ public class SheetRenderer extends Rende
// render sub menu popup button
if (dropDownMenu != null && dropDownMenu.isRendered()) {
- writer.startElement(HtmlElements.SPAN, column);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(Classes.create(column, "menu"));
- writer.startElement(HtmlElements.IMG, column);
+ writer.startElement(HtmlElements.IMG);
final String menuImage
= ResourceManagerUtils.getImage(facesContext, "image/sheetSelectorMenu");
writer.writeAttribute(HtmlAttributes.TITLE, "", false);
@@ -901,7 +901,7 @@ public class SheetRenderer extends Rende
}
if (sorterGlyphicon != null) {
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(BootstrapClass.GLYPHICON, sorterGlyphicon);
writer.endElement(HtmlElements.SPAN);
}
@@ -918,11 +918,11 @@ public class SheetRenderer extends Rende
}
// add a filler column
// writer.startElement(HtmlElements.TD, null);
- writer.startElement(HtmlElements.TH, null);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.TH);
+ writer.startElement(HtmlElements.DIV);
// todo: is the filler class needed here?
writer.writeClassAttribute(Classes.create(sheet, "headerCell", Markup.FILLER));
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(Classes.create(sheet, "header"));
final Style headerStyle = new Style();
headerStyle.setHeight(Measure.valueOf(14)); // XXX todo
@@ -955,7 +955,7 @@ public class SheetRenderer extends Rende
throws IOException {
final UIToolBar toolBar = createToolBar(facesContext, sheet);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(sheet, "toolBar"));
if (UISheet.MULTI.equals(sheet.getSelectable())) {
@@ -1117,16 +1117,16 @@ public class SheetRenderer extends Rende
final TobagoResponseWriter writer, final UISheet sheet, final String name, final Integer toPage,
final PagingLinkType pagingLinkType)
throws IOException {
- String innerElement = pagingLinkType == PagingLinkType.NORMAL ? HtmlElements.A : HtmlElements.SPAN;
+ HtmlElements innerElement = pagingLinkType == PagingLinkType.NORMAL ? HtmlElements.A : HtmlElements.SPAN;
- writer.startElement(HtmlElements.LI, null);
+ writer.startElement(HtmlElements.LI);
if (pagingLinkType == PagingLinkType.CURRENT) {
writer.writeClassAttribute(BootstrapClass.ACTIVE);
}
if (pagingLinkType == PagingLinkType.DISABLED) {
writer.writeClassAttribute(BootstrapClass.DISABLED);
}
- writer.startElement(innerElement, null);
+ writer.startElement(innerElement);
writer.writeClassAttribute(Classes.create(sheet, "pagingLink"));
if (pagingLinkType == PagingLinkType.NORMAL) {
writer.writeAttribute(DataAttributes.TO_PAGE, toPage);
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/TabGroupRenderer.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/TabGroupRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/TabGroupRenderer.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/TabGroupRenderer.java Mon Oct 12 08:11:57 2015
@@ -102,7 +102,7 @@ public class TabGroupRenderer extends Re
final String switchType = tabGroup.getSwitchType();
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(clientId);
writer.writeClassAttribute(Classes.create(tabGroup), tabGroup.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, tabGroup);
@@ -114,8 +114,8 @@ public class TabGroupRenderer extends Re
writer.writeAttribute(DataAttributes.PARTIAL_IDS, JsonUtils.encode(clientIds), true);
}
- writer.startElement(HtmlElements.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
writer.writeAttribute(HtmlAttributes.VALUE, activeIndex);
writer.writeNameAttribute(hiddenId);
writer.writeIdAttribute(hiddenId);
@@ -177,10 +177,10 @@ public class TabGroupRenderer extends Re
final int activeIndex)
throws IOException {
- writer.startElement(HtmlElements.DIV, tabGroup);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(tabGroup, "header"));
- writer.startElement(HtmlElements.UL, tabGroup);
+ writer.startElement(HtmlElements.UL);
writer.writeClassAttribute(Classes.create(tabGroup, "headerInner"), BootstrapClass.NAV, BootstrapClass.NAV_TABS);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.TABLIST.toString(), false);
@@ -200,7 +200,7 @@ public class TabGroupRenderer extends Re
if (maxSeverity != null) {
ComponentUtils.addCurrentMarkup(tab, ComponentUtils.markupOfSeverity(maxSeverity));
}
- writer.startElement(HtmlElements.LI, tab);
+ writer.startElement(HtmlElements.LI);
// todo: fix Css management
if (activeIndex == index) {
writer.writeClassAttribute(Classes.create(tab), BootstrapClass.ACTIVE);
@@ -214,7 +214,7 @@ public class TabGroupRenderer extends Re
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- writer.startElement(HtmlElements.A, tab);
+ writer.startElement(HtmlElements.A);
if (!disabled) {
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
}
@@ -234,7 +234,7 @@ public class TabGroupRenderer extends Re
} else {
image = ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, disabled);
}
- writer.startElement(HtmlElements.IMG, null);
+ writer.startElement(HtmlElements.IMG);
writer.writeAttribute(HtmlAttributes.SRC, image, true);
writer.writeClassAttribute(Classes.create(tab, (label.getLabel() != null? "image-right-margin" : "image")));
writer.endElement(HtmlElements.IMG);
@@ -267,7 +267,7 @@ public class TabGroupRenderer extends Re
protected void renderTabToolbar(
final FacesContext facesContext, final TobagoResponseWriter writer, final UITab tab, final UIPanel toolbar)
throws IOException {
- writer.startElement(HtmlElements.SPAN, null);
+ writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(Classes.create(tab, "toolBar"));
toolbar.setRendererType("TabGroupToolBar");
RenderUtils.encode(facesContext, toolbar);
@@ -345,7 +345,7 @@ public class TabGroupRenderer extends Re
final FacesContext facesContext, final TobagoResponseWriter writer, final UITabGroup tabGroup,
final UIToolBar toolBar)
throws IOException {
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(tabGroup, "toolBar"));
RenderUtils.encode(facesContext, toolBar);
writer.endElement(HtmlElements.DIV);
@@ -359,7 +359,7 @@ public class TabGroupRenderer extends Re
return;
}
- writer.startElement(HtmlElements.DIV, null);
+ writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(tab, "content"), BootstrapClass.PANEL_BODY);
writer.writeIdAttribute(tab.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "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/TextareaRenderer.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/TextareaRenderer.java?rev=1708048&r1=1708047&r2=1708048&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/TextareaRenderer.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/TextareaRenderer.java Mon Oct 12 08:11:57 2015
@@ -55,7 +55,7 @@ public class TextareaRenderer extends In
final String clientId = input.getClientId(facesContext);
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.TEXTAREA, input);
+ writer.startElement(HtmlElements.TEXTAREA);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, input);