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 [24/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/SelectOneListboxRenderer.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/SelectOneListboxRenderer.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/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Fri Nov 15 17:10:58 2013
@@ -46,19 +46,19 @@ public class SelectOneListboxRenderer ex
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 UISelectOneListbox)) {
LOG.error("Wrong type: Need " + UISelectOneListbox.class.getName()
+ ", but was " + component.getClass().getName());
return;
}
- UISelectOneListbox select = (UISelectOneListbox) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final UISelectOneListbox select = (UISelectOneListbox) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- String id = select.getClientId(facesContext);
- List<SelectItem> items = RenderUtils.getSelectItems(select);
- boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
+ final String id = select.getClientId(facesContext);
+ final List<SelectItem> items = RenderUtils.getSelectItems(select);
+ final boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
writer.startElement(HtmlElements.SELECT, select);
writer.writeNameAttribute(id);
@@ -69,17 +69,17 @@ public class SelectOneListboxRenderer ex
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));
HtmlRendererUtils.renderTip(select, writer);
writer.writeAttribute(HtmlAttributes.SIZE, 9); // must be > 1, but the real size comes from the layout
HtmlRendererUtils.renderCommandFacet(select, facesContext, writer);
- Object[] values = {select.getValue()};
+ final Object[] values = {select.getValue()};
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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java Fri Nov 15 17:10:58 2013
@@ -43,25 +43,25 @@ import java.util.List;
public class SelectOneRadioRenderer extends SelectOneRendererBase {
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
- UISelectOne select = (UISelectOne) component;
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UISelectOne select = (UISelectOne) component;
super.prepareRender(facesContext, select);
if (select instanceof UISelectOneRadio && ((UISelectOneRadio) select).isInline()) {
ComponentUtils.addCurrentMarkup(((UISelectOneRadio) select), Markup.INLINE);
}
}
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- UISelectOneRadio select = (UISelectOneRadio) 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();
- Style style = new Style(facesContext, select);
- boolean required = select.isRequired();
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UISelectOneRadio select = (UISelectOneRadio) 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 SelectOneRadioRenderer exte
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
boolean first = true;
- Object value = select.getValue();
- for (SelectItem item : items) {
- String itemId = id + ComponentUtils.SUB_SEPARATOR + item.getValue().toString();
+ final Object value = select.getValue();
+ 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.RADIO, false);
- boolean checked = item.getValue().equals(value);
+ final boolean checked = item.getValue().equals(value);
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 SelectOneRadioRenderer exte
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 SelectOneRadioRenderer exte
}
@Override
- public Measure getHeight(FacesContext facesContext, Configurable component) {
- UISelectOneRadio select = (UISelectOneRadio) component;
- Measure heightOfOne = super.getHeight(facesContext, component);
+ public Measure getHeight(final FacesContext facesContext, final Configurable component) {
+ final UISelectOneRadio select = (UISelectOneRadio) component;
+ final Measure heightOfOne = super.getHeight(facesContext, component);
if (select.isInline()) {
return heightOfOne;
} else {
- List<SelectItem> items = RenderUtils.getItemsToRender((UISelectOne) component);
+ final List<SelectItem> items = RenderUtils.getItemsToRender((UISelectOne) 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/SelectReferenceRenderer.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/SelectReferenceRenderer.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/SelectReferenceRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java Fri Nov 15 17:10:58 2013
@@ -33,12 +33,12 @@ public class SelectReferenceRenderer ext
private static final Logger LOG = LoggerFactory.getLogger(SelectReferenceRenderer.class);
- public void encodeEnd(FacesContext facesContext,
- UIComponent component)
+ public void encodeEnd(final FacesContext facesContext,
+ final UIComponent component)
throws IOException {
- String referenceId = (String)
+ final String referenceId = (String)
component.getAttributes().get(Attributes.FOR);
- UIComponent reference = component.findComponent(referenceId);
+ final UIComponent reference = component.findComponent(referenceId);
reference.getAttributes().put(Attributes.RENDER_RANGE_EXTERN,
component.getAttributes().get(Attributes.RENDER_RANGE));
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.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/SheetPageCommandRenderer.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/SheetPageCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java Fri Nov 15 17:10:58 2013
@@ -35,32 +35,32 @@ public class SheetPageCommandRenderer ex
private static final Logger LOG = LoggerFactory.getLogger(SheetPageCommandRenderer.class);
@Override
- public void decode(FacesContext facesContext, UIComponent component) {
- String actionId = FacesContextUtils.getActionId(facesContext);
- String clientId = component.getClientId(facesContext);
+ public void decode(final FacesContext facesContext, final UIComponent component) {
+ final String actionId = FacesContextUtils.getActionId(facesContext);
+ final String clientId = component.getClientId(facesContext);
if (LOG.isDebugEnabled()) {
LOG.debug("actionId = '" + actionId + "'");
LOG.debug("clientId = '" + clientId + "'");
}
if (actionId != null && actionId.equals(clientId)) {
- PageAction action;
+ final PageAction action;
try {
action = PageAction.parse(component.getId());
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Illegal value for PageAction :" + component.getId());
return;
}
- PageActionEvent event = new PageActionEvent(component.getParent(), action);
+ final PageActionEvent event = new PageActionEvent(component.getParent(), action);
switch (action) {
case TO_PAGE:
case TO_ROW:
- Map map = facesContext.getExternalContext().getRequestParameterMap();
- Object value = map.get(clientId + ComponentUtils.SUB_SEPARATOR + "value");
+ final Map map = facesContext.getExternalContext().getRequestParameterMap();
+ final Object value = map.get(clientId + ComponentUtils.SUB_SEPARATOR + "value");
try {
event.setValue(Integer.parseInt((String) value));
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOG.error("Can't parse integer value for action " + action.name() + ": " + value);
}
break;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.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/SheetRenderer.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/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Fri Nov 15 17:10:58 2013
@@ -69,6 +69,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
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.CreateComponentUtils;
@@ -101,19 +102,19 @@ public class SheetRenderer extends Layou
private static final Integer HEIGHT_0 = 0;
@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);
ensureHeader(facesContext, (UISheet) component);
}
- private void ensureHeader(FacesContext facesContext, UISheet sheet) {
+ private void ensureHeader(final FacesContext facesContext, final UISheet sheet) {
UIComponent header = sheet.getHeader();
if (header == null) {
header = CreateComponentUtils.createComponent(facesContext, ComponentTypes.PANEL, null, "_header");
header.setTransient(true);
final List<AbstractUIColumn> columns = ComponentUtils.findDescendantList(sheet, AbstractUIColumn.class);
int i = 0;
- for (AbstractUIColumn column : columns) {
+ for (final AbstractUIColumn column : columns) {
final AbstractUIOut out = (AbstractUIOut) CreateComponentUtils.createComponent(
facesContext, ComponentTypes.OUT, RendererTypes.OUT, "_col" + i);
out.setTransient(true);
@@ -138,15 +139,15 @@ public class SheetRenderer extends Layou
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent uiComponent) throws IOException {
- UISheet sheet = (UISheet) uiComponent;
+ final UISheet sheet = (UISheet) uiComponent;
- Style style = new Style(facesContext, sheet);
+ final Style style = new Style(facesContext, sheet);
final String sheetId = sheet.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
// Outer sheet div
writer.startElement(HtmlElements.DIV, sheet);
@@ -154,9 +155,9 @@ public class SheetRenderer extends Layou
HtmlRendererUtils.writeDataAttributes(facesContext, writer, sheet);
writer.writeClassAttribute(Classes.create(sheet));
writer.writeStyleAttribute(style);
- UIComponent facetReload = sheet.getFacet(Facets.RELOAD);
+ final UIComponent facetReload = sheet.getFacet(Facets.RELOAD);
if (facetReload != null && facetReload instanceof UIReload && facetReload.isRendered()) {
- UIReload update = (UIReload) facetReload;
+ final UIReload update = (UIReload) facetReload;
writer.writeAttribute(DataAttributes.RELOAD, update.getFrequency());
}
@@ -165,14 +166,15 @@ public class SheetRenderer extends Layou
writer.writeAttribute(DataAttributes.SELECTION_MODE, sheet.getSelectable(), false);
writer.writeAttribute(DataAttributes.FIRST, Integer.toString(sheet.getFirst()), false);
- boolean rowAction = HtmlRendererUtils.renderSheetCommands(sheet, facesContext, writer);
+ final boolean rowAction = HtmlRendererUtils.renderSheetCommands(sheet, facesContext, writer);
renderSheet(facesContext, sheet, rowAction, style);
writer.endElement(HtmlElements.DIV);
}
- private void renderSheet(FacesContext facesContext, UISheet sheet, boolean hasClickAction, Style style)
+ private void renderSheet(
+ final FacesContext facesContext, final UISheet sheet, final boolean hasClickAction, final Style style)
throws IOException {
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
@@ -230,7 +232,7 @@ public class SheetRenderer extends Layou
&& ComponentUtils.findDescendant(sheet, UISelectOne.class) != null;
// BEGIN RENDER BODY CONTENT
- Style bodyStyle = new Style();
+ final Style bodyStyle = new Style();
/*
bodyStyle.setPosition(Position.RELATIVE);
*/
@@ -263,7 +265,7 @@ public class SheetRenderer extends Layou
writer.writeStyleAttribute(bodyStyle);
bodyStyle.setHeight(null);
bodyStyle.setTop(null);
- Style sheetBodyStyle = new Style(bodyStyle);
+ final Style sheetBodyStyle = new Style(bodyStyle);
// is null, in AJAX case.
if (sheet.getNeedVerticalScrollbar() == Boolean.TRUE) {
tableBodyWidth = tableBodyWidth.subtractNotNegative(getVerticalScrollbarWeight(facesContext, sheet));
@@ -279,7 +281,7 @@ public class SheetRenderer extends Layou
if (columnWidths != null) {
writer.startElement(HtmlElements.COLGROUP, null);
- for (Integer columnWidth : columnWidths) {
+ for (final Integer columnWidth : columnWidths) {
writer.startElement(HtmlElements.COL, null);
writer.writeAttribute(HtmlAttributes.WIDTH, columnWidth);
writer.endElement(HtmlElements.COL);
@@ -305,7 +307,7 @@ public class SheetRenderer extends Layou
break;
}
- Object rowRendered = sheet.getAttributes().get("rowRendered");
+ final Object rowRendered = sheet.getAttributes().get("rowRendered");
if (rowRendered instanceof Boolean && !((Boolean) rowRendered)) {
continue;
}
@@ -336,13 +338,13 @@ public class SheetRenderer extends Layou
if (selected) {
rowMarkup = rowMarkup.add(Markup.SELECTED);
}
- String[] rowMarkups = (String[]) sheet.getAttributes().get("rowMarkup");
+ final String[] rowMarkups = (String[]) sheet.getAttributes().get("rowMarkup");
if (rowMarkups != null) {
rowMarkup = rowMarkup.add(Markup.valueOf(rowMarkups));
}
writer.writeClassAttribute(Classes.create(sheet, "row", rowMarkup));
if (!sheet.isRowVisible()) {
- Style rowStyle = new Style();
+ final Style rowStyle = new Style();
rowStyle.setDisplay(Display.NONE);
writer.writeStyleAttribute(rowStyle);
}
@@ -352,7 +354,7 @@ public class SheetRenderer extends Layou
}
int columnIndex = -1;
- for (UIColumn column : renderedColumnList) {
+ for (final UIColumn column : renderedColumnList) {
columnIndex++;
writer.startElement(HtmlElements.TD, column);
@@ -373,7 +375,7 @@ public class SheetRenderer extends Layou
writer.writeClassAttribute(Classes.create(sheet, "cell", markup));
final TextAlign align = TextAlign.parse((String) column.getAttributes().get(Attributes.ALIGN));
if (align != null) {
- Style alignStyle = new Style();
+ final Style alignStyle = new Style();
alignStyle.setTextAlign(align);
writer.writeStyleAttribute(alignStyle);
}
@@ -388,16 +390,16 @@ public class SheetRenderer extends Layou
writer.writeClassAttribute(Classes.create(sheet, "columnSelector"));
writer.endElement(HtmlElements.INPUT);
} else if (column instanceof AbstractUIColumnNode) {
- RenderUtils.prepareRendererAll(facesContext, column);
+ EncodeUtils.prepareRendererAll(facesContext, column);
RenderUtils.encode(facesContext, column);
} else {
- List<UIComponent> children = sheet.getRenderedChildrenOf(column);
- for (UIComponent grandKid : children) {
+ final List<UIComponent> children = sheet.getRenderedChildrenOf(column);
+ for (final UIComponent grandKid : children) {
// set height to 0 to prevent use of layoutheight from parent
grandKid.getAttributes().put(Attributes.LAYOUT_HEIGHT, HEIGHT_0);
// XXX hotfix
if (grandKid instanceof LayoutBase) {
- LayoutBase base = (LayoutBase) grandKid;
+ final LayoutBase base = (LayoutBase) grandKid;
if (base.getLeft() != null) {
base.setLeft(null);
}
@@ -405,7 +407,7 @@ public class SheetRenderer extends Layou
base.setTop(null);
}
}
- RenderUtils.prepareRendererAll(facesContext, grandKid);
+ EncodeUtils.prepareRendererAll(facesContext, grandKid);
RenderUtils.encode(facesContext, grandKid);
}
}
@@ -428,12 +430,12 @@ public class SheetRenderer extends Layou
if (emptySheet && showHeader) {
writer.startElement(HtmlElements.TR, null);
int columnIndex = -1;
- for (UIColumn ignored : renderedColumnList) {
+ for (final UIColumn ignored : renderedColumnList) {
columnIndex++;
writer.startElement(HtmlElements.TD, null);
writer.startElement(HtmlElements.DIV, null);
- Integer divWidth = sheet.getWidthList().get(columnIndex);
- Style divStyle = new Style();
+ final Integer divWidth = sheet.getWidthList().get(columnIndex);
+ final Style divStyle = new Style();
divStyle.setWidth(Measure.valueOf(divWidth));
writer.writeStyleAttribute(divStyle);
writer.endElement(HtmlElements.DIV);
@@ -454,7 +456,7 @@ public class SheetRenderer extends Layou
// END RENDER BODY CONTENT
if (sheet.isPagingVisible()) {
- Style footerStyle = new Style();
+ final Style footerStyle = new Style();
footerStyle.setWidth(sheet.getCurrentWidth());
if (ie6SelectOneFix) {
footerStyle.setTop(headerHeight);
@@ -507,7 +509,7 @@ public class SheetRenderer extends Layou
writer.writeIdAttribute(sheetId + ComponentUtils.SUB_SEPARATOR + "pagingPages");
writer.writeText("");
- boolean atBeginning = sheet.isAtBeginning();
+ final boolean atBeginning = sheet.isAtBeginning();
link(facesContext, application, atBeginning, PageAction.FIRST, sheet);
link(facesContext, application, atBeginning, PageAction.PREV, sheet);
writer.startElement(HtmlElements.SPAN, null);
@@ -517,7 +519,7 @@ public class SheetRenderer extends Layou
writer.flush(); // is needed in some cases, e. g. TOBAGO-1094
writer.write(createSheetPagingInfo(sheet, facesContext, pagerCommandId, false));
writer.endElement(HtmlElements.SPAN);
- boolean atEnd = sheet.isAtEnd();
+ final boolean atEnd = sheet.isAtEnd();
link(facesContext, application, atEnd, PageAction.NEXT, sheet);
link(facesContext, application, atEnd || !sheet.hasRowCount(), PageAction.LAST, sheet);
writer.endElement(HtmlElements.SPAN);
@@ -546,8 +548,8 @@ public class SheetRenderer extends Layou
* Pure is needed for <tc:panel>, <tc:in>, etc.<br/>
* Pure is not needed for <tc:out> and <tc:link>
*/
- private boolean isPure(UIColumn column) {
- for (UIComponent child : column.getChildren()) {
+ private boolean isPure(final UIColumn column) {
+ for (final UIComponent child : column.getChildren()) {
if (!(child instanceof UIOut) && !(child instanceof UILink)) {
return true;
}
@@ -555,12 +557,13 @@ public class SheetRenderer extends Layou
return false;
}
- private String createSheetPagingInfo(UISheet sheet, FacesContext facesContext, String pagerCommandId, boolean row) {
- String sheetPagingInfo;
+ private String createSheetPagingInfo(
+ final UISheet sheet, final FacesContext facesContext, final String pagerCommandId, final boolean row) {
+ final String sheetPagingInfo;
if (sheet.getRowCount() != 0) {
- Locale locale = facesContext.getViewRoot().getLocale();
- int first = row ? sheet.getFirst() + 1 : sheet.getCurrentPage() + 1;
- int last = sheet.hasRowCount()
+ final Locale locale = facesContext.getViewRoot().getLocale();
+ final int first = row ? sheet.getFirst() + 1 : sheet.getCurrentPage() + 1;
+ final int last = sheet.hasRowCount()
? row ? sheet.getLastRowIndexOfCurrentPage() : sheet.getPages()
: -1;
final boolean unknown = !sheet.hasRowCount();
@@ -571,7 +574,7 @@ public class SheetRenderer extends Layou
+ (first == last ? "" : "s"); // plural
final String message = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", key);
final MessageFormat detail = new MessageFormat(message, locale);
- Object[] args = {
+ final Object[] args = {
first,
last == -1 ? "?" : last,
unknown ? "" : sheet.getRowCount(),
@@ -587,16 +590,16 @@ public class SheetRenderer extends Layou
}
@Override
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
super.decode(facesContext, component);
- UISheet sheet = (UISheet) component;
+ final UISheet sheet = (UISheet) component;
String key = sheet.getClientId(facesContext) + WIDTHS_POSTFIX;
- Map requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
+ final Map requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
if (requestParameterMap.containsKey(key)) {
- String widths = (String) requestParameterMap.get(key);
+ final String widths = (String) requestParameterMap.get(key);
if (widths.trim().length() > 0) {
sheet.getAttributes().put(Attributes.WIDTH_LIST_STRING, widths);
}
@@ -604,14 +607,14 @@ public class SheetRenderer extends Layou
key = sheet.getClientId(facesContext) + SELECTED_POSTFIX;
if (requestParameterMap.containsKey(key)) {
- String selected = (String) requestParameterMap.get(key);
+ final String selected = (String) requestParameterMap.get(key);
if (LOG.isDebugEnabled()) {
LOG.debug("selected = " + selected);
}
List<Integer> selectedRows;
try {
selectedRows = StringUtils.parseIntegerList(selected);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOG.warn(selected, e);
selectedRows = Collections.emptyList();
}
@@ -623,24 +626,24 @@ public class SheetRenderer extends Layou
RenderUtils.decodedStateOfTreeData(facesContext, sheet);
}
- private Measure getHeaderHeight(FacesContext facesContext, UISheet sheet) {
- int rows = sheet.getHeaderGrid() != null ? sheet.getHeaderGrid().getRowCount() : 0;
+ private Measure getHeaderHeight(final FacesContext facesContext, final UISheet sheet) {
+ final int rows = sheet.getHeaderGrid() != null ? sheet.getHeaderGrid().getRowCount() : 0;
return sheet.isShowHeader()
? getResourceManager().getThemeMeasure(facesContext, sheet, "headerHeight").multiply(rows)
: Measure.ZERO;
}
- private Measure getRowHeight(FacesContext facesContext, UISheet sheet) {
+ private Measure getRowHeight(final FacesContext facesContext, final UISheet sheet) {
return getResourceManager().getThemeMeasure(facesContext, sheet, "rowHeight");
}
- private Measure getFooterHeight(FacesContext facesContext, UISheet sheet) {
+ private Measure getFooterHeight(final FacesContext facesContext, final UISheet sheet) {
return sheet.isPagingVisible()
? getResourceManager().getThemeMeasure(facesContext, sheet, "footerHeight")
: Measure.ZERO;
}
- private Markup markupForLeftCenterRight(String name) {
+ private Markup markupForLeftCenterRight(final String name) {
if ("left".equals(name)) {
return Markup.LEFT;
}
@@ -653,7 +656,7 @@ public class SheetRenderer extends Layou
return Markup.NULL;
}
- private String checkPagingAttribute(String name) {
+ private String checkPagingAttribute(final String name) {
if (isNotNone(name)) {
return name;
} else {
@@ -664,7 +667,7 @@ public class SheetRenderer extends Layou
}
}
- private boolean isNotNone(String value) {
+ private boolean isNotNone(final String value) {
// todo: use enum type instead of string
return "left".equals(value) || "center".equals(value) || "right".equals(value);
}
@@ -674,9 +677,8 @@ public class SheetRenderer extends Layou
return true;
}
- private List<Integer> getSelectedRows(UISheet data, SheetState state) {
- List<Integer> selected = (List<Integer>)
- data.getAttributes().get(Attributes.SELECTED_LIST_STRING);
+ private List<Integer> getSelectedRows(final UISheet data, final SheetState state) {
+ List<Integer> selected = (List<Integer>) data.getAttributes().get(Attributes.SELECTED_LIST_STRING);
if (selected == null && state != null) {
selected = state.getSelectedRows();
}
@@ -686,24 +688,24 @@ public class SheetRenderer extends Layou
return selected;
}
- private void link(FacesContext facesContext, Application application,
- boolean disabled, PageAction command, UISheet data)
+ private void link(final FacesContext facesContext, final Application application,
+ final boolean disabled, final PageAction command, final UISheet data)
throws IOException {
- UICommand link = createPagingCommand(application, command, disabled);
+ final UICommand link = createPagingCommand(application, command, disabled);
data.getFacets().put(command.getToken(), link);
- String tip = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago",
+ final String tip = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago",
"sheet" + command.getToken());
- String image = ResourceManagerUtils.getImageWithPath(facesContext,
+ final String image = ResourceManagerUtils.getImageWithPath(facesContext,
"image/sheet" + command.getToken() + (disabled ? "Disabled" : "") + ".gif");
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.IMG, null);
writer.writeIdAttribute(data.getClientId(facesContext)
+ ComponentUtils.SUB_SEPARATOR + "pagingPages" + ComponentUtils.SUB_SEPARATOR + command.getToken());
- Classes pagerClasses = Classes.create(data, "footerPagerButton", disabled ? Markup.DISABLED : null);
+ final Classes pagerClasses = Classes.create(data, "footerPagerButton", disabled ? Markup.DISABLED : null);
writer.writeClassAttribute(pagerClasses);
writer.writeAttribute(HtmlAttributes.SRC, image, false);
writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
@@ -717,8 +719,10 @@ public class SheetRenderer extends Layou
// TODO
private void renderColumnHeaders(
- FacesContext facesContext, UISheet sheet, TobagoResponseWriter writer, ResourceManager resourceManager,
- String contextPath, String sheetId, List<AbstractUIColumn> renderedColumnList, Measure headerWidth)
+ final FacesContext facesContext, final UISheet sheet, final TobagoResponseWriter writer,
+ final ResourceManager resourceManager,
+ final String contextPath, final String sheetId, final List<AbstractUIColumn> renderedColumnList,
+ final Measure headerWidth)
throws IOException {
final Grid grid = sheet.getHeaderGrid();
@@ -730,7 +734,7 @@ public class SheetRenderer extends Layou
LOG.debug("*****************************************************");
}
- boolean needVerticalScrollbar = needVerticalScrollbar(facesContext, sheet);
+ final boolean needVerticalScrollbar = needVerticalScrollbar(facesContext, sheet);
int verticalScrollbarWidth = 0;
writer.startElement(HtmlElements.DIV, sheet);
@@ -781,7 +785,7 @@ public class SheetRenderer extends Layou
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(sheet, "headerCell"));
writer.startElement(HtmlElements.SPAN, null);
- Style headerStyle = new Style();
+ final Style headerStyle = new Style();
Measure headerHeight = Measure.valueOf(20).multiply(cell.getRowSpan());
if (!pure) {
headerHeight = headerHeight.subtract(6); // XXX todo
@@ -818,9 +822,9 @@ public class SheetRenderer extends Layou
markup = markup.add(Markup.SORTABLE);
- SheetState sheetState = sheet.getSheetState(facesContext);
+ final SheetState sheetState = sheet.getSheetState(facesContext);
if (column.getId().equals(sheetState.getSortedColumnId())) {
- String sortTitle;
+ final String sortTitle;
if (sheetState.isAscending()) {
sorterImage = contextPath + resourceManager.getImage(facesContext, "image/ascending.gif");
sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetAscending");
@@ -851,7 +855,7 @@ public class SheetRenderer extends Layou
} else {
RenderUtils.encode(facesContext, cellComponent);
- AbstractUIMenu dropDownMenu = FacetUtils.getDropDownMenu(column);
+ final AbstractUIMenu dropDownMenu = FacetUtils.getDropDownMenu(column);
// render sub menu popup button
if (dropDownMenu != null && dropDownMenu.isRendered()) {
@@ -859,7 +863,8 @@ public class SheetRenderer extends Layou
writer.writeClassAttribute(Classes.create(column, "menu"));
writer.startElement(HtmlElements.IMG, column);
- String menuImage = ResourceManagerUtils.getImageWithPath(facesContext, "image/sheetSelectorMenu.gif");
+ final String menuImage
+ = ResourceManagerUtils.getImageWithPath(facesContext, "image/sheetSelectorMenu.gif");
writer.writeAttribute(HtmlAttributes.TITLE, "", false);
writer.writeAttribute(HtmlAttributes.SRC, menuImage, false);
writer.endElement(HtmlElements.IMG);
@@ -901,11 +906,12 @@ public class SheetRenderer extends Layou
writer.endElement(HtmlElements.DIV);
}
- private boolean needVerticalScrollbar(FacesContext facesContext, UISheet sheet) {
+ private boolean needVerticalScrollbar(final FacesContext facesContext, final UISheet sheet) {
return ((AbstractUISheetLayout) sheet.getLayoutManager()).needVerticalScrollbar(facesContext, sheet);
}
- private void encodeResizing(TobagoResponseWriter writer, AbstractUISheet sheet, int columnIndex) throws IOException {
+ private void encodeResizing(final TobagoResponseWriter writer, final AbstractUISheet sheet, final int columnIndex)
+ throws IOException {
writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(Classes.create(sheet, "headerResize"));
writer.writeAttribute(DataAttributes.COLUMN_INDEX, Integer.toString(columnIndex), false);
@@ -914,7 +920,7 @@ public class SheetRenderer extends Layou
}
protected void renderColumnSelectorHeader(
- FacesContext facesContext, TobagoResponseWriter writer, UISheet sheet)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UISheet sheet)
throws IOException {
final UIToolBar toolBar = createToolBar(facesContext, sheet);
@@ -922,14 +928,14 @@ public class SheetRenderer extends Layou
writer.writeClassAttribute(Classes.create(sheet, "toolBar"));
if (UISheet.MULTI.equals(sheet.getSelectable())) {
- RenderUtils.prepareRendererAll(facesContext, toolBar);
+ EncodeUtils.prepareRendererAll(facesContext, toolBar);
RenderUtils.encode(facesContext, toolBar);
}
writer.endElement(HtmlElements.DIV);
}
- private UIToolBar createToolBar(FacesContext facesContext, UISheet sheet) {
+ private UIToolBar createToolBar(final FacesContext facesContext, final UISheet sheet) {
final Application application = facesContext.getApplication();
final UICommand dropDown = (UICommand) CreateComponentUtils.createComponent(
facesContext, UICommand.COMPONENT_TYPE, null, "dropDown");
@@ -952,7 +958,8 @@ public class SheetRenderer extends Layou
}
private void createMenuItem(
- final FacesContext facesContext, UIMenu menu, String label, Markup markup, String sheetId) {
+ final FacesContext facesContext, final UIMenu menu, final String label, final Markup markup,
+ final String sheetId) {
final String id = markup.toString();
final UIMenuCommand menuItem = (UIMenuCommand) CreateComponentUtils.createComponent(
facesContext, UIMenuCommand.COMPONENT_TYPE, RendererTypes.MENU_COMMAND, id);
@@ -964,17 +971,18 @@ public class SheetRenderer extends Layou
}
private void writeDirectPagingLinks(
- TobagoResponseWriter writer, FacesContext facesContext, Application application, UISheet sheet)
+ final TobagoResponseWriter writer, final FacesContext facesContext, final Application application,
+ final UISheet sheet)
throws IOException {
UICommand pagerCommand = (UICommand) sheet.getFacet(Facets.PAGER_PAGE);
if (pagerCommand == null) {
pagerCommand = createPagingCommand(application, PageAction.TO_PAGE, false);
sheet.getFacets().put(Facets.PAGER_PAGE, pagerCommand);
}
- String pagerCommandId = pagerCommand.getClientId(facesContext);
+ final String pagerCommandId = pagerCommand.getClientId(facesContext);
int linkCount = ComponentUtils.getIntAttribute(sheet, Attributes.DIRECT_LINK_COUNT);
linkCount--; // current page needs no link
- ArrayList<Integer> prevs = new ArrayList<Integer>(linkCount);
+ final ArrayList<Integer> prevs = new ArrayList<Integer>(linkCount);
int page = sheet.getCurrentPage() + 1;
for (int i = 0; i < linkCount && page > 1; i++) {
page--;
@@ -983,7 +991,7 @@ public class SheetRenderer extends Layou
}
}
- ArrayList<Integer> nexts = new ArrayList<Integer>(linkCount);
+ final ArrayList<Integer> nexts = new ArrayList<Integer>(linkCount);
page = sheet.getCurrentPage() + 1;
final int pages = sheet.hasRowCount() || sheet.isRowsUnlimited() ? sheet.getPages() : Integer.MAX_VALUE;
for (int i = 0; i < linkCount && page < pages; i++) {
@@ -1025,14 +1033,14 @@ public class SheetRenderer extends Layou
}
writeLinkElement(writer, sheet, name, Integer.toString(skip), pagerCommandId, true);
}
- for (Integer prev : prevs) {
+ for (final Integer prev : prevs) {
name = prev.toString();
writeLinkElement(writer, sheet, name, name, pagerCommandId, true);
}
name = Integer.toString(sheet.getCurrentPage() + 1);
writeLinkElement(writer, sheet, name, name, pagerCommandId, false);
- for (Integer next : nexts) {
+ for (final Integer next : nexts) {
name = next.toString();
writeLinkElement(writer, sheet, name, name, pagerCommandId, true);
}
@@ -1052,8 +1060,9 @@ public class SheetRenderer extends Layou
}
}
- private UICommand createPagingCommand(Application application, PageAction command, boolean disabled) {
- UICommand link;
+ private UICommand createPagingCommand(
+ final Application application, final PageAction command, final boolean disabled) {
+ final UICommand link;
link = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
link.setRendererType(RendererTypes.SHEET_PAGE_COMMAND);
link.setRendered(true);
@@ -1064,9 +1073,10 @@ public class SheetRenderer extends Layou
}
private void writeLinkElement(
- TobagoResponseWriter writer, UISheet sheet, String str, String skip, String id, boolean makeLink)
+ final TobagoResponseWriter writer, final UISheet sheet, final String str, final String skip, final String id,
+ final boolean makeLink)
throws IOException {
- String type = makeLink ? HtmlElements.A : HtmlElements.SPAN;
+ final String type = makeLink ? HtmlElements.A : HtmlElements.SPAN;
writer.startElement(type, null);
writer.writeClassAttribute(Classes.create(sheet, "pagingLink"));
if (makeLink) {
@@ -1078,12 +1088,12 @@ public class SheetRenderer extends Layou
writer.endElement(type);
}
- private Measure getContentBorder(FacesContext facesContext, UISheet data) {
+ private Measure getContentBorder(final FacesContext facesContext, final UISheet data) {
return getBorderLeft(facesContext, data).add(getBorderRight(facesContext, data));
}
@Override
- public Measure getPreferredHeight(FacesContext facesContext, Configurable component) {
+ public Measure getPreferredHeight(final FacesContext facesContext, final Configurable component) {
final UISheet sheet = (UISheet) component;
final Measure headerHeight = getHeaderHeight(facesContext, sheet);
final Measure rowHeight = getRowHeight(facesContext, sheet);
@@ -1104,7 +1114,7 @@ public class SheetRenderer extends Layou
}
@Override
- public void encodeChildren(FacesContext context, UIComponent component) throws IOException {
+ public void encodeChildren(final FacesContext context, final UIComponent component) throws IOException {
// DO Nothing
}
@@ -1114,9 +1124,9 @@ public class SheetRenderer extends Layou
}
@Override
- public void prepareRendersChildren(FacesContext facesContext, UIComponent component) throws IOException {
- UISheet sheet = (UISheet) component;
- for (UIColumn column : sheet.getRenderedColumns()) {
+ public void prepareRendersChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UISheet sheet = (UISheet) component;
+ for (final UIColumn column : sheet.getRenderedColumns()) {
if (column instanceof AbstractUIColumnNode) {
if (LOG.isDebugEnabled()) {
LOG.debug("TODO: AbstractUIColumnNode are not prepared.");
@@ -1125,7 +1135,7 @@ public class SheetRenderer extends Layou
// TBD: iterate over each row to prepare it.
// TBD: in the moment this method TreeNodeRendererBase.prepareRender() will not be called in sheets
} else {
- RenderUtils.prepareRendererAll(facesContext, column);
+ EncodeUtils.prepareRendererAll(facesContext, column);
}
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/StyleRenderer.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/StyleRenderer.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/StyleRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/StyleRenderer.java Fri Nov 15 17:10:58 2013
@@ -30,14 +30,14 @@ import java.io.IOException;
public class StyleRenderer 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);
- UIStyle styleComponent = (UIStyle) component;
- String file = styleComponent.getFile();
+ final UIStyle styleComponent = (UIStyle) component;
+ final String file = styleComponent.getFile();
if (file != null) {
FacesContextUtils.addStyleFile(facesContext, file);
}
- String style = styleComponent.getStyle();
+ final String style = styleComponent.getStyle();
if (style != null) {
FacesContextUtils.addStyleBlock(facesContext, style);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.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/SubviewRenderer.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/SubviewRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java Fri Nov 15 17:10:58 2013
@@ -31,7 +31,7 @@ public class SubviewRenderer extends Lay
private static final Logger LOG = LoggerFactory.getLogger(SubviewRenderer.class);
- public void encodeBegin(FacesContext facesContext, UIComponent component)
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component)
throws IOException {
if (LOG.isInfoEnabled()) {
LOG.info("SSSSSSSSSSSSSSSSSSS Subview component = " + component.getClass().getName());
@@ -39,8 +39,8 @@ public class SubviewRenderer extends Lay
super.encodeBegin(facesContext, component);
}
- public void encodeEnd(FacesContext facesContext,
- UIComponent component) throws IOException {
+ public void encodeEnd(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/SuggestRenderer.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/SuggestRenderer.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/SuggestRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SuggestRenderer.java Fri Nov 15 17:10:58 2013
@@ -43,7 +43,7 @@ import java.util.List;
public class SuggestRenderer extends InputRendererBase {
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISuggest suggest = (UISuggest) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -78,7 +78,7 @@ public class SuggestRenderer extends Inp
writer.endElement(HtmlElements.A);
writer.startElement(HtmlElements.OL, null);
- for (AutoSuggestItem item : items.getItems()) {
+ for (final AutoSuggestItem item : items.getItems()) {
writer.startElement(HtmlElements.LI, null);
writer.startElement(HtmlElements.A, null);
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
@@ -105,19 +105,19 @@ public class SuggestRenderer extends Inp
writer.endElement(HtmlElements.DIV);
}
- private AutoSuggestItems createAutoSuggestItems(Object object) {
+ private AutoSuggestItems createAutoSuggestItems(final Object object) {
if (object instanceof AutoSuggestItems) {
return (AutoSuggestItems) object;
}
- AutoSuggestItems autoSuggestItems = new AutoSuggestItems();
+ final AutoSuggestItems autoSuggestItems = new AutoSuggestItems();
if (object instanceof List && !((List) object).isEmpty()) {
if (((List) object).get(0) instanceof AutoSuggestItem) {
//noinspection unchecked
autoSuggestItems.setItems((List<AutoSuggestItem>) object);
} else if (((List) object).get(0) instanceof String) {
- List<AutoSuggestItem> items = new ArrayList<AutoSuggestItem>(((List) object).size());
+ final List<AutoSuggestItem> items = new ArrayList<AutoSuggestItem>(((List) object).size());
for (int i = 0; i < ((List) object).size(); i++) {
- AutoSuggestItem item = new AutoSuggestItem();
+ final AutoSuggestItem item = new AutoSuggestItem();
item.setLabel((String) ((List) object).get(i));
item.setValue((String) ((List) object).get(i));
items.add(item);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.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/TabGroupLayoutRenderer.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/TabGroupLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.java Fri Nov 15 17:10:58 2013
@@ -34,8 +34,8 @@ public class TabGroupLayoutRenderer exte
private static final Logger LOG = LoggerFactory.getLogger(TabGroupLayoutRenderer.class);
@Override
- public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
- UIComponent container = component.getParent();
+ public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final UIComponent container = component.getParent();
LOG.info("TAB GROUP LAYOUT RENDERER");
if (container instanceof LayoutContainer && !((LayoutContainer) container).isLayoutChildren()) {
return;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.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/TabGroupRenderer.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/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Fri Nov 15 17:10:58 2013
@@ -67,38 +67,38 @@ public class TabGroupRenderer extends La
public static final String ACTIVE_INDEX_POSTFIX = ComponentUtils.SUB_SEPARATOR + "activeIndex";
@Override
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
if (ComponentUtils.isOutputOnly(component)) {
return;
}
- int oldIndex = ((UITabGroup) component).getRenderedIndex();
+ final int oldIndex = ((UITabGroup) component).getRenderedIndex();
- String clientId = component.getClientId(facesContext);
+ final String clientId = component.getClientId(facesContext);
final Map parameters = facesContext.getExternalContext().getRequestParameterMap();
- String newValue = (String) parameters.get(clientId + ACTIVE_INDEX_POSTFIX);
+ final String newValue = (String) parameters.get(clientId + ACTIVE_INDEX_POSTFIX);
try {
- int activeIndex = Integer.parseInt(newValue);
+ final int activeIndex = Integer.parseInt(newValue);
if (activeIndex != oldIndex) {
- TabChangeEvent event = new TabChangeEvent(component, oldIndex, activeIndex);
+ final TabChangeEvent event = new TabChangeEvent(component, oldIndex, activeIndex);
component.queueEvent(event);
}
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOG.error("Can't parse activeIndex: '" + newValue + "'");
}
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent uiComponent) throws IOException {
- UITabGroup tabGroup = (UITabGroup) uiComponent;
+ final UITabGroup tabGroup = (UITabGroup) uiComponent;
- int activeIndex = ensureRenderedActiveIndex(facesContext, tabGroup);
+ final int activeIndex = ensureRenderedActiveIndex(facesContext, tabGroup);
final String clientId = tabGroup.getClientId(facesContext);
final String hiddenId = clientId + TabGroupRenderer.ACTIVE_INDEX_POSTFIX;
final String switchType = tabGroup.getSwitchType();
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, null);
writer.writeIdAttribute(clientId);
@@ -117,7 +117,7 @@ public class TabGroupRenderer extends La
encodeHeader(facesContext, writer, tabGroup, activeIndex);
int index = 0;
- for (UIComponent tab : tabGroup.getChildren()) {
+ for (final UIComponent tab : tabGroup.getChildren()) {
if (tab instanceof UITab) {
if (tab.isRendered() && (UITabGroup.SWITCH_TYPE_CLIENT.equals(switchType) || index == activeIndex)) {
encodeContent(writer, facesContext, (UITab) tab, index);
@@ -129,12 +129,12 @@ public class TabGroupRenderer extends La
writer.endElement(HtmlElements.DIV);
}
- private int ensureRenderedActiveIndex(FacesContext context, UITabGroup tabGroup) {
- int activeIndex = tabGroup.getSelectedIndex();
+ private int ensureRenderedActiveIndex(final FacesContext context, final UITabGroup tabGroup) {
+ final int activeIndex = tabGroup.getSelectedIndex();
// ensure to select a rendered tab
int index = -1;
int closestRenderedTabIndex = -1;
- for (UIComponent tab : (List<UIComponent>) tabGroup.getChildren()) {
+ for (final UIComponent tab : (List<UIComponent>) tabGroup.getChildren()) {
index++;
if (tab instanceof AbstractUIPanelBase) {
if (index == activeIndex) {
@@ -166,13 +166,14 @@ public class TabGroupRenderer extends La
}
private void encodeHeader(
- FacesContext facesContext, TobagoResponseWriter writer, UITabGroup tabGroup, int activeIndex)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UITabGroup tabGroup,
+ final int activeIndex)
throws IOException {
- Measure width = tabGroup.getCurrentWidth();
- Measure headerHeight = getResourceManager().getThemeMeasure(facesContext, tabGroup, "headerHeight");
- Measure toolBarWidth = getResourceManager().getThemeMeasure(facesContext, tabGroup, "toolBarWidth");
- Style header = new Style();
+ final Measure width = tabGroup.getCurrentWidth();
+ final Measure headerHeight = getResourceManager().getThemeMeasure(facesContext, tabGroup, "headerHeight");
+ final Measure toolBarWidth = getResourceManager().getThemeMeasure(facesContext, tabGroup, "toolBarWidth");
+ final Style header = new Style();
header.setPosition(Position.RELATIVE);
header.setWidth(width.subtractNotNegative(toolBarWidth));
header.setHeight(headerHeight);
@@ -184,22 +185,23 @@ public class TabGroupRenderer extends La
writer.writeClassAttribute(Classes.create(tabGroup, "headerInner"));
int index = 0;
- for (UIComponent child : tabGroup.getChildren()) {
+ for (final UIComponent child : tabGroup.getChildren()) {
if (child instanceof UITab) {
- UITab tab = (UITab) child;
+ final UITab tab = (UITab) child;
if (tab.isRendered()) {
- LabelWithAccessKey label = new LabelWithAccessKey(tab);
+ final LabelWithAccessKey label = new LabelWithAccessKey(tab);
if (activeIndex == index) {
ComponentUtils.addCurrentMarkup(tab, Markup.SELECTED);
}
- FacesMessage.Severity maxSeverity = ComponentUtils.getMaximumSeverityOfChildrenMessages(facesContext, tab);
+ final FacesMessage.Severity maxSeverity
+ = ComponentUtils.getMaximumSeverityOfChildrenMessages(facesContext, tab);
if (maxSeverity != null) {
ComponentUtils.addCurrentMarkup(tab, ComponentUtils.markupOfSeverity(maxSeverity));
}
writer.startElement(HtmlElements.DIV, tab);
writer.writeClassAttribute(Classes.create(tab));
writer.writeAttribute(HtmlAttributes.TABGROUPINDEX, index);
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, tab);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, tab);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
@@ -233,54 +235,54 @@ public class TabGroupRenderer extends La
index++;
}
writer.endElement(HtmlElements.DIV);
- Style body = new Style();
+ final Style body = new Style();
body.setWidth(width);
body.setHeight(tabGroup.getCurrentHeight().subtract(headerHeight));
writer.endElement(HtmlElements.DIV);
if (tabGroup.isShowNavigationBar()) {
- UIToolBar toolBar = createToolBar(facesContext, tabGroup);
+ final UIToolBar toolBar = createToolBar(facesContext, tabGroup);
renderToolBar(facesContext, writer, tabGroup, toolBar);
}
}
- private UIToolBar createToolBar(FacesContext facesContext, UITabGroup tabGroup) {
+ private UIToolBar createToolBar(final FacesContext facesContext, final UITabGroup tabGroup) {
final String clientId = tabGroup.getClientId(facesContext);
- Application application = facesContext.getApplication();
- UIViewRoot viewRoot = facesContext.getViewRoot();
+ final Application application = facesContext.getApplication();
+ final UIViewRoot viewRoot = facesContext.getViewRoot();
// previous
- UICommand previous = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
+ final UICommand previous = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
previous.setId(viewRoot.createUniqueId());
previous.setRendererType(null);
previous.getAttributes().put(Attributes.IMAGE, "image/tabPrev.gif");
previous.setOmit(true); // avoid submit
// next
- UICommand next = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
+ final UICommand next = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
next.setId(viewRoot.createUniqueId());
next.setRendererType(null);
next.getAttributes().put(Attributes.IMAGE, "image/tabNext.gif");
next.setOmit(true); // avoid submit
// all: sub menu to select any tab directly
- UICommand all = (UICommand) CreateComponentUtils.createComponent(
+ final UICommand all = (UICommand) CreateComponentUtils.createComponent(
facesContext, UICommand.COMPONENT_TYPE, null, viewRoot.createUniqueId());
all.setOmit(true); // avoid submit
- UIMenu menu = (UIMenu) CreateComponentUtils.createComponent(
+ final UIMenu menu = (UIMenu) CreateComponentUtils.createComponent(
facesContext, UIMenu.COMPONENT_TYPE, RendererTypes.MENU, viewRoot.createUniqueId());
menu.setTransient(true);
ComponentUtils.addCurrentMarkup(menu, Markup.TOP);
FacetUtils.setDropDownMenu(all, menu);
int index = 0;
- for (UIComponent child : tabGroup.getChildren()) {
+ for (final UIComponent child : tabGroup.getChildren()) {
if (child instanceof UITab) {
- UITab tab = (UITab) child;
+ final UITab tab = (UITab) child;
if (tab.isRendered()) {
- UIMenuCommand entry = (UIMenuCommand) CreateComponentUtils.createComponent(
+ final UIMenuCommand entry = (UIMenuCommand) CreateComponentUtils.createComponent(
facesContext, UIMenuCommand.COMPONENT_TYPE, RendererTypes.MENU_COMMAND, viewRoot.createUniqueId());
entry.setTransient(true);
entry.setOmit(true); // avoid submit
- LabelWithAccessKey label = new LabelWithAccessKey(tab);
+ final LabelWithAccessKey label = new LabelWithAccessKey(tab);
entry.setLabel(label.getText());
if (tab.isDisabled()) {
entry.setDisabled(true);
@@ -292,7 +294,7 @@ public class TabGroupRenderer extends La
index++;
}
}
- UIToolBar toolBar = (UIToolBar) application.createComponent(UIToolBar.COMPONENT_TYPE);
+ final UIToolBar toolBar = (UIToolBar) application.createComponent(UIToolBar.COMPONENT_TYPE);
toolBar.setId(viewRoot.createUniqueId());
toolBar.setRendererType("TabGroupToolBar");
toolBar.setTransient(true);
@@ -304,7 +306,8 @@ public class TabGroupRenderer extends La
}
private void renderToolBar(
- FacesContext facesContext, TobagoResponseWriter writer, UITabGroup tabGroup, UIToolBar toolBar)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UITabGroup tabGroup,
+ final UIToolBar toolBar)
throws IOException {
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(tabGroup, "toolBar"));
@@ -312,7 +315,8 @@ public class TabGroupRenderer extends La
writer.endElement(HtmlElements.DIV);
}
- protected void encodeContent(TobagoResponseWriter writer, FacesContext facesContext, UITab tab, int index)
+ protected void encodeContent(
+ final TobagoResponseWriter writer, final FacesContext facesContext, final UITab tab, final int index)
throws IOException {
if (tab.isDisabled()) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupToolBarRenderer.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/TabGroupToolBarRenderer.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/TabGroupToolBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupToolBarRenderer.java Fri Nov 15 17:10:58 2013
@@ -26,12 +26,12 @@ import javax.faces.component.UIComponent
public class TabGroupToolBarRenderer extends ToolBarRendererBase {
@Override
- protected String getLabelPosition(UIComponent component) {
+ protected String getLabelPosition(final UIComponent component) {
return UIToolBar.LABEL_OFF;
}
@Override
- protected String getIconSize(UIComponent component) {
+ protected String getIconSize(final UIComponent component) {
return UIToolBar.ICON_SMALL;
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextareaRenderer.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/TextareaRenderer.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/TextareaRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextareaRenderer.java Fri Nov 15 17:10:58 2013
@@ -46,7 +46,7 @@ public class TextareaRenderer extends In
private static final Logger LOG = LoggerFactory.getLogger(TextareaRenderer.class);
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
if (!(component instanceof UITextarea)) {
LOG.error("Wrong type: Need " + UITextarea.class.getName() + ", but was " + component.getClass().getName());
return;
@@ -89,9 +89,9 @@ public class TextareaRenderer extends In
}
int maxLength = -1;
final String pattern = null;
- for (Validator validator : input.getValidators()) {
+ for (final Validator validator : input.getValidators()) {
if (validator instanceof LengthValidator) {
- LengthValidator lengthValidator = (LengthValidator) validator;
+ final LengthValidator lengthValidator = (LengthValidator) validator;
maxLength = lengthValidator.getMaximum();
}
/*if (validator instanceof RegexValidator) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.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/TimeRenderer.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/TimeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java Fri Nov 15 17:10:58 2013
@@ -50,31 +50,31 @@ public class TimeRenderer extends InputR
private static final Logger LOG = LoggerFactory.getLogger(TimeRenderer.class);
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UITime time = (UITime) component;
+ final UITime time = (UITime) component;
- String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, time);
- String currentValue = getCurrentValue(facesContext, time);
+ final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, time);
+ final String currentValue = getCurrentValue(facesContext, time);
if (LOG.isDebugEnabled()) {
LOG.debug("currentValue = '" + currentValue + "'");
}
String pattern = "HH:mm";
if (time.getConverter() != null) {
- Converter converter = time.getConverter();
+ final Converter converter = time.getConverter();
if (converter instanceof DateTimeConverter) {
- String string = DateFormatUtils.findPattern((DateTimeConverter) converter);
+ final String string = DateFormatUtils.findPattern((DateTimeConverter) converter);
if (string != null && string.indexOf('s') > -1) {
pattern += ":ss";
}
}
}
- boolean hasSeconds = pattern.indexOf('s') > -1;
+ final boolean hasSeconds = pattern.indexOf('s') > -1;
- Object value = time.getValue();
- Date date;
+ final Object value = time.getValue();
+ final Date date;
if (value instanceof Date) {
date = (Date) value;
} else if (value instanceof Calendar) {
@@ -83,11 +83,11 @@ public class TimeRenderer extends InputR
date = new Date();
}
- String hour = new SimpleDateFormat("HH").format(date);
- String minute = new SimpleDateFormat("mm").format(date);
- String second = new SimpleDateFormat("ss").format(date);
+ final String hour = new SimpleDateFormat("HH").format(date);
+ final String minute = new SimpleDateFormat("mm").format(date);
+ final String second = new SimpleDateFormat("ss").format(date);
- String id = time.getClientId(facesContext);
+ final String id = time.getClientId(facesContext);
final String idPrefix = id + ComponentUtils.SUB_SEPARATOR;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -96,9 +96,9 @@ public class TimeRenderer extends InputR
writer.writeIdAttribute(id);
writer.writeClassAttribute(Classes.create(time));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, time);
- Style style = new Style(facesContext, time);
+ final Style style = new Style(facesContext, time);
writer.writeStyleAttribute(style);
- String dateInputId = (String) time.getAttributes().get(Attributes.DATE_INPUT_ID);
+ final String dateInputId = (String) time.getAttributes().get(Attributes.DATE_INPUT_ID);
if (dateInputId != null) {
writer.writeAttribute(DataAttributes.DATE_INPUT_ID, dateInputId, false);
}
@@ -152,7 +152,8 @@ public class TimeRenderer extends InputR
writer.endElement(HtmlElements.DIV);
}
- private void writeInputSeparator(TobagoResponseWriter writer, UITime time, String sep) throws IOException {
+ private void writeInputSeparator(final TobagoResponseWriter writer, final UITime time, final String sep)
+ throws IOException {
writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(Classes.create(time, "sep"));
writer.writeText(sep);
@@ -160,9 +161,10 @@ public class TimeRenderer extends InputR
}
private void writeInput(
- TobagoResponseWriter writer, UITime input, String idPrefix, String unit, String value, String title, int max)
+ final TobagoResponseWriter writer, final UITime input, final String idPrefix, final String unit,
+ final String value, final String title, final int max)
throws IOException {
- Integer tabIndex = input.getTabIndex();
+ final Integer tabIndex = input.getTabIndex();
writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.TEXT, false);
writer.writeIdAttribute(idPrefix + unit);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.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/ToolBarRenderer.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/ToolBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Fri Nov 15 17:10:58 2013
@@ -37,19 +37,19 @@ import java.io.IOException;
public class ToolBarRenderer extends ToolBarRendererBase {
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- UIToolBar toolBar = (UIToolBar) component;
+ final UIToolBar toolBar = (UIToolBar) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, toolBar);
writer.writeIdAttribute(toolBar.getClientId(facesContext));
HtmlRendererUtils.writeDataAttributes(facesContext, writer, toolBar);
HtmlRendererUtils.renderDojoDndItem(toolBar, writer, true);
writer.writeClassAttribute(Classes.create(toolBar));
- Style style = new Style(facesContext, toolBar);
- boolean right = UIToolBar.ORIENTATION_RIGHT.equals(toolBar.getOrientation());
+ final Style style = new Style(facesContext, toolBar);
+ final boolean right = UIToolBar.ORIENTATION_RIGHT.equals(toolBar.getOrientation());
if (right) {
style.setTextAlign(TextAlign.RIGHT);
}
@@ -59,7 +59,7 @@ public class ToolBarRenderer extends Too
}
@Override
- public Measure getHeight(FacesContext facesContext, Configurable toolBar) {
+ public Measure getHeight(final FacesContext facesContext, final Configurable toolBar) {
final ResourceManager resources = getResourceManager();
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.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/ToolBarRendererBase.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/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Fri Nov 15 17:10:58 2013
@@ -66,31 +66,31 @@ public abstract class ToolBarRendererBas
private static final Logger LOG = LoggerFactory.getLogger(ToolBarRendererBase.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);
}
- protected String getLabelPosition(UIComponent component) {
+ protected String getLabelPosition(final UIComponent component) {
return (String) component.getAttributes().get(Attributes.LABEL_POSITION);
}
- protected String getIconSize(UIComponent component) {
+ protected String getIconSize(final UIComponent component) {
return (String) component.getAttributes().get(Attributes.ICON_SIZE);
}
- protected boolean isRightAligned(UIToolBar toolBar) {
+ protected boolean isRightAligned(final UIToolBar toolBar) {
return UIToolBar.ORIENTATION_RIGHT.equals(toolBar.getOrientation());
}
@Override
- public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
- UIToolBar toolBar = (UIToolBar) component;
+ public void encodeEnd(final FacesContext context, final UIComponent component) throws IOException {
+ final UIToolBar toolBar = (UIToolBar) component;
- TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(context);
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(context);
Measure width = Measure.valueOf(-1);
- for (UIComponent command : toolBar.getChildren()) {
+ for (final UIComponent command : toolBar.getChildren()) {
if (command instanceof AbstractUICommandBase) {
width = renderToolbarCommand(context, toolBar, (AbstractUICommandBase) command, writer, width);
} else if (command instanceof UIToolBarSeparator) {
@@ -101,8 +101,9 @@ public abstract class ToolBarRendererBas
}
}
- private Measure renderToolbarCommand(FacesContext facesContext, UIToolBar toolBar, AbstractUICommandBase command,
- TobagoResponseWriter writer, Measure width) throws IOException {
+ private Measure renderToolbarCommand(
+ final FacesContext facesContext, final UIToolBar toolBar, final AbstractUICommandBase command,
+ final TobagoResponseWriter writer, final Measure width) throws IOException {
if (command instanceof SelectBooleanCommand) {
return renderSelectBoolean(facesContext, toolBar, command, writer, width);
} else if (command instanceof SelectOneCommand) {
@@ -122,8 +123,9 @@ public abstract class ToolBarRendererBas
// todo: remove component creation in renderer, for JSF 2.0
// todo: One solution is to make <tx:toolBarSelectOne> instead of <tc:toolBarSelectOne>
- private Measure renderSelectOne(FacesContext facesContext, UIToolBar toolBar, AbstractUICommandBase command,
- TobagoResponseWriter writer, Measure width) throws IOException {
+ private Measure renderSelectOne(
+ final FacesContext facesContext, final UIToolBar toolBar, final AbstractUICommandBase command,
+ final TobagoResponseWriter writer, Measure width) throws IOException {
final List<SelectItem> items;
@@ -139,12 +141,12 @@ public abstract class ToolBarRendererBas
if (radio != null) {
writer.startElement(HtmlElements.SPAN, radio);
writer.writeClassAttribute(Classes.createWorkaround("toolBar", "selectOne", null));
- Object value = radio.getValue();
+ final Object value = radio.getValue();
String currentValue = "";
boolean markFirst = !ComponentUtils.hasSelectedValue(items, value);
- String radioId = radio.getClientId(facesContext);
- for (SelectItem item : items) {
+ final String radioId = radio.getClientId(facesContext);
+ for (final SelectItem item : items) {
final String labelText = item.getLabel();
if (labelText != null) {
command.getAttributes().put(Attributes.LABEL, labelText);
@@ -167,7 +169,7 @@ public abstract class ToolBarRendererBas
command.getAttributes().put(Attributes.TIP, item.getDescription());
}
- String formattedValue = RenderUtils.getFormattedValue(facesContext, radio, item.getValue());
+ final String formattedValue = RenderUtils.getFormattedValue(facesContext, radio, item.getValue());
final boolean checked;
if (item.getValue().equals(value) || markFirst) {
checked = true;
@@ -195,8 +197,9 @@ public abstract class ToolBarRendererBas
// todo: remove component creation in renderer, for JSF 2.0
// todo: One solution is to make <tx:toolBarCheck> instead of <tc:toolBarCheck>
// may be renamed to toolBarSelectBoolean?
- private Measure renderSelectBoolean(FacesContext facesContext, UIToolBar toolBar, AbstractUICommandBase command,
- TobagoResponseWriter writer, Measure width) throws IOException {
+ private Measure renderSelectBoolean(
+ final FacesContext facesContext, final UIToolBar toolBar, final AbstractUICommandBase command,
+ final TobagoResponseWriter writer, Measure width) throws IOException {
UIComponent checkbox = command.getFacet(Facets.CHECKBOX);
if (checkbox == null) {
@@ -221,10 +224,10 @@ public abstract class ToolBarRendererBas
return width;
}
-
private Measure renderToolbarButton(
- FacesContext facesContext, UIToolBar toolBar, AbstractUICommandBase command, TobagoResponseWriter writer,
- boolean selected, Measure width, CommandMap map, String value)
+ final FacesContext facesContext, final UIToolBar toolBar, final AbstractUICommandBase command,
+ final TobagoResponseWriter writer,
+ final boolean selected, final Measure width, final CommandMap map, final String value)
throws IOException {
if (!command.isRendered()) {
return width;
@@ -405,7 +408,7 @@ public abstract class ToolBarRendererBas
if (showIcon && iconName != null) {
writer.startElement(HtmlElements.IMG, command);
writer.writeAttribute(HtmlAttributes.SRC, image, false);
- String imageHover
+ final String imageHover
= ResourceManagerUtils.getImageWithPath(facesContext, HtmlRendererUtils.createSrc(iconName, "Hover"), true);
if (imageHover != null) {
writer.writeAttribute(DataAttributes.SRC_DEFAULT, image, false);
@@ -439,8 +442,9 @@ public abstract class ToolBarRendererBas
// render sub menu popup button
if (showDropDownMenu) {
writer.startElement(HtmlElements.IMG, command);
- boolean dropDownDisabled = ComponentUtils.getBooleanAttribute(dropDownMenu, Attributes.DISABLED) || disabled;
- String menuImage = ResourceManagerUtils
+ final boolean dropDownDisabled
+ = ComponentUtils.getBooleanAttribute(dropDownMenu, Attributes.DISABLED) || disabled;
+ final String menuImage = ResourceManagerUtils
.getImageOrDisabledImageWithPath(facesContext, "image/toolbarButtonMenu.gif", dropDownDisabled);
writer.writeAttribute(HtmlAttributes.SRC, menuImage, false);
writer.writeStyleAttribute(openerStyle);
@@ -455,8 +459,8 @@ public abstract class ToolBarRendererBas
}
private Measure renderSeparator(
- FacesContext facesContext, UIToolBar toolBar, UIToolBarSeparator separator, TobagoResponseWriter writer,
- Measure width)
+ final FacesContext facesContext, final UIToolBar toolBar, final UIToolBarSeparator separator,
+ final TobagoResponseWriter writer, final Measure width)
throws IOException {
if (!separator.isRendered()) {
return width;
@@ -464,7 +468,7 @@ public abstract class ToolBarRendererBas
writer.startElement(HtmlElements.SPAN, separator);
writer.writeClassAttribute(Classes.create(toolBar, "item", Markup.DISABLED));
- Style itemStyle = new Style();
+ final Style itemStyle = new Style();
itemStyle.setHeight(getItemHeight(facesContext, toolBar));
itemStyle.setWidth(Measure.valueOf(10));
writer.writeStyleAttribute(itemStyle);
@@ -479,7 +483,7 @@ public abstract class ToolBarRendererBas
// computation of the width of the toolBar will not be used in the moment.
}
- protected Measure getItemHeight(FacesContext facesContext, Configurable toolBar) {
+ protected Measure getItemHeight(final FacesContext facesContext, final Configurable toolBar) {
final String iconSize = getIconSize((UIComponent) toolBar);
final String labelPosition = getLabelPosition((UIComponent) toolBar);
@@ -519,11 +523,11 @@ public abstract class ToolBarRendererBas
return result;
}
- private boolean hasAnyCommand(AbstractUICommandBase command) {
+ private boolean hasAnyCommand(final AbstractUICommandBase command) {
return !hasNoCommand(command);
}
- private boolean hasNoCommand(AbstractUICommandBase command) {
+ private boolean hasNoCommand(final AbstractUICommandBase command) {
return command.getAction() == null
&& command.getActionListener() == null
&& command.getActionListeners().length == 0
@@ -532,13 +536,14 @@ public abstract class ToolBarRendererBas
}
private String getImage(
- FacesContext facesContext, String name, String iconSize, boolean disabled, boolean selected) {
+ final FacesContext facesContext, final String name, final String iconSize, final boolean disabled,
+ final boolean selected) {
int pos = name.lastIndexOf('.');
if (pos == -1) {
pos = name.length(); // avoid exception if no '.' in name
}
- String key = name.substring(0, pos);
- String ext = name.substring(pos);
+ final String key = name.substring(0, pos);
+ final String ext = name.substring(pos);
String size = "";
if (UIToolBar.ICON_SMALL.equals(iconSize)) {
@@ -547,7 +552,7 @@ public abstract class ToolBarRendererBas
size = "32";
}
String image = null;
- ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
+ final ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
if (disabled && selected) {
image = resourceManager.getImage(facesContext, key + "SelectedDisabled" + size + ext, true);
if (image == null) {
@@ -577,7 +582,7 @@ public abstract class ToolBarRendererBas
}
public static void renderDropDownMenu(
- FacesContext facesContext, TobagoResponseWriter writer, AbstractUIMenu dropDownMenu)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final AbstractUIMenu dropDownMenu)
throws IOException {
writer.startElement(HtmlElements.OL, dropDownMenu);
// XXX fix naming conventions for CSS classes
@@ -587,7 +592,7 @@ public abstract class ToolBarRendererBas
}
@Override
- public void encodeChildren(FacesContext facesContext, UIComponent component)
+ public void encodeChildren(final FacesContext facesContext, final UIComponent component)
throws IOException {
}