Author: abelevich
Date: 2010-04-29 11:53:41 -0400 (Thu, 29 Apr 2010)
New Revision: 16845
Removed:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/IteratorBase.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/behavior/
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java
Log:
remove odd classes, small refactoring
Deleted:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -1,56 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package org.richfaces.component;
-
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-
-import org.richfaces.component.Column;
-
-/**
- * Iterator for all children table columns.
- *
- * @author asmirnov
- *
- */
-class ColumnsIterator extends IteratorBase<UIComponent> {
-
- protected Iterator<UIComponent> childrenIterator;
-
- public ColumnsIterator(UIComponent dataTable) {
- this.childrenIterator = dataTable.getChildren().iterator();
- }
-
- protected UIComponent nextItem() {
- while (childrenIterator != null && childrenIterator.hasNext()) {
- UIComponent child = childrenIterator.next();
- if (child instanceof javax.faces.component.UIColumn || child instanceof
Column) {
- return child;
- }
- }
-
- // TODO nick - free childrenIterator field
-
- return null;
- }
-
-}
Deleted:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -1,83 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package org.richfaces.component;
-
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-
-import org.richfaces.component.Column;
-
-//TODO nick - rename to include component name
-class DataIterator extends IteratorBase<UIComponent> {
-
- private Iterator<UIComponent> facetsIterator;
-
- private Iterator<UIComponent> childrenIterator;
-
- public DataIterator(UIDataTableBase dataTable) {
- this.childrenIterator = dataTable.getChildren().iterator();
- this.facetsIterator = dataTable.getFacets().values().iterator();
- }
-
- protected UIComponent nextItem() {
-
- UIComponent nextColumn = null;
- while (nextColumn == null && childrenIterator.hasNext()) {
- UIComponent child = childrenIterator.next();
- // TODO nick - why non-rendered children are filtered?
- // TODO nick - should be (child instanceof UIColumn || child instanceof
Column)?
- if ((child instanceof UIColumn) || (child instanceof Column)) {
- nextColumn = child;
- } else if (checkAjaxComponent(child)) {
- nextColumn = child;
- }
- }
-
- // TODO nick - free childrenIterator
-
- // ???
- while (nextColumn == null && facetsIterator.hasNext()) {
- UIComponent component = facetsIterator.next();
- if (checkAjaxComponent(component)) {
- nextColumn = component;
- }
- }
-
- // TODO nick - free facetsIterator
-
- return nextColumn;
- }
-
- protected Iterator<UIComponent> getFacetsIterator() {
- return this.facetsIterator;
- }
-
- protected Iterator<UIComponent> getChildrenIterator() {
- return this.childrenIterator;
- }
-
- // TODO nick - what's this for?
- protected boolean checkAjaxComponent(UIComponent child) {
- return false;
- }
-
-}
Deleted:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -1,83 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package org.richfaces.component;
-
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-
-
-class FixedChildrenIterator extends DataIterator {
-
- private Iterator<UIComponent> currentColumnIterator;
-
- public FixedChildrenIterator(UIDataTableBase dataTable) {
- super(dataTable);
- }
-
- @Override
- protected UIComponent nextItem() {
- UIComponent next = null;
-
- if (currentColumnIterator != null && currentColumnIterator.hasNext()) {
- next = currentColumnIterator.next();
- checkColumnIterator();
- }
-
- if (next == null) {
- Iterator<UIComponent> childrenIterator = getChildrenIterator();
- while (next == null && childrenIterator.hasNext()) {
- UIComponent child = childrenIterator.next();
- if ((child instanceof UIColumn) && child.isRendered()) {
- currentColumnIterator = getChildFacetIterator(child);
- next = nextItem();
- } else if (checkAjaxComponent(child)) {
- next = child;
- }
- }
- }
-
- if (next == null) {
- next = getNextFacet();
- }
- return next;
- }
-
- protected UIComponent getNextFacet() {
- Iterator<UIComponent> facetsIterator = getFacetsIterator();
- // TODO nick - while -> if
- while (facetsIterator.hasNext()) {
- return facetsIterator.next();
- }
- return null;
- }
-
- protected void checkColumnIterator() {
- if (!currentColumnIterator.hasNext()) {
- currentColumnIterator = null;
- }
- }
-
- protected Iterator<UIComponent> getChildFacetIterator(UIComponent component) {
- return component.getFacets().values().iterator();
- }
-
-}
Deleted:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/IteratorBase.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/IteratorBase.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/IteratorBase.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -1,52 +0,0 @@
-package org.richfaces.component;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * @author Anton Belevich
- * @author Nick Belaevski
- */
-// TODO nick - rename this class
-public abstract class IteratorBase<E> implements Iterator<E> {
-
- private boolean isCompleted = false;
-
- private E next = null;
-
- private void setupNext() {
- if (!isCompleted) {
- if (next == null) {
- next = nextItem();
-
- if (next == null) {
- isCompleted = true;
- }
- }
- }
- }
-
- public boolean hasNext() {
- setupNext();
-
- return next != null;
- }
-
- public E next() {
- setupNext();
-
- if (next == null) {
- throw new NoSuchElementException();
- }
-
- E result = next;
- next = null;
- return result;
- }
-
- public void remove() {
- throw new UnsupportedOperationException("Iterator is read-only");
- }
-
- protected abstract E nextItem();
-}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -27,7 +27,7 @@
* @author asmirnov
*
*/
-public class SubtableFixedChildrenIterator extends FixedChildrenIterator {
+public class SubtableFixedChildrenIterator extends DataTableFixedChildrenIterator {
public SubtableFixedChildrenIterator(UIDataTableBase dataTable) {
super(dataTable);
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -36,6 +36,8 @@
protected enum PropertyKeys {
filter, filterValue, comparator, sortOrder
}
+
+
public void setSortOrder(SortOrder sortOrder) {
getStateHelper().put(PropertyKeys.sortOrder, sortOrder);
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -40,7 +40,7 @@
public Iterator<UIComponent> columns() {
- return new ColumnsIterator(this);
+ return new DataTableColumnsIterator(this);
}
public void setBreakBefore(boolean newBreakBefore) {
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -21,6 +21,7 @@
sortingExpression
}
+
public void setSortingListener(MethodExpression sortingExpression) {
//TODO nick - use addToggleListener() & MethodExpression wrapper in tag
getStateHelper().put(PropertyKeys.sortingExpression, sortingExpression);
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -47,18 +47,19 @@
filterVar, sortPriority, sortMode, first, rows, noDataLabel
}
+
public Iterator<UIComponent> columns() {
- return new ColumnsIterator(this);
+ return new DataTableColumnsIterator(this);
}
@Override
protected Iterator<UIComponent> fixedChildren() {
- return new FixedChildrenIterator(this);
+ return new DataTableFixedChildrenIterator(this);
}
@Override
protected Iterator<UIComponent> dataChildren() {
- return new DataIterator(this);
+ return new DataTableDataIterator(this);
}
public UIComponent getHeader() {
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -40,18 +40,17 @@
@ResourceDependency(name = "subtable.js")
public class UISubTable extends UIDataTableBase implements Column, Expandable {
- enum PropertyKeys {
- expandMode, expanded, toggleExpression
- }
-
public static final String MODE_AJAX = "ajax";
public static final String MODE_SERVER = "server";
public static final String MODE_CLIENT = "client";
+ enum PropertyKeys {
+ expandMode, expanded, toggleExpression
+ }
-
+
@Override
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -26,14 +26,15 @@
public class HtmlColumn extends UIColumn {
+ public static final String COMPONENT_TYPE = "org.richfaces.Column";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Column";
+
enum PropertyKeys {
breakBefore, rowspan, colspan, selfSorted, sortBy
}
+
- public static final String COMPONENT_TYPE = "org.richfaces.Column";
-
- public static final String COMPONENT_FAMILY = "org.richfaces.Column";
-
public int getColspan() {
return (Integer) getStateHelper().eval(PropertyKeys.colspan, Integer.MIN_VALUE);
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -26,6 +26,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.view.facelets.FaceletException;
import org.ajax4jsf.model.DataVisitResult;
import org.ajax4jsf.model.DataVisitor;
@@ -37,13 +38,7 @@
*
*/
public abstract class AbstractRowsRenderer extends RendererBase implements DataVisitor {
- /*
- * public static final String[][] TABLE_EVENT_ATTRS = { //TODO nick - clarify new
names for attributes
- * {"onclick","onRowClick"},
{"ondblclick","onRowDblClick"},
{"onmousemove","onRowMouseMove"},
- * {"onmouseup","onRowMouseUp"},
{"onmousedown","onRowMouseDown"},
{"onmouseover","onRowMouseOver"},
- * {"onmouseout","onRowMouseOut"} };
- */
-
+
public DataVisitResult process(FacesContext context, Object rowKey, Object argument)
{
RowHolderBase holder = (RowHolderBase) argument;
Row row = holder.getRow();
@@ -51,7 +46,7 @@
try {
encodeRow(holder);
} catch (IOException e) {
- // TODO: anton - seems we need add throws IOException ???
+ throw new FaceletException(e);
}
holder.nextRow();
return DataVisitResult.CONTINUE;
@@ -88,14 +83,5 @@
public boolean getRendersChildren() {
return true;
}
-
- /*
- * protected void encodeRowEvents(FacesContext context, UIDataAdaptor table) throws
IOException {
- *
- * RendererUtils utils2 = getUtils(); for (int i = 0; i <
TABLE_EVENT_ATTRS.length; i++) { String[] attrs =
- * TABLE_EVENT_ATTRS[i]; utils2.encodeAttribute(context, table, attrs[1], attrs[0]);
}
- *
- * }
- */
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -2,11 +2,9 @@
import java.io.IOException;
import java.util.Iterator;
-import java.util.Map;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
-import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -46,100 +46,85 @@
return new RowHolder(context,
parent.getClientId(context),(UIColumnGroup)component);
}
-
+
+ // ColumnGroup component doesn't have css styles
@Override
public String getCellSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getColumnFooterCellSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getColumnFooterFirstSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getColumnFooterSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getColumnHeaderCellSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getColumnHeaderFirstSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getColumnHeaderSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getFirstRowSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getFooterCellSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getFooterFirstSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getFooterSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getHeaderCellSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getHeaderFirstSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getHeaderSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getRowSkinClass() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getTableSkinClass() {
- // TODO Auto-generated method stub
return null;
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -26,7 +26,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-//TODO - anton move to the api
+//TODO: anton - move to the api
public interface HeaderEncodeStrategy {
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -121,7 +121,7 @@
@Override
public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String
tableFacetName) {
- // TODO implement column header facet
+ // TODO: implement column header facet
return null;
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -13,10 +13,8 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.renderkit.RendererBase;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.richfaces.component.Expandable;
import org.richfaces.component.UISubTable;
import org.richfaces.component.UIToggleControl;
-import org.richfaces.event.ToggleEvent;
/**
* @author Anton Belevich
Deleted:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java 2010-04-29
14:11:41 UTC (rev 16844)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java 2010-04-29
15:53:41 UTC (rev 16845)
@@ -1,72 +0,0 @@
-package org.richfaces.renderkit;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.behavior.ClientBehavior;
-import javax.faces.component.behavior.ClientBehaviorContext;
-import javax.faces.context.FacesContext;
-import javax.faces.render.ClientBehaviorRenderer;
-import javax.faces.render.FacesBehaviorRenderer;
-import javax.faces.render.RenderKitFactory;
-
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.renderkit.RendererUtils;
-import org.richfaces.component.behavior.ToggleBehavior;
-
-(a)FacesBehaviorRenderer(rendererType="org.richfaces.behavior.ToggleBehavior",
renderKitId=RenderKitFactory.HTML_BASIC_RENDER_KIT)
-public class TogglerBehaviorRenderer extends ClientBehaviorRenderer {
-
- private String SCRIPT_NAME = "RichFaces.Event.callHandlerById";
-
- private String SCRIPT_EMPTY = "";
-
-// RichFaces.Event.callHandlerById('form1:j_idt6', 'RICH:sort',
{state: 'expanded'});
- @Override
- public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior
behavior) {
-
- String script = SCRIPT_EMPTY;
-
- if(behavior instanceof ToggleBehavior) {
-
- ToggleBehavior toggleBehavior = (ToggleBehavior)behavior;
-
- UIComponent toggleComponent = findComponent(behaviorContext,
toggleBehavior.getToggleComponentId());
- UIComponent toggleSource = findComponent(behaviorContext,
toggleBehavior.getToggleSource());
-
-
- String toggleComponentId =
toggleComponent.getClientId(behaviorContext.getFacesContext());
- String toggleSourceId =
toggleSource.getClientId(behaviorContext.getFacesContext());
-
- String toggleEventType = toggleBehavior.getToggleEvent();
-
- JSFunction function = new JSFunction(SCRIPT_NAME);
- function.addParameter(toggleComponentId);
- function.addParameter(toggleEventType);
-
- Map <String, Object> data = new HashMap<String, Object>();
- function.addParameter(data);
- data.put("source", toggleSourceId);
-
- function.appendScript(new StringBuffer());
- script = function.toScript();
- }
-
- return script;
- }
-
- private UIComponent findComponent(ClientBehaviorContext behaviorContext, String id)
{
- UIComponent component = behaviorContext.getComponent();
- //TODO: anton - check id == null!!!
- //TODO: anton - should found component implement marker interface e.g.
ToggleAble ???
- return RendererUtils.getInstance().findComponentFor(component, id);
- }
-
- @Override
- public void decode(FacesContext context, UIComponent component, ClientBehavior
behavior) {
- super.decode(context, component, behavior);
- }
-
-
-}