JBoss Rich Faces SVN: r777 - trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-16 05:28:44 -0400 (Wed, 16 May 2007)
New Revision: 777
Modified:
trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml
Log:
Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml 2007-05-16 09:28:05 UTC (rev 776)
+++ trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml 2007-05-16 09:28:44 UTC (rev 777)
@@ -10,7 +10,7 @@
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
- <!--
+ <!--
-->
<context-param>
<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
17 years, 8 months
JBoss Rich Faces SVN: r776 - trunk/sandbox/scrollable-grid/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-16 05:28:05 -0400 (Wed, 16 May 2007)
New Revision: 776
Modified:
trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml
Log:
Modified: trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-05-16 09:27:50 UTC (rev 775)
+++ trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-05-16 09:28:05 UTC (rev 776)
@@ -13,7 +13,7 @@
</description>
<renderer generate="true" override="true">
- <name>org.richfaces.ScrollableGridRenderer</name>
+ <name>org.richfaces.renderkit.html.ScrollableGridRenderer</name>
<template>org/richfaces/scrollable-grid.jspx</template>
</renderer>
<tag>
17 years, 8 months
JBoss Rich Faces SVN: r775 - trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-16 05:27:50 -0400 (Wed, 16 May 2007)
New Revision: 775
Modified:
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java
Log:
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-05-16 09:27:40 UTC (rev 774)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-05-16 09:27:50 UTC (rev 775)
@@ -14,7 +14,6 @@
import javax.faces.model.DataModel;
import org.ajax4jsf.ajax.repeat.DataVisitor;
-import org.ajax4jsf.ajax.repeat.ExtendedDataModel;
import org.ajax4jsf.ajax.repeat.UIRepeat;
import org.ajax4jsf.framework.ajax.AjaxContext;
import org.ajax4jsf.framework.ajax.AjaxEvent;
@@ -136,4 +135,8 @@
super.walk(faces, visitor, argument);
}
+
+ public DataModel getStoredDataModel() {
+ return super.getDataModel();
+ }
}
17 years, 8 months
JBoss Rich Faces SVN: r774 - trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-16 05:27:40 -0400 (Wed, 16 May 2007)
New Revision: 774
Added:
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java
Modified:
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
Log:
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java 2007-05-16 09:27:28 UTC (rev 773)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java 2007-05-16 09:27:40 UTC (rev 774)
@@ -15,6 +15,6 @@
*
*/
public interface ColumnVisitor {
- public void visit(FacesContext context, UIScrollableGridColumn component,
- ResponseWriter writer, GridRendererState state) throws IOException;
+
+ public int visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException;
}
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java 2007-05-16 09:27:28 UTC (rev 773)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java 2007-05-16 09:27:40 UTC (rev 774)
@@ -10,7 +10,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
import org.richfaces.component.UIScrollableGrid;
import org.richfaces.component.UIScrollableGridColumn;
@@ -20,85 +19,17 @@
*/
public class ColumnWalker {
- static void iterateOverHeadersFooters(FacesContext context, UIComponent component,
- ColumnVisitor visitor, ResponseWriter writer, GridRendererState state) throws IOException{
-
- if(context == null || component == null){
- throw new NullPointerException();
- }
+ static int iterateOverColumns(FacesContext context, UIComponent component, ColumnVisitor visitor,
+ ResponseWriter writer, GridRendererState state) throws IOException{
- if(!component.isRendered()){
- return ;
- }
+ int columnsCount = 0;
- if(component instanceof UIScrollableGrid){
-
- if(null != component.getChildren()){
- writer.startElement(HTML.TR_ELEMENT, component);
- writer.writeText("\n", null);
-
- for (Iterator iter = component.getChildren().iterator(); iter.hasNext(); ) {
- UIComponent kid = (UIComponent) iter.next();
- if (kid.isRendered()) {
- if (kid instanceof UIScrollableGridColumn){
- visitor.visit(context, (UIScrollableGridColumn)kid, writer, state);
- if(state.isFrozenColumn()){
- int i = state.getFrozenColumnCount();
- state.setFrozenColumnCount(i-1);
- }
- }
- }
- }
- writer.endElement(HTML.TR_ELEMENT);
- writer.writeText("\n", null);
- }
- }
- }
-
- static void iterateOverCells(FacesContext context, UIComponent component, ColumnVisitor visitor,
- ResponseWriter writer, GridRendererState state) throws IOException{
-
-
- if(context == null || component == null){
- throw new NullPointerException();
- }
-
- if(!component.isRendered()){
- return ;
- }
-
- if(component instanceof UIScrollableGrid){
- for (Iterator iter = component.getChildren().iterator(); iter.hasNext(); ) {
- UIComponent kid = (UIComponent) iter.next();
- if (kid.isRendered()) {
- if (kid instanceof UIScrollableGridColumn){
- UIScrollableGridColumn column = (UIScrollableGridColumn)kid;
- if(state.isFrozenColumn()){
- int i = state.getFrozenColumnCount();
- state.setFrozenColumnCount(i-1);
- if(state.isFrozenPart()){
- visitor.visit(context, column, writer,state);
- }
- }else if(!state.isFrozenColumn()&& !state.isFrozenPart()){
- visitor.visit(context, column, writer,state);
- }
- state.nextCell();
- }
- }
- }
- state.setCellIndex(0);
- }
- }
-
- static void iterateOverAjaxCells(FacesContext context, UIComponent component, ColumnVisitor visitor,
- ResponseWriter writer, GridRendererState state) throws IOException{
-
if(context == null || component == null){
throw new NullPointerException();
}
if(!component.isRendered()){
- return ;
+ return 0;
}
if(component instanceof UIScrollableGrid){
@@ -107,13 +38,14 @@
if (kid.isRendered()) {
if (kid instanceof UIScrollableGridColumn){
UIScrollableGridColumn column = (UIScrollableGridColumn)kid;
- visitor.visit(context, column, writer,state);
+ columnsCount += visitor.visit(context, column, writer, state);
state.nextCell();
- }
+ }
}
}
+ state.setCellIndex(0);
}
-
- state.setCellIndex(0);
+
+ return columnsCount;
}
}
Added: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java (rev 0)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java 2007-05-16 09:27:40 UTC (rev 774)
@@ -0,0 +1,27 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.html;
+
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.richfaces.component.UIScrollableGridColumn;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public interface ExtendedColumnVisitor extends ColumnVisitor {
+
+ /* (non-Javadoc)
+ * @see org.richfaces.renderkit.html.ColumnVisitor#visit(javax.faces.context.FacesContext, org.richfaces.component.UIScrollableGridColumn, javax.faces.context.ResponseWriter, org.richfaces.renderkit.html.GridRendererState)
+ */
+ public int visit(FacesContext context, UIScrollableGridColumn column,
+ ResponseWriter writer, GridRendererState state) throws IOException;
+
+ public void renderContent(FacesContext context, UIScrollableGridColumn column,
+ ResponseWriter writer, GridRendererState state) throws IOException;
+}
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 2007-05-16 09:27:28 UTC (rev 773)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 2007-05-16 09:27:40 UTC (rev 774)
@@ -13,7 +13,6 @@
import org.ajax4jsf.framework.ajax.AjaxContext;
import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.apache.commons.digester.xmlrules.FromXmlRuleSet;
import org.richfaces.component.UIScrollableGrid;
/**
@@ -37,6 +36,8 @@
private String _cell_id_prefix;
+ private boolean header = false;
+
private String _column_type;
private int _frozenColumnCount = -1;
@@ -49,13 +50,15 @@
private UIScrollableGrid _grid;
+ private String clientId;
+
private String _cachedClientId;
private GridRendererState _previousState = null;
// private AjaxContainer _region = null;
- private boolean _rowSelected;
+// private boolean _rowSelected;
private Object rowKey;
@@ -118,7 +121,7 @@
}
}
/**
- * Create state for current grig ( and store previsios state in field ).
+ * Create state for current grid ( and store previsios state in field ).
* @param previsiosState
*/
public GridRendererState(FacesContext context, GridRendererState previsiosState, UIScrollableGrid grid) {
@@ -247,22 +250,7 @@
return buffer;
}
-
/**
- * @return the _rowSelected
- */
- public boolean isRowSelected() {
- return _rowSelected;
- }
-
- /**
- * @param selected the _rowSelected to set
- */
- public void setRowSelected(boolean selected) {
- _rowSelected = selected;
- }
-
- /**
* @return the rowKey
*/
public Object getRowKey() {
@@ -327,4 +315,21 @@
public void setWriter(ResponseWriter writer) {
this.writer = writer;
}
+
+ public String getClientId(){
+ return clientId;
+ }
+
+ public void setClientId(String clientId){
+ this.clientId = clientId;
+ }
+
+ public boolean isHeader() {
+ return header;
+ }
+
+ public void setHeader(boolean header) {
+ this.header = header;
+ }
+
}
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-05-16 09:27:28 UTC (rev 773)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-05-16 09:27:40 UTC (rev 774)
@@ -7,6 +7,7 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import javax.faces.model.DataModel;
import org.ajax4jsf.ajax.repeat.DataVisitor;
import org.ajax4jsf.framework.ajax.AjaxContext;
@@ -23,6 +24,7 @@
import org.richfaces.utils.TemplateLoader;
+
/**
* @author Anton Belevich
*
@@ -40,95 +42,130 @@
private final String COLUMN_NORMAL_TYPE = "normal";
- private final RendererBase cellTemplate = TemplateLoader.loadTemplate("org.richfaces.renderkit.html.ScrollableGridCellRenderer");
+ private RendererBase cellTemplate = null;
+
+
+
+ private final ColumnVisitor headerFooterRenderer = new ExtendedColumnVisitor(){
+
- private final ColumnVisitor headerRenderer = new ColumnVisitor(){
+ public int visit(FacesContext context, UIScrollableGridColumn column,
+ ResponseWriter writer, GridRendererState state) throws IOException {
+
+ renderContent(context, column, writer, state);
+
+ if(state.isFrozenColumn()){
+ int i = state.getFrozenColumnCount();
+ state.setFrozenColumnCount(i-1);
+ }
+
+ return 0;
+ }
- public void visit(FacesContext context, UIScrollableGridColumn column,
- ResponseWriter writer, GridRendererState state) throws IOException {
-
+ public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException {
+
writer.startElement(HTML.td_ELEM, column);
String frozen = Boolean.toString(state.isFrozenColumn());
getUtils().writeAttribute(writer, "frozen",frozen );
getUtils().writeAttribute(writer, "width",column.getAttributes().get("width"));
writer.writeText("\n", null);
- if(column.getFacet(HEADER_PART) != null){
+
+ if(state.isHeader() && (column.getFacet(HEADER_PART) != null)){
+
UIComponent component = column.getFacet(HEADER_PART);
renderChild(context, component);
+
+ }else if(!state.isHeader()&& (column.getFacet(FOOTER_PART) != null)){
+
+ UIComponent component = column.getFacet(FOOTER_PART);
+ renderChild(context, component);
+
}
+
writer.endElement(HTML.td_ELEM);
writer.writeText("\n", null);
}
};
- private final ColumnVisitor footerRenderer = new ColumnVisitor(){
+ private final ColumnVisitor cellRenderer = new ExtendedColumnVisitor(){
- public void visit(FacesContext context, UIScrollableGridColumn column,
+ public int visit(FacesContext context, UIScrollableGridColumn column,
ResponseWriter writer, GridRendererState state) throws IOException {
- writer.startElement(HTML.td_ELEM, column);
- getUtils().writeAttribute(writer, "style",column.getAttributes().get("style"));
- writer.writeText("\n", null);
-
- if(column.getFacet(FOOTER_PART) != null){
- UIComponent component = column.getFacet(FOOTER_PART);
- renderChild(context, component);
+
+ if(state.isFrozenColumn()){
+ int i = state.getFrozenColumnCount();
+ state.setFrozenColumnCount(i-1);
+ if(state.isFrozenPart()){
+ renderContent(context, column, writer,state);
+ }
+ }else if(!state.isFrozenColumn()&& !state.isFrozenPart()){
+ renderContent(context, column, writer,state);
}
-
- writer.endElement(HTML.td_ELEM);
- writer.writeText("\n", null);
- }
- };
-
- private final ColumnVisitor cellRenderer = new ColumnVisitor(){
+
+ return 0;
+ }
- public void visit(FacesContext context, UIScrollableGridColumn column,
- ResponseWriter writer, GridRendererState state) throws IOException {
-
+ public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException {
+
+ String cell_id = state.getColumnType()+ ":" + state.getRowIndex()+ ":" + state.getCellIndex();
+ String client_id = state.getClientId();
+
+ cellTemplate = getCellTemplate();
ComponentVariables variables = ComponentsVariableResolver.getVariables(cellTemplate, column);
- variables.setVariable("cell_index",state.getColumnType()+ ":" + state.getRowIndex()+ ":" + state.getCellIndex());
+ variables.setVariable("cell_id",cell_id);
+ variables.setVariable("client_id", client_id);
cellTemplate.encodeBegin(context, column);
renderChildren(context, column);
cellTemplate.encodeEnd(context, column);
}
+
};
private final DataVisitor rowsRenderer = new DataVisitor(){
public void process(FacesContext context, Object rowIndex, Object argument) throws IOException {
+
GridRendererState state = (GridRendererState)argument;
UIScrollableGrid grid = state.getGrid();
- ResponseWriter writer = context.getResponseWriter();
+
grid.setRowKey(rowIndex);
if(grid.isRowAvailable()){
+
int index = ((Integer)rowIndex).intValue();
state.setRowIndex(index);
-
+ String row_id = state.getClientId() + ":" + "row_" + state.getColumnType() + ":" + index;
+ ResponseWriter writer = context.getResponseWriter();
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(((Integer)grid.getAttributes().get("frozenColCount")).intValue());
- getUtils().writeAttribute(writer, "id","row_" + state.getColumnType() + ":" + index);
+ getUtils().writeAttribute(writer, "id",row_id);
getUtils().writeAttribute(writer, "class","ClientUI_Grid_BR");
- ColumnWalker.iterateOverCells(context, grid, cellRenderer, writer, state);
+ ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state);
+ writer.endElement(HTML.TR_ELEMENT);
+
}
-
- writer.endElement(HTML.TR_ELEMENT);
}
};
private final ColumnVisitor ajaxCellRenderer = new ColumnVisitor(){
- public void visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException {
+ public int visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException {
writer.startElement(HTML.SPAN_ELEM, column);
- String cell_index = state.getCellIdPrefix() + ":" + state.getRowIndex()+":" + state.getCellIndex();
- getUtils().writeAttribute(writer, "id",cell_index);
+ String columnWidth = (String)column.getAttributes().get("width");
+ String cell_id = state.getClientId() + ":" + state.getCellIdPrefix() + ":" + state.getRowIndex()+":" + state.getCellIndex();
+ getUtils().writeAttribute(writer, "id",cell_id);
+ getUtils().writeAttribute(writer, "class", "ClientUI_Grid_BCBody");
+ getUtils().writeAttribute(writer, "style", "width:" + columnWidth);
renderChildren(context, column);
writer.endElement(HTML.SPAN_ELEM);
AjaxContext ajaxContext = state.getAjaxContext();
- ajaxContext.addRenderedArea(cell_index);
+ ajaxContext.addRenderedArea(cell_id);
+ return 0;
}
+
};
private final DataVisitor ajaxRowsRenderer = new DataVisitor(){
@@ -140,13 +177,14 @@
grid.setRowKey(rowKey);
ResponseWriter writer = context.getResponseWriter();
state.setFrozenColumnCount(((Integer)grid.getAttributes().get("frozenColCount")).intValue());
- ColumnWalker.iterateOverAjaxCells(context, grid, ajaxCellRenderer, writer, state);
+ ColumnWalker.iterateOverColumns(context, grid, ajaxCellRenderer, writer, state);
state.nextRow();
}
};
protected String getJavaScriptVarName(FacesContext context, UIScrollableGrid grid) {
String id = grid.getBaseClientId(context);
+// setUpScriptModel(context, grid);
return "Richfaces_ScrollableGrid_" + id.replaceAll("[^A-Za-z0-9_]", "_");
}
@@ -171,8 +209,7 @@
final GridRendererState state = GridRendererState.getRendererState(context);
- ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component);
-// variables.setVariable("rows_count", new Integer(component.getRows()));
+// setUpScriptModel(context, grid);
writer.startElement(HTML.DIV_ELEM, grid);
getUtils().writeAttribute(writer, "class","GridDataColumns");
@@ -187,8 +224,8 @@
writer.writeText("\n", null);
writer.startElement("tbody", grid);
state.setGrid(grid);
+ state.setClientId(grid.getClientId(context));
-
state.setFrozenPart(true);
state.setColumType(COLUMN_FROZEN_TYPE);
@@ -226,7 +263,15 @@
ResponseWriter writer = context.getResponseWriter();
final GridRendererState state = GridRendererState.getRendererState(context);
state.setFrozenColumnCount(((Integer)component.getAttributes().get("frozenColCount")).intValue());
- ColumnWalker.iterateOverHeadersFooters(context, component, headerRenderer, writer, state);
+
+ writer.startElement(HTML.TR_ELEMENT, component);
+ writer.writeText("\n", null);
+ state.setHeader(true);
+ ColumnWalker.iterateOverColumns(context, component, headerFooterRenderer, writer, state);
+
+ writer.endElement(HTML.TR_ELEMENT);
+ writer.writeText("\n", null);
+
}
public void renderFooters(FacesContext context, UIScrollableGrid component
@@ -235,7 +280,16 @@
ResponseWriter writer = context.getResponseWriter();
final GridRendererState state = GridRendererState.getRendererState(context);
state.setFrozenColumnCount(((Integer)component.getAttributes().get("frozenColCount")).intValue());
- ColumnWalker.iterateOverHeadersFooters(context, component, footerRenderer, writer, state);
+
+ writer.startElement(HTML.TR_ELEMENT, component);
+ writer.writeText("\n", null);
+
+ state.setHeader(false);
+ ColumnWalker.iterateOverColumns(context, component, headerFooterRenderer, writer, state);
+
+ writer.endElement(HTML.TR_ELEMENT);
+ writer.writeText("\n", null);
+
}
public void setUpState(FacesContext context, UIScrollableGrid grid) {
@@ -285,8 +339,10 @@
grid.setFirst(grid.getDataIndex().intValue());
grid.setRows(grid.getRow_count().intValue());
int start_row = grid.getStartRow().intValue();
+ String client_id = grid.getClientId(context);
GridRendererState state = GridRendererState.getRendererState(context);
+ state.setClientId(client_id);
state.setAjaxContext(AjaxContext.getCurrentInstance(context));
state.setRowIndex(start_row);
state.setFrozenPart(true);
@@ -311,4 +367,28 @@
}
}
+// public void setUpScriptModel(FacesContext context, UIScrollableGrid grid) throws IOException{
+//
+// DataModel dataModel = grid.getStoredDataModel();
+// Integer rows_count = new Integer(dataModel.getRowCount());
+//
+// ColumnVisitor visitor = new ColumnVisitor(){
+// public int visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException {
+// return 1;
+// }
+// };
+//
+// Integer columns_count = new Integer(ColumnWalker.iterateOverColumns(context, grid, visitor, null, null));
+// ComponentVariables variables = ComponentsVariableResolver.getVariables(this, grid);
+// variables.setVariable("rows_count", rows_count);
+// variables.setVariable("column_count", columns_count);
+// }
+
+ private RendererBase getCellTemplate() {
+ if (cellTemplate == null) {
+ cellTemplate = TemplateLoader.loadTemplate("org.richfaces.renderkit.html.ScrollableGridCellRenderer");
+ }
+
+ return cellTemplate;
+ }
}
17 years, 8 months
JBoss Rich Faces SVN: r773 - trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-16 05:27:28 -0400 (Wed, 16 May 2007)
New Revision: 773
Modified:
trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid-cell.jspx
trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
Log:
Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid-cell.jspx
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid-cell.jspx 2007-05-16 01:10:09 UTC (rev 772)
+++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid-cell.jspx 2007-05-16 09:27:28 UTC (rev 773)
@@ -11,11 +11,10 @@
component="javax.faces.component.UIComponent"
>
- <td id="c_#{cell_index}" class="ClientUI_Grid_BC">
- <span id="bc_#{cell_index}" style="#{component.attributes['style']}" class="ClientUI_Grid_BCBody">
+ <td id="#{client_id}:c_#{cell_id}" class="ClientUI_Grid_BC">
+ <span id="#{client_id}:bc_#{cell_id}" style="#{component.attributes['style']}" class="ClientUI_Grid_BCBody">
<vcp:body/>
</span>
</td>
-
-
+
</f:root>
\ No newline at end of file
Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-05-16 01:10:09 UTC (rev 772)
+++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-05-16 09:27:28 UTC (rev 773)
@@ -48,6 +48,7 @@
</div>
<input type="hidden" name="#{clientId}_state_input" id="#{clientId}_state_input"/>
+ <input type="hidden" name="#{clienId}_model_input" id="#{clientId}_model_input"/>
<input type="button" name="#{clientId}_submit_input" id="#{clientId}_submit_input" onclick="#{this:getRowsAjaxUpdate(context,component)}" style="display:none"/>
</div>
@@ -113,7 +114,7 @@
// ClientUILib.log(ClientUILogger.WARNING, "Document loaded over " + (currTime - ClientUILib.startTime) + " miliseconds.");
var clientId = '#{clientId}';
var rows_count = '#{rows_count}';
- // var column_count = '#{row_column}';
+ var column_count = '#{row_column}';
dataModel = new ClientUI.controls.grid.FakeArrayDataModel(1000, 8, clientId);
17 years, 8 months
JBoss Rich Faces SVN: r772 - in trunk: richfaces/assembly and 28 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-05-15 21:10:09 -0400 (Tue, 15 May 2007)
New Revision: 772
Modified:
trunk/richfaces-samples/pom.xml
trunk/richfaces/assembly/pom.xml
trunk/richfaces/dataFilterSlider/pom.xml
trunk/richfaces/dataTable/pom.xml
trunk/richfaces/datascroller/pom.xml
trunk/richfaces/drag-drop/pom.xml
trunk/richfaces/dropdown-menu/pom.xml
trunk/richfaces/gmap/pom.xml
trunk/richfaces/inputnumber-slider/pom.xml
trunk/richfaces/inputnumber-spinner/pom.xml
trunk/richfaces/menu-components/pom.xml
trunk/richfaces/modal-panel/pom.xml
trunk/richfaces/paint2D/pom.xml
trunk/richfaces/panel/pom.xml
trunk/richfaces/panelbar/pom.xml
trunk/richfaces/panelmenu/pom.xml
trunk/richfaces/pom.xml
trunk/richfaces/separator/pom.xml
trunk/richfaces/simpleTogglePanel/pom.xml
trunk/richfaces/spacer/pom.xml
trunk/richfaces/suggestionbox/pom.xml
trunk/richfaces/tabPanel/pom.xml
trunk/richfaces/togglePanel/pom.xml
trunk/richfaces/toolBar/pom.xml
trunk/richfaces/tree/pom.xml
trunk/sandbox-samples/pom.xml
trunk/sandbox/panel2/pom.xml
trunk/sandbox/pom.xml
trunk/sandbox/scrollable-grid/pom.xml
trunk/sandbox/simpleTogglePanel2/pom.xml
Log:
Extract ajax4jsf version number into separate variable
Modified: trunk/richfaces/assembly/pom.xml
===================================================================
--- trunk/richfaces/assembly/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/assembly/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<configuration>
<library>
<prefix>org.richfaces</prefix>
Modified: trunk/richfaces/dataFilterSlider/pom.xml
===================================================================
--- trunk/richfaces/dataFilterSlider/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/dataFilterSlider/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/dataTable/pom.xml
===================================================================
--- trunk/richfaces/dataTable/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/dataTable/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/datascroller/pom.xml
===================================================================
--- trunk/richfaces/datascroller/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/datascroller/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/drag-drop/pom.xml
===================================================================
--- trunk/richfaces/drag-drop/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/drag-drop/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/dropdown-menu/pom.xml
===================================================================
--- trunk/richfaces/dropdown-menu/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/dropdown-menu/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/gmap/pom.xml
===================================================================
--- trunk/richfaces/gmap/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/gmap/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/inputnumber-slider/pom.xml
===================================================================
--- trunk/richfaces/inputnumber-slider/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/inputnumber-slider/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/inputnumber-spinner/pom.xml
===================================================================
--- trunk/richfaces/inputnumber-spinner/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/inputnumber-spinner/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: trunk/richfaces/menu-components/pom.xml
===================================================================
--- trunk/richfaces/menu-components/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/menu-components/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/modal-panel/pom.xml
===================================================================
--- trunk/richfaces/modal-panel/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/modal-panel/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/paint2D/pom.xml
===================================================================
--- trunk/richfaces/paint2D/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/paint2D/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/panel/pom.xml
===================================================================
--- trunk/richfaces/panel/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/panel/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: trunk/richfaces/panelbar/pom.xml
===================================================================
--- trunk/richfaces/panelbar/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/panelbar/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/panelmenu/pom.xml
===================================================================
--- trunk/richfaces/panelmenu/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/panelmenu/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -16,7 +16,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/pom.xml
===================================================================
--- trunk/richfaces/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -10,7 +10,8 @@
<version>3.0.1-SNAPSHOT</version>
<url>http://richfaces.ajax4jsf.org</url>
<properties>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version>
</properties>
<issueManagement>
<system>JIRA</system>
@@ -237,12 +238,12 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
</dependency>
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>test</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/richfaces/separator/pom.xml
===================================================================
--- trunk/richfaces/separator/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/separator/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: trunk/richfaces/simpleTogglePanel/pom.xml
===================================================================
--- trunk/richfaces/simpleTogglePanel/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/simpleTogglePanel/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/spacer/pom.xml
===================================================================
--- trunk/richfaces/spacer/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/spacer/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/suggestionbox/pom.xml
===================================================================
--- trunk/richfaces/suggestionbox/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/suggestionbox/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/tabPanel/pom.xml
===================================================================
--- trunk/richfaces/tabPanel/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/tabPanel/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/togglePanel/pom.xml
===================================================================
--- trunk/richfaces/togglePanel/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/togglePanel/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/toolBar/pom.xml
===================================================================
--- trunk/richfaces/toolBar/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/toolBar/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/tree/pom.xml
===================================================================
--- trunk/richfaces/tree/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces/tree/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces-samples/pom.xml
===================================================================
--- trunk/richfaces-samples/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/richfaces-samples/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -6,7 +6,9 @@
<name>RichFaces Components Examples</name>
<version>3.0.1-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossrichfaces/samples</url>
-
+ <properties>
+ <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version>
+ </properties>
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
<build>
<plugins>
@@ -59,7 +61,7 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -237,7 +239,7 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
Modified: trunk/sandbox/panel2/pom.xml
===================================================================
--- trunk/sandbox/panel2/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/sandbox/panel2/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: trunk/sandbox/pom.xml
===================================================================
--- trunk/sandbox/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/sandbox/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -7,6 +7,9 @@
<name>RichFaces Components</name>
<version>3.0.1-SNAPSHOT</version>
<url>http://richfaces.ajax4jsf.org</url>
+ <properties>
+ <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version>
+ </properties>
<!--
<url>http://labs.jboss.com/jbossrichfaces</url>
-->
@@ -205,12 +208,12 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
</dependency>
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>test</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/sandbox/scrollable-grid/pom.xml
===================================================================
--- trunk/sandbox/scrollable-grid/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/sandbox/scrollable-grid/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces</groupId>
Modified: trunk/sandbox/simpleTogglePanel2/pom.xml
===================================================================
--- trunk/sandbox/simpleTogglePanel2/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/sandbox/simpleTogglePanel2/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/sandbox-samples/pom.xml
===================================================================
--- trunk/sandbox-samples/pom.xml 2007-05-15 19:56:21 UTC (rev 771)
+++ trunk/sandbox-samples/pom.xml 2007-05-16 01:10:09 UTC (rev 772)
@@ -7,7 +7,9 @@
<name>RichFaces Components Examples</name>
<version>1.0.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossrichfaces/samples</url>
-
+ <properties>
+ <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version>
+ </properties>
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
<build>
<plugins>
@@ -58,7 +60,7 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -211,7 +213,7 @@
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>${org.ajax4jsf.version}</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
17 years, 8 months
JBoss Rich Faces SVN: r771 - in trunk/richfaces: tabPanel/src/main/java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-05-15 15:56:21 -0400 (Tue, 15 May 2007)
New Revision: 771
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java
trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java
trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java
trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
Log:
Fix http://jira.jboss.com/jira/browse/RF-44
Modified: trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2007-05-15 18:07:00 UTC (rev 770)
+++ trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2007-05-15 19:56:21 UTC (rev 771)
@@ -46,8 +46,8 @@
protected void doDecode(FacesContext context, UIComponent component) {
String clientId = component.getClientId(context);
Map requestParameterMap = context.getExternalContext().getRequestParameterMap();
- if (requestParameterMap.containsKey(clientId)) {
- String newValue = (String) requestParameterMap.get(clientId);
+ String newValue = (String) requestParameterMap.get(clientId);
+ if (null != newValue) {
UIInput input = (UIInput) component;
input.setSubmittedValue(newValue);
}
Modified: trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-05-15 18:07:00 UTC (rev 770)
+++ trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-05-15 19:56:21 UTC (rev 771)
@@ -76,8 +76,8 @@
}
String tabClientId = tab.getClientId(context);
- if (requestParameterMap.containsKey(tabClientId) ||
- requestParameterMap.containsKey(tabClientId + "_server_submit"))
+ if (null != requestParameterMap.get(tabClientId) ||
+ null != requestParameterMap.get(tabClientId + "_server_submit"))
{
eventTab = tab;
Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java 2007-05-15 18:07:00 UTC (rev 770)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java 2007-05-15 19:56:21 UTC (rev 771)
@@ -85,7 +85,7 @@
String keyName = DecodesPhaseNotifiyingListener.class.getName();
- if (!applicationMap.containsKey(keyName)) {
+ if (null == applicationMap.get(keyName)) {
LifecycleFactory lFactory = (LifecycleFactory)
FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
Lifecycle lifecycle = lFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java 2007-05-15 18:07:00 UTC (rev 770)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java 2007-05-15 19:56:21 UTC (rev 771)
@@ -184,10 +184,10 @@
resultEvent = wrapTreeEvent(event);
} else if (event instanceof TreeStateCommandEvent) {
FacesContext context = FacesContext.getCurrentInstance();
- boolean afterDecodesPhase = context
+ boolean afterDecodesPhase = null != context
.getExternalContext()
.getRequestMap()
- .containsKey(
+ .get(
DecodesPhaseNotifiyingListener.DECODE_PHASE_NOTICE_NAME);
if (isImmediate() && !afterDecodesPhase) {
@@ -383,7 +383,7 @@
try {
super.processDecodes(faces, null);
- if (getAttributes().containsKey(SELECTION_INPUT_ATTRIBUTE)) {
+ if (null != getAttributes().get(SELECTION_INPUT_ATTRIBUTE)) {
TreeState state = (TreeState) getComponentState();
if (state.setSelected(null)) {
Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-05-15 18:07:00 UTC (rev 770)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-05-15 19:56:21 UTC (rev 771)
@@ -229,7 +229,7 @@
String toggleId = id + NamingContainer.SEPARATOR_CHAR
+ UITree.TOGGLE_LINK_ATTRIBUTE;
- if (requestMap.containsKey(toggleId)
+ if (null != requestMap.get(toggleId)
|| toggleId.equals(tree.getAttributes().get(
UITree.TOGGLE_LINK_ATTRIBUTE))) {
17 years, 8 months
JBoss Rich Faces SVN: r770 - trunk/sandbox-samples/scrollable-grid-demo.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-15 14:07:00 -0400 (Tue, 15 May 2007)
New Revision: 770
Modified:
trunk/sandbox-samples/scrollable-grid-demo/pom.xml
Log:
Modified: trunk/sandbox-samples/scrollable-grid-demo/pom.xml
===================================================================
--- trunk/sandbox-samples/scrollable-grid-demo/pom.xml 2007-05-15 17:47:46 UTC (rev 769)
+++ trunk/sandbox-samples/scrollable-grid-demo/pom.xml 2007-05-15 18:07:00 UTC (rev 770)
@@ -27,5 +27,15 @@
</dependencies>
<build>
<finalName>scrollable-grid-demo</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
17 years, 8 months
JBoss Rich Faces SVN: r769 - in trunk/richfaces/panelmenu/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-05-15 13:47:46 -0400 (Tue, 15 May 2007)
New Revision: 769
Modified:
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
Log:
Initial commit for panel menu component.
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-15 17:33:33 UTC (rev 768)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-15 17:47:46 UTC (rev 769)
@@ -268,24 +268,25 @@
if (!iconNodeClosed.equals("")&&!iconNodeOpened.equals("")){
if (!iconNodeClosed.equals("custom")&&!iconNodeOpened.equals("custom")){
if(component.getAttributes().get("iconOpened").equals("")&&component.getAttributes().get("iconClosed").equals("")){
- buffer.append(","+'"'+ (sourceIconNodeOpened.equals("")?customIconOpenedSource:sourceIconNodeOpened) + '"').append(","+'"'+(sourceIconNodeClosed.equals("")?customIconClosedSource:sourceIconNodeClosed)+'"'+");");
+ buffer.append(","+'"'+ (sourceIconNodeOpened.equals("")?customIconOpenedSource:sourceIconNodeOpened) + '"').append(","+'"'+(sourceIconNodeClosed.equals("")?customIconClosedSource:sourceIconNodeClosed)+'"'+";");
} else if(component.getAttributes().get("iconOpened").equals("")){
- buffer.append(","+'"'+customIconClosedSource+'"').append(","+'"'+customIconClosedSource+'"'+");");
+ buffer.append(","+'"'+customIconClosedSource+'"').append(","+'"'+customIconClosedSource+'"'+";");
} else if (component.getAttributes().get("iconClosed").equals("")) {
- buffer.append(","+'"'+customIconOpenedSource+'"').append(","+'"'+customIconOpenedSource+'"'+");");
+ buffer.append(","+'"'+customIconOpenedSource+'"').append(","+'"'+customIconOpenedSource+'"'+";");
} else {
- buffer.append(","+'"'+customIconOpenedSource+'"').append(","+'"'+customIconClosedSource+'"'+");");
+ buffer.append(","+'"'+customIconOpenedSource+'"').append(","+'"'+customIconClosedSource+'"'+";");
}
} else if (iconNodeClosed.equals("custom")){
- buffer.append(",\"" + (customIconOpened.equals("")? sourceIconNodeOpened : customIconOpenedSource) + '"').append(",\"" + (customIconClosed.equals("")? PANEL_MENU_SPACER_ICON : customIconClosedSource)+"\");");
+ buffer.append(",\"" + (customIconOpened.equals("")? sourceIconNodeOpened : customIconOpenedSource) + '"').append(",\"" + (customIconClosed.equals("")? PANEL_MENU_SPACER_ICON : customIconClosedSource)+"\";");
} else if (iconNodeOpened.equals("custom")){
- buffer.append(",\"" + (customIconOpened.equals("")? PANEL_MENU_SPACER_ICON : customIconOpenedSource) + '"').append(",\"" + (customIconClosed.equals("")? sourceIconNodeClosed : customIconClosedSource)+"\");");
+ buffer.append(",\"" + (customIconOpened.equals("")? PANEL_MENU_SPACER_ICON : customIconOpenedSource) + '"').append(",\"" + (customIconClosed.equals("")? sourceIconNodeClosed : customIconClosedSource)+"\";");
} else{
- buffer.append(",\"" + (customIconOpened.equals("")? PANEL_MENU_SPACER_ICON : customIconOpenedSource) + '"').append(",\"" + (customIconClosed.equals("")? PANEL_MENU_SPACER_ICON : customIconClosedSource)+"\");");
+ buffer.append(",\"" + (customIconOpened.equals("")? PANEL_MENU_SPACER_ICON : customIconOpenedSource) + '"').append(",\"" + (customIconClosed.equals("")? PANEL_MENU_SPACER_ICON : customIconClosedSource)+"\";");
}
} else {
- buffer.append(");");
+ buffer.append(",null, null");
}
+ buffer.append(",\"" + PANEL_MENU_SPACER_ICON + "\");");
} else {
if (!iconItem.equals("")){
if (!iconItem.equals("custom")){
Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
===================================================================
--- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-15 17:33:33 UTC (rev 768)
+++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-15 17:47:46 UTC (rev 769)
@@ -17,7 +17,7 @@
PanelMenuStorage[myId] = this;}};
PanelMenuItem = Class.create();
PanelMenuItem.prototype = {
- initialize: function(ids, options, level, haveDynamicIcon, action, opened, iconAlign, iconExpanded, iconCollapsed){
+ initialize: function(ids, options, level, haveDynamicIcon, action, opened, iconAlign, iconExpanded, iconCollapsed, iconSpacer){
if (!ids.parentId){return};
this.type = options.type;
this.onopen = options.onopen;
@@ -42,6 +42,7 @@
}
this.iconCollapsed = iconCollapsed;
this.iconExpanded = iconExpanded;
+ this.iconSpacer = iconSpacer;
if(action){
this.action = action;
}
@@ -87,7 +88,7 @@
if (this.iconCollapsed!=null) {
img.src = this.iconCollapsed;
} else {
- img.src = "images/panelMenuSpacer.png";
+ img.src = this.iconSpacer;
}
}
}
@@ -120,7 +121,7 @@
if (this.iconExpanded!=null) {
img.src = this.iconExpanded;
} else {
- img.src = "images/panelMenuSpacer.png";}}}}
+ img.src = this.iconSpacer;}}}}
for (var i = 0; i < this.childObj.length; i++){
this.childObj[i].show();
}
17 years, 8 months
JBoss Rich Faces SVN: r768 - trunk/sandbox-samples/scrollable-grid-demo.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-05-15 13:33:33 -0400 (Tue, 15 May 2007)
New Revision: 768
Modified:
trunk/sandbox-samples/scrollable-grid-demo/pom.xml
Log:
Modified: trunk/sandbox-samples/scrollable-grid-demo/pom.xml
===================================================================
--- trunk/sandbox-samples/scrollable-grid-demo/pom.xml 2007-05-15 17:08:48 UTC (rev 767)
+++ trunk/sandbox-samples/scrollable-grid-demo/pom.xml 2007-05-15 17:33:33 UTC (rev 768)
@@ -1,24 +1,25 @@
<?xml version="1.0"?><project>
<parent>
- <artifactId>richfaces-samples</artifactId>
+ <artifactId>sandbox-samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>scrollable-grid-demo</artifactId>
- <packaging>war</packaging>
- <name>scrollable-grid-demo Maven Webapp</name>
+ <groupId>org.richfaces</groupId>
+ <artifactId>scrollable-grid-demo</artifactId>
+ <packaging>war</packaging>
+ <name>scrollable-grid-demo Maven Webapp</name>
+
<dependencies>
<dependency>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces</groupId>
<artifactId>scrollable-grid</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces</groupId>
<artifactId>richfaces</artifactId>
<version>3.0.1-SNAPSHOT</version>
</dependency>
17 years, 8 months