Author: Alex.Kolonitsky
Date: 2010-05-27 11:41:26 -0400 (Thu, 27 May 2010)
New Revision: 17322
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java
Log:
fix checkstyle
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-05-27
15:12:16 UTC (rev 17321)
+++
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-05-27
15:41:26 UTC (rev 17322)
@@ -60,10 +60,10 @@
}
protected void encodeRows(FacesContext facesContext, RowHolderBase rowHolder) {
- rowHolder.getRow().walk(facesContext, this, rowHolder);
+ rowHolder.getRow().walk(facesContext, this, rowHolder);
}
-
- public void processRows(ResponseWriter writer, FacesContext facesContext, UIComponent
component, boolean updatePartial) throws IOException{
+
+ public void processRows(ResponseWriter writer, FacesContext facesContext, UIComponent
component, boolean updatePartial) throws IOException {
RowHolderBase rowHolder = createRowHolder(facesContext, component);
rowHolder.setPartialUpdate(updatePartial);
@@ -72,7 +72,7 @@
encodeAfterRows(writer, facesContext, rowHolder);
}
-
+
protected void doEncodeChildren(ResponseWriter writer, FacesContext facesContext,
UIComponent component) throws IOException {
processRows(writer, facesContext, component, false);
}
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-27
15:12:16 UTC (rev 17321)
+++
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-27
15:41:26 UTC (rev 17322)
@@ -44,17 +44,16 @@
/**
* @author Anton Belevich
- *
*/
-@ResourceDependencies( { @ResourceDependency(library = "javax.faces", name =
"jsf.js"),
+@ResourceDependencies({@ResourceDependency(library = "javax.faces", name =
"jsf.js"),
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name =
"richfaces.js"),
- @ResourceDependency(name= "richfaces-event.js"),@ResourceDependency(name =
"richfaces-base-component.js"),
- @ResourceDependency(name = "datatable.js"), @ResourceDependency(name =
"datatable.ecss") })
+ @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name
= "richfaces-base-component.js"),
+ @ResourceDependency(name = "datatable.js"), @ResourceDependency(name =
"datatable.ecss")})
public class DataTableRenderer extends AbstractTableRenderer {
public void encodeTableStructure(ResponseWriter writer, FacesContext context,
UIDataTableBase dataTable)
throws IOException {
-
+
if (dataTable instanceof UIDataTable) {
encodeCaption(writer, context, (UIDataTable) dataTable);
// TODO nick - do we need this element if "columnsWidth" is
absent?
@@ -77,22 +76,22 @@
}
}
-
+
public RowHolder createRowHolder(FacesContext context, UIComponent component) {
- return new RowHolder(context, (UIDataTable)component);
+ return new RowHolder(context, (UIDataTable) component);
}
-
+
public void encodeRow(ResponseWriter writer, FacesContext context, RowHolderBase
holder) throws IOException {
- RowHolder rowHolder = (RowHolder)holder;
+ RowHolder rowHolder = (RowHolder) holder;
Row row = rowHolder.getRow();
-
- if(!encodeParentTBody((UIDataTable)row)) {
- if(rowHolder.isPartialUpdate()) {
-
context.getPartialViewContext().getPartialResponseWriter().startUpdate(((UIDataTable)row).getClientId()
+":tb");
+
+ if (!encodeParentTBody((UIDataTable) row)) {
+ if (rowHolder.isPartialUpdate()) {
+
context.getPartialViewContext().getPartialResponseWriter().startUpdate(((UIDataTable)
row).getClientId() + ":tb");
}
- encodeTableBodyStart(writer, context, (UIDataTable)row);
+ encodeTableBodyStart(writer, context, (UIDataTable) row);
}
-
+
rowHolder.setRowStart(true);
Iterator<UIComponent> components = row.columns();
@@ -100,50 +99,51 @@
while (components.hasNext()) {
UIComponent child = components.next();
- if(child instanceof Row) {
+ if (child instanceof Row) {
- if(rowHolder.getProcessCell() != 0) {
+ if (rowHolder.getProcessCell() != 0) {
encodeRowEnd(writer);
isTRopen = false;
encodeTableBodyEnd(writer);
- if(rowHolder.isPartialUpdate()) {
+ if (rowHolder.isPartialUpdate()) {
context.getPartialViewContext().getPartialResponseWriter().endUpdate();
}
}
-
+
rowHolder.nextCell();
-
- if(rowHolder.isPartialUpdate()) {
+
+ if (rowHolder.isPartialUpdate()) {
context.getPartialViewContext().getPartialResponseWriter().startUpdate(child.getClientId());
}
child.encodeAll(context);
-
- if(rowHolder.isPartialUpdate()) {
+
+ if (rowHolder.isPartialUpdate()) {
context.getPartialViewContext().getPartialResponseWriter().endUpdate();
}
-
} else if (child instanceof UIColumn) {
encodeColumn(context, writer, (UIColumn) child, rowHolder);
isTRopen = true;
}
}
-
- if(isTRopen){
+
+ if (isTRopen) {
encodeRowEnd(writer);
}
}
-
+
public boolean encodeParentTBody(UIDataTableBase dataTableBase) {
Iterator<UIComponent> iterator = dataTableBase.columns();
while (iterator.hasNext()) {
UIComponent child = iterator.next();
- if (child instanceof Row) return false;
+ if (child instanceof Row) {
+ return false;
+ }
}
return true;
}
-
+
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent
component) throws IOException {
if (!shouldProceed(component)) {
return;
@@ -154,25 +154,24 @@
encodeTableFacets(writer, context, dataTable);
}
-
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent
component) throws IOException {
if (!shouldProceed(component)) {
return;
}
-
- if(component instanceof UIDataTable) {
+
+ if (component instanceof UIDataTable) {
encodeTableEnd(writer);
- }
+ }
}
protected boolean shouldProceed(UIComponent component) {
- return (component instanceof UIDataTableBase);
+ return component instanceof UIDataTableBase;
}
protected Class<? extends UIComponent> getComponentClass() {
return UIDataTable.class;
}
-
+
public void encodeCaption(ResponseWriter writer, FacesContext context, UIDataTable
dataTable) throws IOException {
UIComponent caption = dataTable.getCaption();
@@ -203,20 +202,20 @@
writer.endElement(HTML.CAPTION_ELEMENT);
}
-
+
public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String
tableFacetName) {
-
- return ((column instanceof org.richfaces.component.UIColumn &&
"header".equals(tableFacetName)) ?
- new RichHeaderEncodeStrategy() : new SimpleHeaderEncodeStrategy());
+
+ return (column instanceof org.richfaces.component.UIColumn &&
"header".equals(tableFacetName))
+ ? new RichHeaderEncodeStrategy() : new SimpleHeaderEncodeStrategy();
}
-
+
protected class RichHeaderEncodeStrategy implements HeaderEncodeStrategy {
public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent
component, String facetName) throws IOException {
- org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn)
component;
+ org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn)
component;
writer.writeAttribute("id", column.getClientId(context), null);
-
+
boolean sortableColumn = isSortable(column);
if (sortableColumn) {
//TODO :anton -> should component be selfSorted
@@ -226,49 +225,49 @@
}
public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent
component, String facetName) throws IOException {
-
- org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn)
component;
- if(isSortable(column)) {
+
+ org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn)
component;
+ if (isSortable(column)) {
writer.endElement(HTML.SPAN_ELEM);
}
}
public void encodeSortControls(FacesContext context, ResponseWriter writer,
org.richfaces.component.UIColumn column, boolean enableAsc, boolean enableDesc, boolean
enableUnsort) throws IOException {
}
-
+
}
public boolean containsThead() {
return true;
}
-
+
public boolean isSortable(UIColumn column) {
- if(column instanceof org.richfaces.component.UIColumn) {
+ if (column instanceof org.richfaces.component.UIColumn) {
//TODO: anton - add check for the "comparator" property
- return
((org.richfaces.component.UIColumn)column).getValueExpression("sortBy") !=
null;
+ return ((org.richfaces.component.UIColumn)
column).getValueExpression("sortBy") != null;
}
return false;
}
public void encodeClientScript(ResponseWriter writer, FacesContext facesContext,
UIDataTableBase dataTableBase) throws IOException {
-
- UIDataTable dataTable = (UIDataTable)dataTableBase;
+
+ UIDataTable dataTable = (UIDataTable) dataTableBase;
writer.startElement(HTML.SCRIPT_ELEM, dataTable);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
-
+
JSFunction function = new JSFunction("new RichFaces.ui.DataTable");
function.addParameter(dataTable.getClientId(facesContext));
Map<String, Object> options = new HashMap<String, Object>();
-
-
+
+
AjaxEventOptions ajaxEventOptions =
AjaxRendererUtils.buildEventOptions(facesContext, dataTable);
options.put("ajaxEventOptions", ajaxEventOptions.getParameters());
function.addParameter(options);
-
+
writer.writeText(function.toScript(), null);
writer.endElement(HTML.SCRIPT_ELEM);
}
-
+
public String getTableSkinClass() {
return "rf-dt";
}
@@ -276,15 +275,15 @@
public String getCaptionSkinClass() {
return "rf-dt-cap";
}
-
+
public String getRowSkinClass() {
return "rf-dt-r";
}
-
+
public String getFirstRowSkinClass() {
return "rf-dt-f-r";
}
-
+
public String getCellSkinClass() {
return "rf-dt-c";
}
@@ -292,19 +291,19 @@
public String getHeaderSkinClass() {
return "rf-dt-h";
}
-
+
public String getHeaderFirstSkinClass() {
return "rf-dt-h-f";
}
-
+
public String getHeaderCellSkinClass() {
return "rf-dt-h-c";
}
-
+
public String getColumnHeaderSkinClass() {
return "rf-dt-sh";
}
-
+
public String getColumnHeaderFirstSkinClass() {
return "rf-dt-sh-f";
}
@@ -312,11 +311,11 @@
public String getColumnHeaderCellSkinClass() {
return "rf-dt-sh-c";
}
-
+
public String getColumnFooterSkinClass() {
return "rf-dt-sf";
}
-
+
public String getColumnFooterFirstSkinClass() {
return "rf-dt-sf-f";
}
@@ -336,7 +335,7 @@
public String getFooterCellSkinClass() {
return "rf-dt-f-c";
}
-
+
public String getNoDataClass() {
return "rf-dt-nd-c";
}
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java
===================================================================
---
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2010-05-27
15:12:16 UTC (rev 17321)
+++
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2010-05-27
15:41:26 UTC (rev 17322)
@@ -42,14 +42,6 @@
private boolean startPartialUpdate;
- public boolean isStartPartialUpdate() {
- return startPartialUpdate;
- }
-
- public void setStartPartialUpdate(boolean startPartialUpdate) {
- this.startPartialUpdate = startPartialUpdate;
- }
-
public RowHolder(FacesContext context, Row row) {
this(context, row, 0, true);
}
@@ -61,6 +53,14 @@
this.baseClientId = row.getClientId(context);
}
+ public boolean isStartPartialUpdate() {
+ return startPartialUpdate;
+ }
+
+ public void setStartPartialUpdate(boolean startPartialUpdate) {
+ this.startPartialUpdate = startPartialUpdate;
+ }
+
public String getBaseClientId() {
return baseClientId;
}