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 2013/11/15 18:11:10 UTC
svn commit: r1542331 [23/28] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/application/
tobago-core/src/main/java/org/apache/myfaces/tobago/compat/ tobago-core/...
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java Fri Nov 15 17:10:58 2013
@@ -63,32 +63,32 @@ public class MenuCommandRenderer extends
private static final Logger LOG = LoggerFactory.getLogger(MenuCommandRenderer.class);
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
- UIMenuCommand menu = (UIMenuCommand) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
-
- boolean disabled = menu.isDisabled();
- boolean firstLevel = RendererTypes.MENU_BAR.equals(menu.getParent().getRendererType());
- LabelWithAccessKey label = new LabelWithAccessKey(menu);
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UIMenuCommand menu = (UIMenuCommand) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+
+ final boolean disabled = menu.isDisabled();
+ final boolean firstLevel = RendererTypes.MENU_BAR.equals(menu.getParent().getRendererType());
+ final LabelWithAccessKey label = new LabelWithAccessKey(menu);
if (menu.getFacet(Facets.CHECKBOX) != null) {
// checkbox menu
- UISelectBooleanCheckbox checkbox = (UISelectBooleanCheckbox) menu.getFacet(Facets.CHECKBOX);
- boolean checked = ComponentUtils.getBooleanAttribute(checkbox, Attributes.VALUE);
- String image = checked ? "image/MenuCheckmark.gif" : null;
- String hiddenId = checkbox.getClientId(facesContext);
+ final UISelectBooleanCheckbox checkbox = (UISelectBooleanCheckbox) menu.getFacet(Facets.CHECKBOX);
+ final boolean checked = ComponentUtils.getBooleanAttribute(checkbox, Attributes.VALUE);
+ final String image = checked ? "image/MenuCheckmark.gif" : null;
+ final String hiddenId = checkbox.getClientId(facesContext);
final CommandMap map = new CommandMap(new Command());
encodeItem(facesContext, writer, menu, label, map, disabled, firstLevel, image, null, "selectBoolean");
encodeHidden(writer, hiddenId, checked);
} else if (menu.getFacet(Facets.RADIO) != null) {
// radio menu
- String clientId = menu.getClientId(facesContext);
- UISelectOne radio = (UISelectOne) menu.getFacet(Facets.RADIO);
- List<SelectItem> items = RenderUtils.getSelectItems(radio);
- String hiddenId = radio.getClientId(facesContext);
- for (SelectItem item : items) {
- boolean checked = item.getValue().equals(radio.getValue());
- String image = checked ? "image/MenuRadioChecked.gif" : null;
+ final String clientId = menu.getClientId(facesContext);
+ final UISelectOne radio = (UISelectOne) menu.getFacet(Facets.RADIO);
+ final List<SelectItem> items = RenderUtils.getSelectItems(radio);
+ final String hiddenId = radio.getClientId(facesContext);
+ for (final SelectItem item : items) {
+ final boolean checked = item.getValue().equals(radio.getValue());
+ final String image = checked ? "image/MenuRadioChecked.gif" : null;
final String labelText = item.getLabel();
label.reset();
@@ -109,13 +109,14 @@ public class MenuCommandRenderer extends
encodeHidden(writer, hiddenId, getCurrentValue(facesContext, radio));
} else {
// normal menu command
- String image = menu.getImage();
- CommandMap map = new CommandMap(new Command(facesContext, menu));
+ final String image = menu.getImage();
+ final CommandMap map = new CommandMap(new Command(facesContext, menu));
encodeItem(facesContext, writer, menu, label, map, disabled, firstLevel, image, null, null);
}
}
- private void encodeHidden(TobagoResponseWriter writer, String hiddenId, Object value) throws IOException {
+ 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.writeNameAttribute(hiddenId);
@@ -126,8 +127,10 @@ public class MenuCommandRenderer extends
}
private void encodeItem(
- FacesContext facesContext, TobagoResponseWriter writer, UIMenuCommand component, LabelWithAccessKey label,
- CommandMap map, boolean disabled, boolean firstLevel, String image, String value, String sub)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UIMenuCommand component,
+ final LabelWithAccessKey label,
+ final CommandMap map, final boolean disabled, final boolean firstLevel, final String image, final String value,
+ final String sub)
throws IOException {
writer.startElement(HtmlElements.LI, null);
@@ -158,16 +161,17 @@ public class MenuCommandRenderer extends
if (image != null) {
if (firstLevel) {
- Style iconStyle = new Style();
+ final Style iconStyle = new Style();
iconStyle.setLeft(Measure.valueOf(0));
iconStyle.setTop(Measure.valueOf(0));
iconStyle.setHeight(Measure.valueOf(16));
iconStyle.setWidth(Measure.valueOf(16));
writer.startElement(HtmlElements.IMG, null);
- String imageWithPath = ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, disabled);
+ final String imageWithPath
+ = ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, disabled);
writer.writeAttribute(HtmlAttributes.SRC, imageWithPath, false);
- String imageHover = ResourceManagerUtils
+ final String imageHover = ResourceManagerUtils
.getImageOrDisabledImageWithPath(facesContext, HtmlRendererUtils.createSrc(image, "Hover"), disabled);
if (imageHover != null) {
writer.writeAttribute(DataAttributes.SRC_DEFAULT, imageWithPath, false);
@@ -178,7 +182,7 @@ public class MenuCommandRenderer extends
writer.writeStyleAttribute(iconStyle);
writer.endElement(HtmlElements.IMG);
} else {
- Style style = new Style();
+ final Style style = new Style();
style.setBackgroundImage("url('"
+ ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, image, disabled)
+ "')");
@@ -209,7 +213,7 @@ public class MenuCommandRenderer extends
writer.endElement(HtmlElements.LI);
}
- public void encodeChildren(FacesContext facesContext, UIComponent component)
+ public void encodeChildren(final FacesContext facesContext, final UIComponent component)
throws IOException {
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java Fri Nov 15 17:10:58 2013
@@ -45,7 +45,7 @@ public class MenuRenderer extends Layout
private static final Logger LOG = LoggerFactory.getLogger(MenuRenderer.class);
@Override
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
final UIMenu menu = (UIMenu) component;
@@ -56,10 +56,10 @@ public class MenuRenderer extends Layout
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIMenu menu = (UIMenu) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final boolean disabled = menu.isDisabled();
final boolean firstLevel = !RendererTypes.MENU.equals(menu.getParent().getRendererType());
@@ -68,7 +68,7 @@ public class MenuRenderer extends Layout
writer.startElement(HtmlElements.LI, menu);
writer.writeClassAttribute(Classes.create(menu));
if (menu.getImage() != null) {
- Style style = new Style();
+ final Style style = new Style();
style.setBackgroundImage("url('"
+ ResourceManagerUtils.getImageOrDisabledImageWithPath(facesContext, menu.getImage(), menu.isDisabled())
+ "')");
@@ -83,7 +83,7 @@ public class MenuRenderer extends Layout
writer.writeIdAttribute(component.getClientId(facesContext));
}
- LabelWithAccessKey label = new LabelWithAccessKey(menu);
+ final LabelWithAccessKey label = new LabelWithAccessKey(menu);
if (label.getText() != null) {
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
@@ -100,7 +100,7 @@ public class MenuRenderer extends Layout
if (isParentMenu) {
if (!firstLevel) {
writer.startElement(HtmlElements.IMG, menu);
- String arrow = ResourceManagerUtils
+ final String arrow = ResourceManagerUtils
.getImageOrDisabledImageWithPath(facesContext, "image/MenuArrow.gif", menu.isDisabled());
writer.writeAttribute(HtmlAttributes.SRC, arrow, false);
writer.writeClassAttribute(Classes.create(menu, "subitem-arrow"));
@@ -111,12 +111,12 @@ public class MenuRenderer extends Layout
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UIMenu menu = (UIMenu) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final UIMenu menu = (UIMenu) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
+ final boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
if (isParentMenu) {
writer.endElement(HtmlElements.OL);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java Fri Nov 15 17:10:58 2013
@@ -32,8 +32,8 @@ import java.io.IOException;
public class MenuSeparatorRenderer extends LayoutComponentRendererBase {
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.LI, component);
writer.writeClassAttribute(Classes.create(component));
writer.startElement(HtmlElements.HR, component);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java Fri Nov 15 17:10:58 2013
@@ -65,21 +65,21 @@ public class MessagesRenderer extends La
public static final String CLOSE_POPUP = "closePopup";
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UIMessages messages = (UIMessages) component;
+ final UIMessages messages = (UIMessages) component;
if (messages.isConfirmation()) {
createPopup(facesContext, messages);
return;
}
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (LOG.isDebugEnabled()) {
LOG.debug("facesContext is " + facesContext.getClass().getName());
}
- List<UIMessages.Item> messageList = messages.createMessageList(facesContext);
+ final List<UIMessages.Item> messageList = messages.createMessageList(facesContext);
if (messageList.size() > 0) { // in ie empty span gets a height
writer.startElement(HtmlElements.SPAN, messages);
@@ -98,7 +98,7 @@ public class MessagesRenderer extends La
clientIds = facesContext.getClientIdsWithMessages();
}*/
- for (UIMessages.Item item : messageList) {
+ for (final UIMessages.Item item : messageList) {
encodeMessage(writer, messages, item.getFacesMessage(), item.getClientId());
}
/*
@@ -116,7 +116,7 @@ public class MessagesRenderer extends La
*/
writer.endElement(HtmlElements.SPAN);
if (messages.getFor() == null) {
- String clientId = messages.getClientId(facesContext);
+ final String clientId = messages.getClientId(facesContext);
writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.VALUE, Boolean.TRUE.toString(), false);
writer.writeAttribute(HtmlAttributes.ID,
@@ -133,16 +133,17 @@ public class MessagesRenderer extends La
}
}
- private void createPopup(FacesContext facesContext, UIMessages messages) {
+ private void createPopup(final FacesContext facesContext, final UIMessages messages) {
if (LOG.isDebugEnabled()) {
LOG.debug("POPUP");
}
- String id = messages.getId() != null ? messages.getId() + "popup" : facesContext.getViewRoot().createUniqueId();
+ final String id
+ = messages.getId() != null ? messages.getId() + "popup" : facesContext.getViewRoot().createUniqueId();
final UIPopup popup = (UIPopup)
CreateComponentUtils.createComponent(facesContext, UIPopup.COMPONENT_TYPE, RendererTypes.POPUP, id);
popup.getAttributes().put(Attributes.Z_INDEX, 10);
- AbstractUIPage page = ComponentUtils.findPage(facesContext, messages);
+ final AbstractUIPage page = ComponentUtils.findPage(facesContext, messages);
popup.setWidth(page.getCurrentWidth().subtract(200));
popup.setHeight(page.getCurrentHeight().subtract(200));
@@ -179,7 +180,7 @@ public class MessagesRenderer extends La
scrollPanel.setScrollbars("auto");
scrollPanel.getChildren().add(messages);
- UIComponent buttonPanel = CreateComponentUtils.createComponent(
+ final UIComponent buttonPanel = CreateComponentUtils.createComponent(
facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL, "buttonPanel");
layout = CreateComponentUtils.createComponent(
facesContext, UIGridLayout.COMPONENT_TYPE, RendererTypes.GRID_LAYOUT, "buttonPanelLayout");
@@ -216,11 +217,12 @@ public class MessagesRenderer extends La
}
}
*/
- private void encodeMessage(TobagoResponseWriter writer, UIMessages messages, FacesMessage message, String clientId)
+ private void encodeMessage(
+ final TobagoResponseWriter writer, final UIMessages messages, final FacesMessage message, final String clientId)
throws IOException {
- String summary = message.getSummary();
- String detail = message.getDetail();
+ final String summary = message.getSummary();
+ final String detail = message.getDetail();
writer.startElement(HtmlElements.LABEL, null);
if (clientId != null) {
writer.writeAttribute(HtmlAttributes.FOR, clientId, false);
@@ -251,10 +253,10 @@ public class MessagesRenderer extends La
}
@Override
- public Measure getPreferredHeight(FacesContext facesContext, Configurable component) {
- Measure measure = super.getPreferredHeight(facesContext, component);
- UIMessages messages = (UIMessages) component;
- int count = messages.createMessageList(facesContext).size();
+ public Measure getPreferredHeight(final FacesContext facesContext, final Configurable component) {
+ final Measure measure = super.getPreferredHeight(facesContext, component);
+ final UIMessages messages = (UIMessages) component;
+ final int count = messages.createMessageList(facesContext).size();
return measure.multiply(count);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java Fri Nov 15 17:10:58 2013
@@ -34,9 +34,9 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
public class ObjectRenderer extends LayoutComponentRendererBase {
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- UIObject object = (UIObject) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UIObject object = (UIObject) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.IFRAME, object);
writer.writeAttribute(HtmlAttributes.FRAMEBORDER, "0", false);
@@ -50,7 +50,7 @@ public class ObjectRenderer extends Layo
writer.writeAttribute(HtmlAttributes.SRC, ResourceManagerUtils.getBlankPage(facesContext), false);
}
writer.writeClassAttribute(Classes.create(object));
- Style style = new Style(facesContext, object);
+ final Style style = new Style(facesContext, object);
writer.writeStyleAttribute(style);
String noframes = ResourceManagerUtils.getPropertyNotNull(
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java Fri Nov 15 17:10:58 2013
@@ -36,35 +36,35 @@ import java.util.StringTokenizer;
public class OutRenderer extends LayoutComponentRendererBase {
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UIOut out = (UIOut) component;
+ final UIOut out = (UIOut) component;
String text = RenderUtils.currentValue(out);
if (text == null) {
text = "";
}
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- boolean escape = out.isEscape();
- boolean createSpan = out.isCreateSpan();
+ final boolean escape = out.isEscape();
+ final boolean createSpan = out.isCreateSpan();
if (createSpan) {
- String id = out.getClientId(facesContext);
+ final String id = out.getClientId(facesContext);
writer.startElement(HtmlElements.SPAN, out);
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, out);
- Style style = new Style(facesContext, out);
+ final Style style = new Style(facesContext, out);
writer.writeStyleAttribute(style);
HtmlRendererUtils.renderDojoDndItem(out, writer, true);
writer.writeClassAttribute(Classes.create(out));
HtmlRendererUtils.renderTip(out, writer);
}
if (escape) {
- StringTokenizer tokenizer = new StringTokenizer(text, "\r\n");
+ final StringTokenizer tokenizer = new StringTokenizer(text, "\r\n");
while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
+ final String token = tokenizer.nextToken();
writer.writeText(token);
if (tokenizer.hasMoreTokens()) {
writer.startElement(HtmlElements.BR, null);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Fri Nov 15 17:10:58 2013
@@ -49,6 +49,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
@@ -83,63 +84,63 @@ public class PageRenderer extends PageRe
private static final String LAST_FOCUS_ID = "lastFocusId";
@Override
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
super.decode(facesContext, component);
- String clientId = component.getClientId(facesContext);
- ExternalContext externalContext = facesContext.getExternalContext();
+ final String clientId = component.getClientId(facesContext);
+ final ExternalContext externalContext = facesContext.getExternalContext();
// severity
- String severity
+ final String severity
= externalContext.getRequestParameterMap().get(clientId + ComponentUtils.SUB_SEPARATOR + "clientSeverity");
if (severity != null) {
externalContext.getRequestMap().put(CLIENT_DEBUG_SEVERITY, severity);
}
// last focus
- String lastFocusId =
+ final String lastFocusId =
externalContext.getRequestParameterMap().get(clientId + ComponentUtils.SUB_SEPARATOR + LAST_FOCUS_ID);
if (lastFocusId != null) {
FacesContextUtils.setFocusId(facesContext, lastFocusId);
}
// scrollbar weight
- String name = clientId + ComponentUtils.SUB_SEPARATOR + "scrollbarWeight";
+ final String name = clientId + ComponentUtils.SUB_SEPARATOR + "scrollbarWeight";
String value = null;
try {
value = facesContext.getExternalContext().getRequestParameterMap().get(name);
if (StringUtils.isNotBlank(value)) {
- StringTokenizer tokenizer = new StringTokenizer(value, ";");
- Measure vertical = Measure.valueOf(tokenizer.nextToken());
- Measure horizontal = Measure.valueOf(tokenizer.nextToken());
+ final StringTokenizer tokenizer = new StringTokenizer(value, ";");
+ final Measure vertical = Measure.valueOf(tokenizer.nextToken());
+ final Measure horizontal = Measure.valueOf(tokenizer.nextToken());
if (vertical.greaterThan(Measure.valueOf(30)) || vertical.lessThan(Measure.valueOf(3))
- || horizontal.greaterThan(Measure.valueOf(30)) || horizontal.lessThan(Measure.valueOf(3))) {
+ || horizontal.greaterThan(Measure.valueOf(30)) || horizontal.lessThan(Measure.valueOf(3))) {
LOG.error("Ignoring strange values: vertical=" + vertical + " horizontal=" + horizontal);
} else {
- ClientProperties client = VariableResolverUtils.resolveClientProperties(facesContext);
+ final ClientProperties client = VariableResolverUtils.resolveClientProperties(facesContext);
client.setVerticalScrollbarWeight(vertical);
client.setHorizontalScrollbarWeight(horizontal);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Error in decoding '" + name + "': value='" + value + "'", e);
}
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIPage page = (UIPage) component;
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(facesContext);
// invoke prepareRender
- RenderUtils.prepareRendererAll(facesContext, page);
+ EncodeUtils.prepareRendererAll(facesContext, page);
- LayoutContext layoutContext = new LayoutContext(page);
+ final LayoutContext layoutContext = new LayoutContext(page);
layoutContext.layout();
if (FacesContextUtils.getFocusId(facesContext) == null && !StringUtils.isBlank(page.getFocusId())) {
FacesContextUtils.setFocusId(facesContext, page.getFocusId());
}
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
// reset responseWriter and render page
facesContext.setResponseWriter(writer);
@@ -149,8 +150,8 @@ public class PageRenderer extends PageRe
ResponseUtils.ensureContentSecurityPolicyHeader(facesContext, tobagoConfig.getContentSecurityPolicy());
if (LOG.isDebugEnabled()) {
- for (Object o : page.getAttributes().entrySet()) {
- Map.Entry entry = (Map.Entry) o;
+ for (final Object o : page.getAttributes().entrySet()) {
+ final Map.Entry entry = (Map.Entry) o;
LOG.debug("*** '" + entry.getKey() + "' -> '" + entry.getValue() + "'");
}
}
@@ -175,12 +176,12 @@ public class PageRenderer extends PageRe
final String clientId = page.getClientId(facesContext);
final ClientProperties client = VariableResolverUtils.resolveClientProperties(facesContext);
final ProjectStage projectStage = tobagoConfig.getProjectStage();
- final boolean developmentMode = projectStage == ProjectStage.Development;
+ final boolean developmentMode = projectStage == ProjectStage.Development;
final boolean debugMode = client.isDebugMode() || developmentMode;
final boolean productionMode = !debugMode && projectStage == ProjectStage.Production;
int clientLogSeverity = 2;
if (debugMode) {
- String severity = (String) externalContext.getRequestMap().get(CLIENT_DEBUG_SEVERITY);
+ final String severity = (String) externalContext.getRequestMap().get(CLIENT_DEBUG_SEVERITY);
if (LOG.isDebugEnabled()) {
LOG.debug("get " + CLIENT_DEBUG_SEVERITY + " = " + severity);
}
@@ -191,17 +192,17 @@ public class PageRenderer extends PageRe
index = severity.length();
}
clientLogSeverity = Integer.parseInt(severity.substring(0, index));
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
// ignore; use default
}
}
}
- boolean preventFrameAttacks = tobagoConfig.isPreventFrameAttacks();
+ final boolean preventFrameAttacks = tobagoConfig.isPreventFrameAttacks();
if (!FacesContextUtils.isAjax(facesContext)) {
HtmlRendererUtils.renderDojoDndSource(facesContext, component);
- String title = (String) page.getAttributes().get(Attributes.LABEL);
+ final String title = (String) page.getAttributes().get(Attributes.LABEL);
writer.startElement(HtmlElements.HEAD, null);
@@ -220,11 +221,11 @@ public class PageRenderer extends PageRe
final Theme theme = client.getTheme();
// style files
- for (String styleFile : theme.getStyleResources(productionMode)) {
+ for (final String styleFile : theme.getStyleResources(productionMode)) {
writeStyle(facesContext, writer, styleFile);
}
- for (String styleFile : FacesContextUtils.getStyleFiles(facesContext)) {
+ for (final String styleFile : FacesContextUtils.getStyleFiles(facesContext)) {
writeStyle(facesContext, writer, styleFile);
}
@@ -255,22 +256,22 @@ public class PageRenderer extends PageRe
}
// style sniplets
- Set<String> styleBlocks = FacesContextUtils.getStyleBlocks(facesContext);
+ final Set<String> styleBlocks = FacesContextUtils.getStyleBlocks(facesContext);
if (styleBlocks.size() > 0) {
writer.startElement(HtmlElements.STYLE, null);
writer.flush(); // is needed in some cases, e. g. TOBAGO-1094
- for (String cssBlock : styleBlocks) {
+ for (final String cssBlock : styleBlocks) {
writer.write(cssBlock);
}
writer.endElement(HtmlElements.STYLE);
}
// render remaining script tags
- for (String scriptFile: theme.getScriptResources(productionMode)) {
+ for (final String scriptFile : theme.getScriptResources(productionMode)) {
encodeScript(facesContext, writer, scriptFile);
}
- for (String scriptFile : FacesContextUtils.getScriptFiles(facesContext)) {
+ for (final String scriptFile : FacesContextUtils.getScriptFiles(facesContext)) {
encodeScript(facesContext, writer, scriptFile);
}
@@ -291,7 +292,7 @@ public class PageRenderer extends PageRe
writeEventFunction(writer, FacesContextUtils.getOnsubmitScripts(facesContext), "submit", true);
int debugCounter = 0;
- for (String scriptBlock : FacesContextUtils.getScriptBlocks(facesContext)) {
+ for (final String scriptBlock : FacesContextUtils.getScriptBlocks(facesContext)) {
if (LOG.isDebugEnabled()) {
LOG.debug("write scriptblock " + ++debugCounter + " :\n" + scriptBlock);
@@ -325,7 +326,7 @@ public class PageRenderer extends PageRe
LOG.info("partial action = " + partialAction);
writer.writeIdAttribute(page.getFormId(facesContext));
writer.writeAttribute(HtmlAttributes.METHOD, getMethod(page), false);
- String enctype = FacesContextUtils.getEnctype(facesContext);
+ final String enctype = FacesContextUtils.getEnctype(facesContext);
if (enctype != null) {
writer.writeAttribute(HtmlAttributes.ENCTYPE, enctype, false);
}
@@ -358,7 +359,7 @@ public class PageRenderer extends PageRe
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-clientDimension");
writer.endElement(HtmlElements.INPUT);
- boolean calculateScrollbarWeight =
+ final boolean calculateScrollbarWeight =
client.getVerticalScrollbarWeight() == null || client.getHorizontalScrollbarWeight() == null;
if (calculateScrollbarWeight) {
@@ -395,7 +396,7 @@ public class PageRenderer extends PageRe
}
if (component.getFacet("backButtonDetector") != null) {
- UIComponent hidden = component.getFacet("backButtonDetector");
+ final UIComponent hidden = component.getFacet("backButtonDetector");
RenderUtils.encode(facesContext, hidden);
}
@@ -416,7 +417,7 @@ public class PageRenderer extends PageRe
}
*/
- UIMenuBar menuBar = (UIMenuBar) page.getFacet(Facets.MENUBAR);
+ final UIMenuBar menuBar = (UIMenuBar) page.getFacet(Facets.MENUBAR);
if (menuBar != null) {
menuBar.getAttributes().put(Attributes.PAGE_MENU, Boolean.TRUE);
RenderUtils.encode(facesContext, menuBar);
@@ -425,22 +426,22 @@ public class PageRenderer extends PageRe
// AbstractUILayoutBase.getLayout(component).encodeChildrenOfComponent(facesContext, component);
// page.encodeLayoutBegin(facesContext);
-
+
writer.startElement(HtmlElements.DIV, page);
writer.writeClassAttribute(Classes.create(page, "content", Markup.PORTLET));
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "content");
- Style style = new Style(facesContext, page);
+ final Style style = new Style(facesContext, page);
// XXX position the div, so that the scrollable area is correct.
// XXX better to take this fact into layout management.
// XXX is also useful in boxes, etc.
- Measure border = getBorderBottom(facesContext, page);
+ final Measure border = getBorderBottom(facesContext, page);
style.setHeight(page.getCurrentHeight().subtract(border));
style.setTop(border);
writer.writeStyleAttribute(style);
}
- private void checkDuplicates(String[] resources, Collection<String> files) {
- for (String resource : resources) {
+ private void checkDuplicates(final String[] resources, final Collection<String> files) {
+ for (final String resource : resources) {
if (files.contains(resource)) {
throw new RuntimeException("The resource '" + resource + "' will be included twice! "
+ "The resource is in the theme list, and explicit in the page. "
@@ -449,10 +450,10 @@ public class PageRenderer extends PageRe
}
}
- private void writeStyle(FacesContext facesContext, TobagoResponseWriter writer, String styleFile)
+ private void writeStyle(final FacesContext facesContext, final TobagoResponseWriter writer, final String styleFile)
throws IOException {
- List<String> styles = ResourceManagerUtils.getStyles(facesContext, styleFile);
- for (String styleString : styles) {
+ final List<String> styles = ResourceManagerUtils.getStyles(facesContext, styleFile);
+ for (final String styleString : styles) {
if (styleString.length() > 0) {
writer.startElement(HtmlElements.LINK, null);
writer.writeAttribute(HtmlAttributes.REL, "stylesheet", false);
@@ -471,7 +472,7 @@ public class PageRenderer extends PageRe
// }
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIPage page = (UIPage) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -484,7 +485,7 @@ public class PageRenderer extends PageRe
final UIPopup[] popupArray = FacesContextUtils.getPopups(facesContext).toArray(
new UIPopup[FacesContextUtils.getPopups(facesContext).size()]);
- for (UIPopup popup : popupArray) {
+ for (final UIPopup popup : popupArray) {
RenderUtils.encode(facesContext, popup);
}
@@ -502,7 +503,7 @@ public class PageRenderer extends PageRe
writer.endElement(HtmlElements.INPUT);
}
- List<String> messageClientIds = AjaxInternalUtils.getMessagesClientIds(facesContext);
+ final List<String> messageClientIds = AjaxInternalUtils.getMessagesClientIds(facesContext);
if (messageClientIds != null) {
writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.VALUE, StringUtils.join(messageClientIds, ','), true);
@@ -517,14 +518,14 @@ public class PageRenderer extends PageRe
writer.writeClassAttribute(Classes.create(page, "menuStore"));
writer.endElement(HtmlElements.DIV);
- Application application = facesContext.getApplication();
- ViewHandler viewHandler = application.getViewHandler();
+ final Application application = facesContext.getApplication();
+ final ViewHandler viewHandler = application.getViewHandler();
writer.startElement(HtmlElements.SPAN, null);
writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "jsf-state-container");
writer.flush();
if (!FacesContextUtils.isAjax(facesContext)) {
- viewHandler.writeState(facesContext);
+ viewHandler.writeState(facesContext);
}
writer.endElement(HtmlElements.SPAN);
@@ -564,10 +565,9 @@ public class PageRenderer extends PageRe
// debugging...
if (debugMode) {
final List<String> logMessages = new ArrayList<String>();
- for (Iterator ids = facesContext.getClientIdsWithMessages(); ids.hasNext();) {
- final String id = (String) ids.next();
- for (Iterator messages = facesContext.getMessages(id); messages.hasNext();) {
- final FacesMessage message = (FacesMessage) messages.next();
+ String id = null;
+ for (final Iterator<String> ids = facesContext.getClientIdsWithMessages(); ids.hasNext(); id = ids.next()) {
+ for (final FacesMessage message : facesContext.getMessageList(id)) {
logMessages.add(errorMessageForDebugging(id, message));
}
}
@@ -603,7 +603,8 @@ public class PageRenderer extends PageRe
}
private void writeEventFunction(
- TobagoResponseWriter writer, Collection<String> eventFunctions, String event, boolean returnBoolean)
+ final TobagoResponseWriter writer, final Collection<String> eventFunctions, final String event,
+ final boolean returnBoolean)
throws IOException {
if (!eventFunctions.isEmpty()) {
writer.write("Tobago.applicationOn");
@@ -612,7 +613,7 @@ public class PageRenderer extends PageRe
if (returnBoolean) {
writer.write(" var result;\n");
}
- for (String function : eventFunctions) {
+ for (final String function : eventFunctions) {
if (returnBoolean) {
writer.write(" result = ");
} else {
@@ -634,15 +635,16 @@ public class PageRenderer extends PageRe
}
}
- private void encodeScript(FacesContext facesContext, TobagoResponseWriter writer, String script) throws IOException {
- List<String> list;
+ private void encodeScript(final FacesContext facesContext, final TobagoResponseWriter writer, final String script)
+ throws IOException {
+ final List<String> list;
if (ResourceManagerUtils.isAbsoluteResource(script)) {
list = new ArrayList<String>();
list.add(script);
} else {
list = ResourceManagerUtils.getScripts(facesContext, script);
}
- for (String src : list) {
+ for (final String src : list) {
if (StringUtils.isNotBlank(src)) {
writer.startElement(HtmlElements.SCRIPT, null);
writer.writeAttribute(HtmlAttributes.SRC, src, true);
@@ -654,7 +656,8 @@ public class PageRenderer extends PageRe
}
}
- private void errorMessageForDebugging(String id, FacesMessage message, ResponseWriter writer) throws IOException {
+ private void errorMessageForDebugging(final String id, final FacesMessage message, final ResponseWriter writer)
+ throws IOException {
writer.startElement(HtmlElements.DIV, null);
writer.writeAttribute(HtmlAttributes.STYLE, "color: red", null);
writer.flush(); // is needed in some cases, e. g. TOBAGO-1094
@@ -671,8 +674,8 @@ public class PageRenderer extends PageRe
writer.endElement(HtmlElements.BR);
}
- private String errorMessageForDebugging(String id, FacesMessage message) {
- StringBuilder sb = new StringBuilder("LOG.info(\"FacesMessage: [");
+ private String errorMessageForDebugging(final String id, final FacesMessage message) {
+ final StringBuilder sb = new StringBuilder("LOG.info(\"FacesMessage: [");
sb.append(id != null ? id : "null");
sb.append("][");
sb.append(message.getSummary() == null ? "null" : escape(message.getSummary()));
@@ -682,12 +685,12 @@ public class PageRenderer extends PageRe
return sb.toString();
}
- private String escape(String s) {
+ private String escape(final String s) {
return StringUtils.replace(StringUtils.replace(s, "\\", "\\\\"), "\"", "\\\"");
}
- private String getMethod(UIPage page) {
- String method = (String) page.getAttributes().get(Attributes.METHOD);
+ private String getMethod(final UIPage page) {
+ final String method = (String) page.getAttributes().get(Attributes.METHOD);
return method == null ? "post" : method;
}
@@ -697,11 +700,11 @@ public class PageRenderer extends PageRe
}
@Override
- public Measure getBorderBottom(FacesContext facesContext, Configurable component) {
+ public Measure getBorderBottom(final FacesContext facesContext, final Configurable component) {
// XXX this is a hack. correct would be the top-border, but this would shift the content, because of the
// XXX hack before the code: writer.writeStyleAttribute(style)
- UIPage page = (UIPage) component;
- UIMenuBar menuBar = (UIMenuBar) page.getFacet(Facets.MENUBAR);
+ final UIPage page = (UIPage) component;
+ final UIMenuBar menuBar = (UIMenuBar) page.getFacet(Facets.MENUBAR);
if (menuBar != null) {
return getResourceManager().getThemeMeasure(facesContext, page, "custom.menuBar-height");
} else {
@@ -710,9 +713,9 @@ public class PageRenderer extends PageRe
}
@Override
- public Measure getWidth(FacesContext facesContext, Configurable component) {
+ public Measure getWidth(final FacesContext facesContext, final Configurable component) {
// width of the actual browser window
- Measure width = ClientProperties.getInstance(facesContext).getPageWidth();
+ final Measure width = ClientProperties.getInstance(facesContext).getPageWidth();
if (width != null) {
return width;
} else {
@@ -721,9 +724,9 @@ public class PageRenderer extends PageRe
}
@Override
- public Measure getHeight(FacesContext facesContext, Configurable component) {
+ public Measure getHeight(final FacesContext facesContext, final Configurable component) {
// height of the actual browser window
- Measure height = ClientProperties.getInstance(facesContext).getPageHeight();
+ final Measure height = ClientProperties.getInstance(facesContext).getPageHeight();
if (height != null) {
return height;
} else {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Fri Nov 15 17:10:58 2013
@@ -48,7 +48,7 @@ public class PanelRenderer extends Layou
private static final Logger LOG = LoggerFactory.getLogger(PanelRenderer.class);
@Override
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
HtmlRendererUtils.renderDojoDndSource(facesContext, component);
}
@@ -59,27 +59,27 @@ public class PanelRenderer extends Layou
}
@Override
- public void encodeChildren(FacesContext facesContext, UIComponent uiComponent) throws IOException {
- UIPanel component = (UIPanel) uiComponent;
- for (UIComponent child : component.getChildren()) {
+ public void encodeChildren(final FacesContext facesContext, final UIComponent uiComponent) throws IOException {
+ final UIPanel component = (UIPanel) uiComponent;
+ for (final UIComponent child : component.getChildren()) {
RenderUtils.encode(facesContext, child);
}
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
// UIPanel or UICell (deprecated)
- AbstractUIPanel panel = (AbstractUIPanel) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final AbstractUIPanel panel = (AbstractUIPanel) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- String clientId = panel.getClientId(facesContext);
+ final String clientId = panel.getClientId(facesContext);
writer.startElement(HtmlElements.DIV, panel);
HtmlRendererUtils.renderDojoDndItem(panel, writer, true);
writer.writeIdAttribute(clientId);
writer.writeClassAttribute(Classes.create(panel));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, panel);
- Style style = new Style(facesContext, panel);
+ final Style style = new Style(facesContext, panel);
// XXX hotfix for panels in sheets
if (style.getPosition() == null) {
style.setPosition(Position.RELATIVE);
@@ -91,9 +91,9 @@ public class PanelRenderer extends Layou
// TODO check ajax id?
if (!FacesContextUtils.isAjax(facesContext)) {
- UIComponent facetReload = panel.getFacet(Facets.RELOAD);
+ final UIComponent facetReload = panel.getFacet(Facets.RELOAD);
if (facetReload != null && facetReload instanceof UIReload && facetReload.isRendered()) {
- UIReload update = (UIReload) facetReload;
+ final UIReload update = (UIReload) facetReload;
writer.writeAttribute(DataAttributes.RELOAD, Integer.toString(update.getFrequency()), false);
}
}
@@ -127,9 +127,9 @@ public class PanelRenderer extends Layou
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- ResponseWriter writer = facesContext.getResponseWriter();
- AbstractUIPanel panel = (AbstractUIPanel) component;
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final ResponseWriter writer = facesContext.getResponseWriter();
+ final AbstractUIPanel panel = (AbstractUIPanel) component;
final Measure borderLeft = panel.getBorderLeft();
final Measure borderRight = panel.getBorderRight();
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Fri Nov 15 17:10:58 2013
@@ -49,7 +49,7 @@ public class PopupRenderer extends Layou
}
@Override
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIPopup popup = (UIPopup) component;
FacesContextUtils.addPopup(facesContext, popup);
@@ -62,7 +62,7 @@ public class PopupRenderer extends Layou
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final UIPopup popup = (UIPopup) component;
@@ -83,7 +83,7 @@ public class PopupRenderer extends Layou
final String clientId = popup.getClientId(facesContext);
// XXX May be computed in the "Layout Manager Phase"
- AbstractUIPage page = ComponentUtils.findPage(facesContext);
+ final AbstractUIPage page = ComponentUtils.findPage(facesContext);
if (popup.getLeft() == null) {
popup.setLeft(page.getCurrentWidth().subtract(popup.getCurrentWidth()).divide(2));
}
@@ -94,7 +94,7 @@ public class PopupRenderer extends Layou
writer.startElement(HtmlElements.DIV, popup);
writer.writeIdAttribute(clientId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, popup);
- Style style = new Style(facesContext, popup);
+ final Style style = new Style(facesContext, popup);
Integer zIndex = popup.getZIndex();
if (zIndex == null) {
zIndex = 100;
@@ -106,8 +106,8 @@ public class PopupRenderer extends Layou
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java Fri Nov 15 17:10:58 2013
@@ -43,9 +43,9 @@ public class ProgressRenderer extends La
private static final Logger LOG = LoggerFactory.getLogger(ProgressRenderer.class);
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UIProgress progress = (UIProgress) component;
+ final UIProgress progress = (UIProgress) component;
BoundedRangeModel model = (BoundedRangeModel) progress.getValue();
@@ -68,7 +68,7 @@ public class ProgressRenderer extends La
valueStyle.setHeight(style.getHeight());
valueStyle.setWidth(valueWidth);
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, progress);
writer.writeClassAttribute(Classes.create(progress));
@@ -77,7 +77,7 @@ public class ProgressRenderer extends La
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, String.valueOf(title), true);
}
- UIComponent facet = progress.getFacet("complete");
+ final UIComponent facet = progress.getFacet("complete");
if (model.getValue() == model.getMaximum() && facet instanceof UICommand) {
HtmlRendererUtils.renderCommandFacet(progress, facesContext, writer);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java Fri Nov 15 17:10:58 2013
@@ -56,16 +56,16 @@ public class RichTextEditorRenderer exte
public static final String CHANGE_BUTTON = "togleState";
@Override
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
if (ComponentUtils.isOutputOnly(component)) {
return;
}
super.decode(facesContext, component);
- String actionId = ComponentUtils.findPage(facesContext, component).getActionId();
+ final String actionId = ComponentUtils.findPage(facesContext, component).getActionId();
if (actionId != null
&& actionId.equals(component.getClientId(facesContext) + CHANGE_BUTTON)) {
- boolean state
+ final boolean state
= ComponentUtils.getBooleanAttribute(component, Attributes.STATE_PREVIEW);
component.getAttributes().put(Attributes.STATE_PREVIEW, !state);
facesContext.renderResponse();
@@ -74,35 +74,35 @@ public class RichTextEditorRenderer exte
((EditableValueHolder) component).setValid(true);
}
- public static String contentToHtml(String content) {
+ public static String contentToHtml(final String content) {
try {
LOG.warn("richtext switched off, because of dependencies");
return content;
// FIXME: check dependencies
// return WikiParser.toHtml(content);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("failed to parser wiki markup", e);
}
return content;
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UIIn input = (UIIn) component;
+ final UIIn input = (UIIn) component;
- boolean previewState
+ final boolean previewState
= ComponentUtils.getBooleanAttribute(input, Attributes.STATE_PREVIEW);
// FIXME: remove this when i18n is ok
- String clientId = input.getClientId(facesContext);
+ final String clientId = input.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, input);
writer.writeClassAttribute(Classes.create(input, "container"));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, input);
- Style style = new Style(facesContext, input);
+ final Style style = new Style(facesContext, input);
writer.writeStyleAttribute(style);
UIComponent toolbar = input.getFacet(Facets.TOOL_BAR);
@@ -116,7 +116,7 @@ public class RichTextEditorRenderer exte
RenderUtils.encode(facesContext, toolbar);
// renderToolBar(facesContext, writer, input);
- String content = getCurrentValue(facesContext, input);
+ final String content = getCurrentValue(facesContext, input);
if (previewState) {
writer.startElement(HtmlElements.INPUT, input);
@@ -140,7 +140,7 @@ public class RichTextEditorRenderer exte
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
writer.writeStyleAttribute(style);
- String onchange = HtmlUtils.generateOnchange(input, facesContext);
+ final String onchange = HtmlUtils.generateOnchange(input, facesContext);
if (null != onchange) {
writer.writeAttribute(HtmlAttributes.ONCHANGE, onchange, null);
}
@@ -154,10 +154,10 @@ public class RichTextEditorRenderer exte
writer.endElement(HtmlElements.DIV);
}
- private UIComponent createToolbar(FacesContext facesContext, UIIn component) {
- UIPanel toolbar = (UIPanel) CreateComponentUtils.createComponent(
+ private UIComponent createToolbar(final FacesContext facesContext, final UIIn component) {
+ final UIPanel toolbar = (UIPanel) CreateComponentUtils.createComponent(
facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.TOOL_BAR);
- String clientId = component.getClientId(facesContext);
+ final String clientId = component.getClientId(facesContext);
component.getFacets().put(Facets.TOOL_BAR, toolbar);
toolbar.getAttributes().put(Attributes.ICON_SIZE, UIToolBar.ICON_SMALL);
@@ -179,7 +179,7 @@ public class RichTextEditorRenderer exte
facesContext, "tobago", "tobago.richtexteditor.edit.title");
command.getAttributes().put(Attributes.TIP, title);
- String onClick
+ final String onClick
= HtmlRendererUtils.createSubmitAction(clientId + RichTextEditorRenderer.CHANGE_BUTTON, true, null, null);
command.getAttributes().put(Attributes.ONCLICK, onClick);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ScriptRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ScriptRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ScriptRenderer.java Fri Nov 15 17:10:58 2013
@@ -29,30 +29,30 @@ import java.io.IOException;
public class ScriptRenderer extends RendererBase {
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
- UIScript scriptComponent = (UIScript) component;
- String exit = scriptComponent.getOnexit();
+ final UIScript scriptComponent = (UIScript) component;
+ final String exit = scriptComponent.getOnexit();
if (exit != null) {
FacesContextUtils.addOnexitScript(facesContext, exit);
}
- String submit = scriptComponent.getOnsubmit();
+ final String submit = scriptComponent.getOnsubmit();
if (submit != null) {
FacesContextUtils.addOnsubmitScript(facesContext, submit);
}
- String load = scriptComponent.getOnload();
+ final String load = scriptComponent.getOnload();
if (load != null) {
FacesContextUtils.addOnloadScript(facesContext, load);
}
- String unload = scriptComponent.getOnunload();
+ final String unload = scriptComponent.getOnunload();
if (unload != null) {
FacesContextUtils.addOnunloadScript(facesContext, unload);
}
- String script = scriptComponent.getScript();
+ final String script = scriptComponent.getScript();
if (script != null) {
FacesContextUtils.addScriptBlock(facesContext, script);
}
- String file = scriptComponent.getFile();
+ final String file = scriptComponent.getFile();
if (file != null) {
FacesContextUtils.addScriptFile(facesContext, file);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Fri Nov 15 17:10:58 2013
@@ -43,15 +43,15 @@ public class SelectBooleanCheckboxRender
private static final Logger LOG = LoggerFactory.getLogger(SelectBooleanCheckboxRenderer.class);
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
- UIInput input = (UIInput) component;
+ final UIInput input = (UIInput) component;
if (ComponentUtils.isOutputOnly(input)) {
return;
}
- String newValue = (String) facesContext.getExternalContext()
+ final String newValue = (String) facesContext.getExternalContext()
.getRequestParameterMap().get(input.getClientId(facesContext));
if (LOG.isDebugEnabled()) {
@@ -69,15 +69,15 @@ public class SelectBooleanCheckboxRender
// }
//
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UISelectBooleanCheckbox select = (UISelectBooleanCheckbox) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final UISelectBooleanCheckbox select = (UISelectBooleanCheckbox) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- String id = select.getClientId(facesContext);
- String currentValue = getCurrentValue(facesContext, select);
- boolean checked = "true".equals(currentValue);
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
+ final String id = select.getClientId(facesContext);
+ final String currentValue = getCurrentValue(facesContext, select);
+ final boolean checked = "true".equals(currentValue);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
writer.startElement(HtmlElements.DIV, select);
writer.writeStyleAttribute(new Style(facesContext, select));
@@ -99,7 +99,7 @@ public class SelectBooleanCheckboxRender
HtmlRendererUtils.renderFocus(id, select.isFocus(), ComponentUtils.isError(select), facesContext, writer);
- Integer tabIndex = select.getTabIndex();
+ final Integer tabIndex = select.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
@@ -111,7 +111,7 @@ public class SelectBooleanCheckboxRender
label = select.getLabel(); // compatibility since TOBAGO-1093
}
if (label != null) {
- LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey(label);
+ final LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey(label);
writer.startElement(HtmlElements.LABEL, select);
writer.writeAttribute(HtmlAttributes.FOR, id, false);
if (labelWithAccessKey.getAccessKey() != null) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java Fri Nov 15 17:10:58 2013
@@ -43,25 +43,25 @@ import java.util.List;
public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
- UISelectManyCheckbox select = (UISelectManyCheckbox) component;
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
super.prepareRender(facesContext, select);
if (select.isInline()) {
ComponentUtils.addCurrentMarkup(select, Markup.INLINE);
}
}
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- UISelectManyCheckbox select = (UISelectManyCheckbox) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
-
- String id = select.getClientId(facesContext);
- List<SelectItem> items = RenderUtils.getItemsToRender(select);
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
- boolean disabled = select.isDisabled();
- boolean readonly = select.isReadonly();
- boolean required = select.isRequired();
- Style style = new Style(facesContext, select);
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+
+ final String id = select.getClientId(facesContext);
+ final List<SelectItem> items = RenderUtils.getItemsToRender(select);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
+ final boolean disabled = select.isDisabled();
+ final boolean readonly = select.isReadonly();
+ final Style style = new Style(facesContext, select);
+ final boolean required = select.isRequired();
// fixme: use CSS, not the Style Attribute for "display"
style.setDisplay(null);
@@ -74,17 +74,17 @@ public class SelectManyCheckboxRenderer
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
boolean first = true;
- Object[] values = select.getSelectedValues();
- for (SelectItem item : items) {
- String itemId = id + ComponentUtils.SUB_SEPARATOR + item.getValue().toString();
+ final Object[] values = select.getSelectedValues();
+ for (final SelectItem item : items) {
+ final String itemId = id + ComponentUtils.SUB_SEPARATOR + item.getValue().toString();
writer.startElement(HtmlElements.LI, select);
writer.startElement(HtmlElements.INPUT, select);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX, false);
- boolean checked = RenderUtils.contains(values, item.getValue());
+ final boolean checked = RenderUtils.contains(values, item.getValue());
writer.writeAttribute(HtmlAttributes.CHECKED, checked);
writer.writeNameAttribute(id);
writer.writeIdAttribute(itemId);
- String formattedValue = RenderUtils.getFormattedValue(facesContext, select, item.getValue());
+ final String formattedValue = RenderUtils.getFormattedValue(facesContext, select, item.getValue());
writer.writeAttribute(HtmlAttributes.VALUE, formattedValue, true);
writer.writeAttribute(HtmlAttributes.DISABLED, item.isDisabled() || disabled);
writer.writeAttribute(HtmlAttributes.READONLY, readonly);
@@ -93,14 +93,14 @@ public class SelectManyCheckboxRenderer
HtmlRendererUtils.renderFocus(id, select.isFocus(), ComponentUtils.isError(select), facesContext, writer);
first = false;
}
- Integer tabIndex = select.getTabIndex();
+ final Integer tabIndex = select.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
HtmlRendererUtils.renderCommandFacet(select, itemId, facesContext, writer);
writer.endElement(HtmlElements.INPUT);
- String label = item.getLabel();
+ final String label = item.getLabel();
if (label != null) {
writer.startElement(HtmlElements.LABEL, select);
writer.writeAttribute(HtmlAttributes.FOR, itemId, false);
@@ -115,13 +115,13 @@ public class SelectManyCheckboxRenderer
}
@Override
- public Measure getHeight(FacesContext facesContext, Configurable component) {
- UISelectManyCheckbox select = (UISelectManyCheckbox) component;
- Measure heightOfOne = super.getHeight(facesContext, component);
+ public Measure getHeight(final FacesContext facesContext, final Configurable component) {
+ final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
+ final Measure heightOfOne = super.getHeight(facesContext, component);
if (select.isInline()) {
return heightOfOne;
} else {
- List<SelectItem> items = RenderUtils.getItemsToRender((UISelectMany) component);
+ final List<SelectItem> items = RenderUtils.getItemsToRender((UISelectMany) component);
return heightOfOne.multiply(items.size());
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java Fri Nov 15 17:10:58 2013
@@ -46,22 +46,22 @@ public class SelectManyListboxRenderer e
return true;
}
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
if (!(component instanceof UISelectManyListbox)) {
LOG.error("Wrong type: Need " + UISelectManyListbox.class.getName()
+ ", but was " + component.getClass().getName());
return;
}
- UISelectManyListbox select = (UISelectManyListbox) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final UISelectManyListbox select = (UISelectManyListbox) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- String id = select.getClientId(facesContext);
- List<SelectItem> items = RenderUtils.getSelectItems(select);
- boolean readonly = select.isReadonly();
- boolean disabled = items.size() == 0 || select.isDisabled() || readonly;
+ final String id = select.getClientId(facesContext);
+ final List<SelectItem> items = RenderUtils.getSelectItems(select);
+ final boolean readonly = select.isReadonly();
+ final boolean disabled = items.size() == 0 || select.isDisabled() || readonly;
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
writer.startElement(HtmlElements.SELECT, select);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
@@ -70,11 +70,11 @@ public class SelectManyListboxRenderer e
writer.writeAttribute(HtmlAttributes.READONLY, readonly);
writer.writeAttribute(HtmlAttributes.REQUIRED, select.isRequired());
HtmlRendererUtils.renderFocus(id, select.isFocus(), ComponentUtils.isError(select), facesContext, writer);
- Integer tabIndex = select.getTabIndex();
+ final Integer tabIndex = select.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- Style style = new Style(facesContext, select);
+ final Style style = new Style(facesContext, select);
writer.writeStyleAttribute(style);
writer.writeClassAttribute(Classes.create(select));
writer.writeAttribute(HtmlAttributes.MULTIPLE, HtmlAttributes.MULTIPLE, false);
@@ -82,7 +82,7 @@ public class SelectManyListboxRenderer e
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
HtmlRendererUtils.renderCommandFacet(select, facesContext, writer);
- Object[] values = select.getSelectedValues();
+ final Object[] values = select.getSelectedValues();
HtmlRendererUtils.renderSelectItems(select, items, values, writer, facesContext);
writer.endElement(HtmlElements.SELECT);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyShuttleRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyShuttleRenderer.java Fri Nov 15 17:10:58 2013
@@ -42,29 +42,29 @@ import java.util.List;
public class SelectManyShuttleRenderer extends SelectManyRendererBase {
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- UISelectManyShuttle select = (UISelectManyShuttle) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UISelectManyShuttle select = (UISelectManyShuttle) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, select);
- Style style = new Style(facesContext, select);
+ final Style style = new Style(facesContext, select);
writer.writeStyleAttribute(style);
writer.writeClassAttribute(Classes.create(select));
- String clientId = select.getClientId(facesContext);
+ final String clientId = select.getClientId(facesContext);
writer.writeIdAttribute(clientId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- boolean hasLabel = select.hasLabel();
+ final boolean hasLabel = select.hasLabel();
// TODO get buttonWidth and label Height from theme
- Measure buttonWidth = Measure.valueOf(50);
+ final Measure buttonWidth = Measure.valueOf(50);
- Measure labelHeight = Measure.valueOf(18);
+ final Measure labelHeight = Measure.valueOf(18);
style.setTop(Measure.valueOf(0));
style.setLeft(Measure.valueOf(0));
- Measure width = style.getWidth();
- Measure selectWidth = width.subtract(buttonWidth).divide(2);
+ final Measure width = style.getWidth();
+ final Measure selectWidth = width.subtract(buttonWidth).divide(2);
style.setWidth(selectWidth);
Style labelStyle = null;
if (hasLabel) {
@@ -73,10 +73,10 @@ public class SelectManyShuttleRenderer e
style.setHeight(style.getHeight().subtract(labelHeight));
style.setTop(style.getTop().add(labelHeight));
}
- List<SelectItem> items = RenderUtils.getSelectItems(select);
- boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
+ final List<SelectItem> items = RenderUtils.getSelectItems(select);
+ final boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
- String unselectedLabel = select.getUnselectedLabel();
+ final String unselectedLabel = select.getUnselectedLabel();
if (unselectedLabel != null) {
writer.startElement(HtmlElements.DIV, null);
writer.writeStyleAttribute(labelStyle);
@@ -86,12 +86,12 @@ public class SelectManyShuttleRenderer e
writer.endElement(HtmlElements.DIV);
}
writer.startElement(HtmlElements.SELECT, null);
- String unselectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "unselected";
+ final String unselectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "unselected";
writer.writeIdAttribute(unselectedClientId);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
// TODO tabIndex
- Integer tabIndex = select.getTabIndex();
+ final Integer tabIndex = select.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
@@ -101,7 +101,7 @@ public class SelectManyShuttleRenderer e
writer.writeAttribute(HtmlAttributes.MULTIPLE, HtmlAttributes.MULTIPLE, false);
- Object[] values = select.getSelectedValues();
+ final Object[] values = select.getSelectedValues();
HtmlRendererUtils.renderSelectItems(select, items, values, false, writer, facesContext);
writer.endElement(HtmlElements.SELECT);
@@ -117,7 +117,7 @@ public class SelectManyShuttleRenderer e
createButton(facesContext, component, writer, disabled, "image/selectManyShuttleRemoveAll.gif", "removeAll");
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
- String selectedLabel = select.getSelectedLabel();
+ final String selectedLabel = select.getSelectedLabel();
if (selectedLabel != null) {
writer.startElement(HtmlElements.DIV, null);
labelStyle.setLeft(labelStyle.getLeft().add(selectWidth).add(buttonWidth));
@@ -129,7 +129,7 @@ public class SelectManyShuttleRenderer e
}
writer.startElement(HtmlElements.SELECT, select);
- String selectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "selected";
+ final String selectedClientId = clientId + ComponentUtils.SUB_SEPARATOR + "selected";
writer.writeIdAttribute(selectedClientId);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
@@ -146,7 +146,7 @@ public class SelectManyShuttleRenderer e
writer.endElement(HtmlElements.SELECT);
writer.startElement(HtmlElements.SELECT, select);
writer.writeClassAttribute(Classes.create(component, "hidden"));
- String hiddenClientId = clientId + ComponentUtils.SUB_SEPARATOR + "hidden";
+ final String hiddenClientId = clientId + ComponentUtils.SUB_SEPARATOR + "hidden";
writer.writeIdAttribute(hiddenClientId);
writer.writeNameAttribute(clientId);
writer.writeAttribute(HtmlAttributes.MULTIPLE, HtmlAttributes.MULTIPLE, false);
@@ -159,14 +159,14 @@ public class SelectManyShuttleRenderer e
writer.endElement(HtmlElements.DIV);
}
- private void createButton(FacesContext context, UIComponent component, TobagoResponseWriter writer,
- boolean disabled, String image, String sub) throws IOException {
+ 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.writeClassAttribute(Classes.create(component, sub));
writer.writeIdAttribute(component.getClientId(context) + ComponentUtils.SUB_SEPARATOR + sub);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
- String imagePath = ResourceManagerUtils.getImageOrDisabledImageWithPath(context, image, disabled);
+ final String imagePath = ResourceManagerUtils.getImageOrDisabledImageWithPath(context, image, disabled);
writer.startElement(HtmlElements.IMG, null);
writer.writeAttribute(HtmlAttributes.SRC, imagePath, true);
writer.endElement(HtmlElements.IMG);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java Fri Nov 15 17:10:58 2013
@@ -47,44 +47,44 @@ public class SelectOneChoiceRenderer ext
return true;
}
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
if (!(component instanceof UISelectOneChoice)) {
LOG.error("Wrong type: Need " + UISelectOneChoice.class.getName()
+ ", but was " + component.getClass().getName());
return;
}
- UISelectOneChoice select = (UISelectOneChoice) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final UISelectOneChoice select = (UISelectOneChoice) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- String id = select.getClientId(facesContext);
- List<SelectItem> items = RenderUtils.getSelectItems(select);
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
- boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
+ final String id = select.getClientId(facesContext);
+ final List<SelectItem> items = RenderUtils.getSelectItems(select);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
+ final boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
writer.startElement(HtmlElements.SELECT, select);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
- Integer tabIndex = select.getTabIndex();
+ final Integer tabIndex = select.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- Style style = new Style(facesContext, select);
+ final Style style = new Style(facesContext, select);
writer.writeStyleAttribute(style);
writer.writeClassAttribute(Classes.create(select));
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- String onchange = HtmlUtils.generateOnchange(select, facesContext);
+ final String onchange = HtmlUtils.generateOnchange(select, facesContext);
if (onchange != null) {
writer.writeAttribute(HtmlAttributes.ONCHANGE, onchange, true);
}
HtmlRendererUtils.renderCommandFacet(select, facesContext , writer);
HtmlRendererUtils.renderFocus(id, select.isFocus(), ComponentUtils.isError(select), facesContext, writer);
- Object[] values = {select.getValue()};
+ final Object[] values = {select.getValue()};
HtmlRendererUtils.renderSelectItems(select, items, values, writer, facesContext);