[richfaces-svn-commits] JBoss Rich Faces SVN: r17070 - in root/ui-sandbox: tables/trunk/ui/src/main/java/org/richfaces/component and 1 other directory.

Author: Alex.Kolonitsky Date: 2010-05-17 07:20:15 -0400 (Mon, 17 May 2010) New Revision: 17070 Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/component/UIDataScroller.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java Log: fix checkstyle Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/component/UIDataScroller.java =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-05-17 11:07:57 UTC (rev 17069) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-05-17 11:20:15 UTC (rev 17070) @@ -148,7 +148,7 @@ MethodExpression scrollerListener = (MethodExpression) getStateHelper().eval(PropertyKeys.scrollerListener); if (scrollerListener != null) { - scrollerListener.invoke(facesContext.getELContext(), new Object[] { event }); + scrollerListener.invoke(facesContext.getELContext(), new Object[] {event }); } UIComponent dataTable = getDataTable(); @@ -158,14 +158,14 @@ facesContext.getPartialViewContext().getRenderIds().add(dataScroller.getClientId(facesContext)); } - String dataTableId = null; - if (dataTable instanceof MetaComponentResolver) { - dataTableId = ((MetaComponentResolver) dataTable).resolveClientId(facesContext, dataTable, "body"); + String dataTableId = null; + if (dataTable instanceof MetaComponentResolver) { + dataTableId = ((MetaComponentResolver) dataTable).resolveClientId(facesContext, dataTable, "body"); } - if (dataTableId == null) { - dataTableId = dataTable.getClientId(facesContext); - } + if (dataTableId == null) { + dataTableId = dataTable.getClientId(facesContext); + } facesContext.getPartialViewContext().getRenderIds().add(dataTableId); } @@ -366,7 +366,7 @@ FacesMessage message; if (null == messageStr) { message = MessageUtil.getMessage(facesContext, UIInput.UPDATE_MESSAGE_ID, - new Object[] { MessageUtil.getLabel(facesContext, this) }); + new Object[] {MessageUtil.getLabel(facesContext, this) }); } else { message = new FacesMessage(FacesMessage.SEVERITY_ERROR, messageStr, messageStr); } @@ -375,13 +375,13 @@ facesContext.renderResponse(); } catch (IllegalArgumentException e) { FacesMessage message = MessageUtil.getMessage(facesContext, UIInput.UPDATE_MESSAGE_ID, - new Object[] { MessageUtil.getLabel(facesContext, this) }); + new Object[] {MessageUtil.getLabel(facesContext, this) }); facesContext.getExternalContext().log(message.getSummary(), e); facesContext.addMessage(getClientId(facesContext), message); facesContext.renderResponse(); } catch (Exception e) { FacesMessage message = MessageUtil.getMessage(facesContext, UIInput.UPDATE_MESSAGE_ID, - new Object[] { MessageUtil.getLabel(facesContext, this) }); + new Object[] {MessageUtil.getLabel(facesContext, this) }); facesContext.getExternalContext().log(message.getSummary(), e); facesContext.addMessage(getClientId(facesContext), message); facesContext.renderResponse(); Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-05-17 11:07:57 UTC (rev 17069) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-05-17 11:20:15 UTC (rev 17070) @@ -55,22 +55,22 @@ @Override public void broadcast(FacesEvent event) throws AbortProcessingException { super.broadcast(event); - if(event instanceof ToggleEvent) { - ToggleEvent toggleEvent = (ToggleEvent)event; + if (event instanceof ToggleEvent) { + ToggleEvent toggleEvent = (ToggleEvent) event; boolean newValue = toggleEvent.isExpanded(); FacesContext facesContext = getFacesContext(); ELContext elContext = facesContext.getELContext(); MethodExpression methodExpression = getToggleListener(); - if(methodExpression != null) { + if (methodExpression != null) { methodExpression.invoke(elContext, new Object[]{newValue}); } getStateHelper().put(PropertyKeys.expanded, newValue); ValueExpression valueExpression = getValueExpression(PropertyKeys.expanded.toString()); - if(valueExpression != null && !valueExpression.isReadOnly(elContext)) { + if (valueExpression != null && !valueExpression.isReadOnly(elContext)) { valueExpression.setValue(elContext, newValue); } @@ -79,7 +79,7 @@ } } public boolean isExpanded() { - return (Boolean)getStateHelper().eval(PropertyKeys.expanded, true); + return (Boolean) getStateHelper().eval(PropertyKeys.expanded, true); } public void setExpanded(boolean expanded) { @@ -125,7 +125,7 @@ } public String getExpandMode() { - return (String)getStateHelper().eval(PropertyKeys.expandMode,MODE_SERVER); + return (String) getStateHelper().eval(PropertyKeys.expandMode, MODE_SERVER); } public void setExpandMode(String expandMode) { @@ -134,14 +134,14 @@ @Override public void setIterationState(Object stateObject) { - Object[] state = (Object[])stateObject; - if(state != null) { - super.setIterationState(state[0]); - getStateHelper().put(PropertyKeys.expanded, state[1]); - } else { - super.setIterationState(null); - getStateHelper().put(PropertyKeys.expanded, null); - } + Object[] state = (Object[]) stateObject; + if (state != null) { + super.setIterationState(state[0]); + getStateHelper().put(PropertyKeys.expanded, state[1]); + } else { + super.setIterationState(null); + getStateHelper().put(PropertyKeys.expanded, null); + } } @Override