December 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r4694 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-12-11 07:53:38 -0500 (Tue, 11 Dec 2007) New Revision: 4694 Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss Log: Fix background color for short list with big height. Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 12:42:23 UTC (rev 4693) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 12:53:38 UTC (rev 4694) @@ -263,7 +263,7 @@ </u:selector> <u:selector name=".rich-ordering-list-output"> - <u:style name="background-color" skin="tableBackgroundColor" /> + <u:style name="background-color" skin="generalBackgroundColor" /> <u:style name="border-color" skin="tableBorderColor" /> </u:selector>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4693 - in branches/3.1.x/ui: orderingList/src/main/java/org/richfaces/renderkit and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-12-11 07:42:23 -0500 (Tue, 11 Dec 2007) New Revision: 4693 Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss Log: Replace "-end" with "-last" in CSS classes names. Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss =================================================================== --- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-11 12:19:37 UTC (rev 4692) +++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-11 12:42:23 UTC (rev 4693) @@ -138,7 +138,7 @@ background : transparent none repeat-x scroll left top; } -.rich-shuttle-header-tab-cell-end { +.rich-shuttle-header-tab-cell-last { border-style:solid; border-right: 0; border-left: 0; @@ -189,7 +189,7 @@ <u:style name="border-right-color" skin="panelBorderColor" /> </u:selector> -<u:selector name=".rich-shuttle-header-tab-cell-end"> +<u:selector name=".rich-shuttle-header-tab-cell-last"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" /> </u:style> @@ -247,7 +247,7 @@ <u:style name="color" skin="generalTextColor"/> </u:selector> - <u:selector name=".rich-shuttle-header-tab-cell-end"> + <u:selector name=".rich-shuttle-header-tab-cell-last"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" /> </u:style> @@ -258,7 +258,7 @@ <u:style name="font-weight" skin="headerWeightFont" /> </u:selector> - <u:selector name=".rich-shuttle-source-cell-end, .rich-shuttle-target-cell-end"> + <u:selector name=".rich-shuttle-source-cell-last, .rich-shuttle-target-cell-last"> <u:style name="border-right-color" skin="selectControlColor" /> </u:selector> Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-11 12:19:37 UTC (rev 4692) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-11 12:42:23 UTC (rev 4693) @@ -408,7 +408,7 @@ writer.startElement(element, column); if (!headers.hasNext()) { - skinCellClass = skinCellClass + "-end"; + skinCellClass = skinCellClass + "-last"; } encodeStyleClass(writer, null, skinCellClass, headerClass, columnHeaderClass); getUtils().encodeAttribute(context, column, "colspan"); Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 12:19:37 UTC (rev 4692) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 12:42:23 UTC (rev 4693) @@ -149,7 +149,7 @@ padding : 2px; } -.rich-ordering-list-table-header-cell-end { +.rich-ordering-list-table-header-cell-last { border-style:solid; border-right: 0; white-space: nowrap; @@ -242,7 +242,7 @@ <u:style name="border-left-color" skin="panelBorderColor" /> </u:selector> - <u:selector name=".rich-ordering-list-table-header-cell-end"> + <u:selector name=".rich-ordering-list-table-header-cell-last"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" /> </u:style>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4692 - trunk/framework/impl/src/main/java/org/ajax4jsf/context.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-12-11 07:19:37 -0500 (Tue, 11 Dec 2007) New Revision: 4692 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java Log: Added missed import Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-11 10:39:41 UTC (rev 4691) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-11 12:19:37 UTC (rev 4692) @@ -27,6 +27,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -727,4 +728,4 @@ this.oncomplete = oncomplete; } -} \ No newline at end of file +}

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4691 - in trunk/sandbox/ui/columns/src/main: java/org/richfaces/tag and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-11 05:39:41 -0500 (Tue, 11 Dec 2007) New Revision: 4691 Modified: trunk/sandbox/ui/columns/src/main/config/component/columns.xml trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java Log: RF-1201 - add begin attribute Modified: trunk/sandbox/ui/columns/src/main/config/component/columns.xml =================================================================== --- trunk/sandbox/ui/columns/src/main/config/component/columns.xml 2007-12-11 09:00:51 UTC (rev 4690) +++ trunk/sandbox/ui/columns/src/main/config/component/columns.xml 2007-12-11 10:39:41 UTC (rev 4691) @@ -48,12 +48,19 @@ </description> </property> <property> - <name>end</name> + <name>columns</name> <classname>java.lang.Object</classname> <description> Count of columns </description> </property> + <property> + <name>begin</name> + <classname>java.lang.Object</classname> + <description> + The first iteration item + </description> + </property> <property disabled="true"> <name>header</name> </property> Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java =================================================================== --- trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java 2007-12-11 09:00:51 UTC (rev 4690) +++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java 2007-12-11 10:39:41 UTC (rev 4691) @@ -32,7 +32,6 @@ import org.richfaces.iterator.ForEachIterator; import org.richfaces.iterator.SimpleForEachIterator; - /** * Class provides implementation for columns tag * @@ -41,7 +40,7 @@ */ public abstract class AbstractColumnsTag extends UIComponentClassicTagBase implements IterationTag { - + /** Column component type */ private static final String _componentType = "org.richfaces.Column"; @@ -70,9 +69,12 @@ /** Value attribute value */ protected Object rawItems; // our 'raw' items - /** End attribute - defines count of column if value attr hasn't been defined*/ - private ValueExpression end; + /** End attribute - defines count of column if value attr hasn't been defined */ + private ValueExpression columns; + /** Begin attribute - defines the first iteration item */ + private ValueExpression begin; + /** Index attr - defines page variable for current column counter */ private ValueExpression _index; @@ -80,8 +82,11 @@ private String indexId; /** Integer value of end attr. */ - private Integer _end; + private Integer _columns; + /** Integer value of begin attr. */ + private Integer _begin; + /** String value of var attr */ private String itemId = null; @@ -492,7 +497,7 @@ @Override public int doAfterBody() throws JspException { - if (hasNext()) { + if (hasNext()) { loop(); } else return EVAL_BODY_INCLUDE; @@ -502,13 +507,16 @@ return EVAL_BODY_AGAIN; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.faces.webapp.UIComponentClassicTagBase#addFacet(java.lang.String) */ protected void addFacet(String name) { super.addFacet(name); - - // add created component in facet in childrenList to reduce duplicated Id exp. + + // add created component in facet in childrenList to reduce duplicated + // Id exp. if (this.component != null && this.component.getFacets() != null) { Map<String, UIComponent> facets = this.component.getFacets(); Iterator<UIComponent> it = facets.values().iterator(); @@ -567,7 +575,8 @@ } /** - * Method is invoking by each iteration of body again rendering + * Method is invoking by each iteration of body again rendering + * * @throws JspTagException */ private void loop() throws JspTagException { @@ -583,6 +592,7 @@ /** * Creates column instance + * * @return */ private UIComponent createColumn() { @@ -591,35 +601,36 @@ component.setId(getFacesContext().getViewRoot().createUniqueId()); initColumnByThis(component); - + this.component = component; this.parentTag = getParentUIComponentClassicTagBase(pageContext); this.previous = component; return component; } - + /** - * Inits column component by columns tag attrs + * Inits column component by columns tag attrs + * * @param column */ - void initColumnByThis (UIComponent column) { - column.setValueExpression("style",_style); - column.setValueExpression("styleClass",_styleClass); - column.setValueExpression("colspan",_colspan); - column.setValueExpression("rowspan",_rowspan); - column.setValueExpression("breakBefore",_breakBefore); - column.setValueExpression("headerClass",_headerClass); - column.setValueExpression("footerClass",_footerClass); - column.setValueExpression("width",_width); - column.setValueExpression("sortable",_sortable); - column.setValueExpression("sortExpression",_sortExpression); - column.setValueExpression("rendered",rendered); + void initColumnByThis(UIComponent column) { + column.setValueExpression("style", _style); + column.setValueExpression("styleClass", _styleClass); + column.setValueExpression("colspan", _colspan); + column.setValueExpression("rowspan", _rowspan); + column.setValueExpression("breakBefore", _breakBefore); + column.setValueExpression("headerClass", _headerClass); + column.setValueExpression("footerClass", _footerClass); + column.setValueExpression("width", _width); + column.setValueExpression("sortable", _sortable); + column.setValueExpression("sortExpression", _sortExpression); + column.setValueExpression("rendered", rendered); } - /** * Returns true if this is the first loop of columns tag + * * @return */ private boolean atFirst() { @@ -633,9 +644,9 @@ */ @Override public int doStartTag() throws JspException { - + prepare(); - + if (created) { dataTable.getChildren().clear(); created = false; @@ -654,7 +665,8 @@ } /** - * Method prepares all we need for starting of tag rendering + * Method prepares all we need for starting of tag rendering + * * @throws JspTagException */ private void prepare() throws JspTagException { @@ -676,9 +688,11 @@ .supportedTypeForEachIterator(rawItems); } else { // no 'items', so use 'begin' and 'end' - items = SimpleForEachIterator.beginEndForEachIterator(_end - 1); + items = SimpleForEachIterator.beginEndForEachIterator(_columns - 1); } + correctFirst(); + /* * ResultSet no more supported in <c:forEach> // step must be 1 when * ResultSet is passed in if (rawItems instanceof ResultSet && step != @@ -689,22 +703,22 @@ } /** - * Extracts integer value from end attr + * Extracts integer value from end attr */ - private void initEnd() { - if (end != null) { - if (end instanceof ValueExpression) + private void initColumnsCount() { + if (columns != null) { + if (columns instanceof ValueExpression) try { - String t = (String) end.getValue(getELContext()); - _end = Integer.parseInt(t); - if (_end < 0) { - _end = 0; // If end is negative set up zero + String t = (String) columns.getValue(getELContext()); + _columns = Integer.parseInt(t); + if (_columns < 0) { + _columns = 0; // If end is negative set up zero } } catch (Exception e) { - _end = 0; + _columns = 0; } } else { - _end = 0; + _columns = 0; } } @@ -721,6 +735,7 @@ } } + /** * Extracts string value from index attr */ @@ -736,16 +751,38 @@ } /** + * Extracts string value from index attr + */ + private void initBegin() { + _begin = 0; + if (begin != null) { + try { + String t = (String) begin.getValue(getELContext()); + _begin = Integer.parseInt(t); + _begin--; // correct begin value + if (_begin < 0) { + _begin = 0; + } + } catch (ClassCastException e) { + _begin = 0; + } + + } + } + + /** * Extracts tags attributes values */ private void initVariables() { - initEnd(); + initColumnsCount(); initIndex(); initVar(); + initBegin(); } /** - * Return true if we didn't complete column's count + * Return true if we didn't complete column's count + * * @return * @throws JspTagException */ @@ -754,7 +791,8 @@ } /** - * Iterate to next column + * Iterate to next column + * * @return * @throws JspTagException */ @@ -775,14 +813,18 @@ return super.getBodyContent(); } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.faces.webapp.UIComponentClassicTagBase#setProperties(javax.faces.component.UIComponent) */ protected void setProperties(UIComponent component) { } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.faces.webapp.UIComponentClassicTagBase#hasBinding() */ protected boolean hasBinding() { @@ -803,7 +845,8 @@ } /** - * Sets page request variables + * Sets page request variables + * * @throws JspTagException */ private void exposeVariables() throws JspTagException { @@ -824,7 +867,6 @@ */ // Set up var variable - if (itemId != null) { if (index == null) pageContext.removeAttribute(itemId, PageContext.PAGE_SCOPE); @@ -840,26 +882,27 @@ } // Set up index variable - + if (indexId != null) { if (index == null) pageContext.removeAttribute(indexId, PageContext.PAGE_SCOPE); else { IteratedIndexExpression indexExpression = new IteratedIndexExpression( - index); + index - _begin); VariableMapper vm = pageContext.getELContext() .getVariableMapper(); if (vm != null) { vm.setVariable(indexId, indexExpression); } - pageContext.setAttribute(indexId, index); + pageContext.setAttribute(indexId, index - _begin); } } } /** - * Return expression for page variables + * Return expression for page variables + * * @param expr * @return */ @@ -891,6 +934,23 @@ } /** + * Inits first iteration item + */ + private void correctFirst() { + try { + if (items != null) { + if (_begin > 0 && (index < (_begin-1))) { + while ((index < (_begin -1)) && hasNext()) { + next(); + } + } + } + } catch (Exception e) { + // TODO: handle exception + } + } + + /** * <p> * Pop the top {@link UIComponentTag} instance off of our component tag * stack, deleting the stack if this was the last entry. @@ -934,21 +994,36 @@ } /** - * @return the end + * @return the begin */ - public ValueExpression getEnd() { - return end; + public ValueExpression getBegin() { + return begin; } /** - * @param end - * the end to set + * @param begin + * the begin to set */ - public void setEnd(ValueExpression end) { - this.end = end; + public void setBegin(ValueExpression begin) { + this.begin = begin; } /** + * @return the columns + */ + public ValueExpression getColumns() { + return columns; + } + + /** + * @param columns + * the columns to set + */ + public void setColumns(ValueExpression columns) { + this.columns = columns; + } + + /** * @return the index */ public ValueExpression getIndex() { @@ -1220,7 +1295,7 @@ /** * @author Andrey Markavtsov * @version $Id: IteratedIndexExpression.java,v 1.2 2007/12/06 01:20:43 - * + * */ final class IteratedIndexExpression extends ValueExpression { @@ -1286,8 +1361,8 @@ * */ public IndexedValueExpression(ValueExpression orig, int i) { - this.i = new Integer(i); - this.orig = orig; + this.i = new Integer(i); + this.orig = orig; } /* @@ -1296,12 +1371,12 @@ * @see javax.el.ValueExpression#getValue(javax.el.ELContext) */ public Object getValue(ELContext context) { - Object base = this.orig.getValue(context); - if (base != null) { - context.setPropertyResolved(false); - return context.getELResolver().getValue(context, base, i); - } - return null; + Object base = this.orig.getValue(context); + if (base != null) { + context.setPropertyResolved(false); + return context.getELResolver().getValue(context, base, i); + } + return null; } /* @@ -1311,11 +1386,11 @@ * java.lang.Object) */ public void setValue(ELContext context, Object value) { - Object base = this.orig.getValue(context); - if (base != null) { - context.setPropertyResolved(false); - context.getELResolver().setValue(context, base, i, value); - } + Object base = this.orig.getValue(context); + if (base != null) { + context.setPropertyResolved(false); + context.getELResolver().setValue(context, base, i, value); + } } /* @@ -1324,12 +1399,12 @@ * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext) */ public boolean isReadOnly(ELContext context) { - Object base = this.orig.getValue(context); - if (base != null) { - context.setPropertyResolved(false); - return context.getELResolver().isReadOnly(context, base, i); - } - return true; + Object base = this.orig.getValue(context); + if (base != null) { + context.setPropertyResolved(false); + return context.getELResolver().isReadOnly(context, base, i); + } + return true; } /* @@ -1338,12 +1413,12 @@ * @see javax.el.ValueExpression#getType(javax.el.ELContext) */ public Class getType(ELContext context) { - Object base = this.orig.getValue(context); - if (base != null) { - context.setPropertyResolved(false); - return context.getELResolver().getType(context, base, i); - } - return null; + Object base = this.orig.getValue(context); + if (base != null) { + context.setPropertyResolved(false); + return context.getELResolver().getType(context, base, i); + } + return null; } /* @@ -1352,7 +1427,7 @@ * @see javax.el.ValueExpression#getExpectedType() */ public Class getExpectedType() { - return Object.class; + return Object.class; } /* @@ -1361,7 +1436,7 @@ * @see javax.el.Expression#getExpressionString() */ public String getExpressionString() { - return this.orig.getExpressionString(); + return this.orig.getExpressionString(); } /* @@ -1370,7 +1445,7 @@ * @see javax.el.Expression#equals(java.lang.Object) */ public boolean equals(Object obj) { - return this.orig.equals(obj); + return this.orig.equals(obj); } /* @@ -1379,7 +1454,7 @@ * @see javax.el.Expression#hashCode() */ public int hashCode() { - return this.orig.hashCode(); + return this.orig.hashCode(); } /* @@ -1388,7 +1463,7 @@ * @see javax.el.Expression#isLiteralText() */ public boolean isLiteralText() { - return false; + return false; } } Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java =================================================================== --- trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-11 09:00:51 UTC (rev 4690) +++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-11 10:39:41 UTC (rev 4691) @@ -7,6 +7,7 @@ package org.richfaces.taglib.html.facelets; import java.io.IOException; +import java.io.Serializable; import java.util.Collection; import java.util.Enumeration; import java.util.Iterator; @@ -42,7 +43,10 @@ private TagAttribute value; /** end attribute */ - private TagAttribute end; + private TagAttribute columns; + + /** begin attribute */ + private TagAttribute begin; /** var attribute */ private TagAttribute var; @@ -50,9 +54,6 @@ /** index attribute */ private TagAttribute index; - /** rendered attribute */ - private TagAttribute rendered; - /** Iterator for columns's tag value attribute */ protected ForEachIterator items; // our 'digested' items @@ -61,9 +62,12 @@ /** Var attr - defines page variable for current item */ private String _indexId; + + /** Integer value begin attr*/ + private Integer _begin; /** Integer value of end attr. */ - private Integer _end; + private Integer _columns; /** String value of var attr */ private String _itemId = null; @@ -94,9 +98,10 @@ * Extracts tags attributes values */ private void initVariables(FaceletContext ctx) { - initEnd(ctx); + initColumnsCount(ctx); initIndex(ctx); initVar(ctx); + initBegin(ctx); } /** @@ -124,18 +129,34 @@ .supportedTypeForEachIterator(rawItems); } else { // no 'items', so use 'begin' and 'end' - items = SimpleForEachIterator.beginEndForEachIterator(_end - 1); + items = SimpleForEachIterator.beginEndForEachIterator(_columns - 1); } } catch (Exception e) { // TODO: handle exception } - + + correctFirst(ctx); + if (hasNext()) { exposeVariables(ctx, 0); next(ctx); } } + + + /** + * Inits first iteration item + */ + private void correctFirst(FaceletContext ctx) { + if (items != null) { + if (_begin > 0 && (_index < _begin)) { + while ( (_index < _begin) && hasNext()) { + next(ctx); + } + } + } + } /** * Return true if we didn't complete column's count @@ -171,21 +192,42 @@ /** * Extracts integer value from end attr */ - private void initEnd(FaceletContext ctx) { - this.end = getAttribute("end"); - if (end != null) { + private void initColumnsCount(FaceletContext ctx) { + this.columns = getAttribute("columns"); + if (columns != null) { try { - _end = Integer.parseInt((String)end.getObject(ctx)); - if (_end < 0) { - _end = 0; // If end is negative set up zero + _columns = Integer.parseInt((String)columns.getObject(ctx)); + if (_columns < 0) { + _columns = 0; // If end is negative set up zero } } catch (Exception e) { - _end = 0; + _columns = 0; } } else { - _end = 0; + _columns = 0; } } + + + /** + * Extracts integer value from end attr + */ + private void initBegin(FaceletContext ctx) { + this.begin = getAttribute("begin"); + if (begin != null) { + try { + _begin = Integer.parseInt((String)begin.getObject(ctx)); + _begin--; // - 1 + if (_begin < 0) { + _begin = 0; // If end is negative set up zero + } + } catch (Exception e) { + _begin = 0; + } + } else { + _begin = 0; + } + } /** * Extracts string value from var attr @@ -273,7 +315,7 @@ if (value != null) { ValueExpression srcVE = value.getValueExpression(ctx, Object.class); - ValueExpression ve = getVarExpression(ctx, srcVE, k); + ValueExpression ve = getVarExpression(ctx, srcVE, k + _begin); vm.setVariable(_itemId, ve); } } @@ -352,7 +394,7 @@ c.setRendered(false); } - if (vCounter == _index || atFirst()) { + if ((vCounter == (_index - _begin)) || atFirst()) { release(); return; } @@ -388,7 +430,7 @@ * @author Kin-man Chung * @version $Id: IteratedExpression.java,v 1.3 2005/12/08 01:20:43 kchung Exp $ */ -final class IteratedExpression { +final class IteratedExpression implements Serializable{ private static final long serialVersionUID = 1L; protected final ValueExpression orig; @@ -479,7 +521,8 @@ * @version $Id: IteratedValueExpression.java,v 1.2 2005/12/08 01:20:43 kchung * Exp $ */ -final class IteratedValueExpression extends ValueExpression { +final class IteratedValueExpression extends ValueExpression +implements Serializable{ private static final long serialVersionUID = 1L; protected final int i; @@ -531,7 +574,8 @@ * @version $Id: IteratedIndexExpression.java,v 1.2 2007/12/06 01:20:43 * */ -final class IteratedIndexExpression extends ValueExpression { +final class IteratedIndexExpression extends ValueExpression +implements Serializable{ private static final long serialVersionUID = 1L; protected final Integer i; @@ -580,7 +624,8 @@ * @author Jacob Hookom * @version $Id: IndexedValueExpression.java,v 1.3 2005/08/24 04:38:52 jhook Exp $ */ -final class IndexedValueExpression extends ValueExpression { +final class IndexedValueExpression extends ValueExpression +implements Serializable{ /** *

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4690 - trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-11 04:00:51 -0500 (Tue, 11 Dec 2007) New Revision: 4690 Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java Log: RF-1201 correction Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java =================================================================== --- trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java 2007-12-11 09:00:47 UTC (rev 4689) +++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java 2007-12-11 09:00:51 UTC (rev 4690) @@ -676,7 +676,7 @@ .supportedTypeForEachIterator(rawItems); } else { // no 'items', so use 'begin' and 'end' - items = SimpleForEachIterator.beginEndForEachIterator(_end); + items = SimpleForEachIterator.beginEndForEachIterator(_end - 1); } /*

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4689 - trunk/sandbox/samples/columnsDemo/src/main/webapp/pages.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-11 04:00:47 -0500 (Tue, 11 Dec 2007) New Revision: 4689 Modified: trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.jsp trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.xhtml Log: RF-1201 correction Modified: trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.jsp 2007-12-11 03:25:06 UTC (rev 4688) +++ trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.jsp 2007-12-11 09:00:47 UTC (rev 4689) @@ -36,6 +36,13 @@ <h:inputText value="#{var[counter]}"></h:inputText> </columns:columns> </dt:dataTable> + + <dt:dataTable value="#{bean.model}" var="var" id="tb2"> + <columns:columns end="#{bean.columnsCountStr}" var="col" index="counter" + style="color: Red;" width="100px;"> + <h:outputText value="#{var[counter]}"></h:outputText> + </columns:columns> + </dt:dataTable> </h:form> Modified: trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2007-12-11 03:25:06 UTC (rev 4688) +++ trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2007-12-11 09:00:47 UTC (rev 4689) @@ -23,7 +23,7 @@ <dt:dataTable value="#{bean.model}" var="var" id="tb"> <columns:columns value="#{bean.columns}" var="col" index="counter" - style="color: Green;"> + style="color: Red;" width="100px;"> <f:facet name="header"> <h:outputText value="#{col.header}"></h:outputText> </f:facet> @@ -34,6 +34,13 @@ <h:inputText value="#{var[counter]}"></h:inputText> </columns:columns> </dt:dataTable> + + <dt:dataTable value="#{bean.model}" var="var" id="tb2"> + <columns:columns end="#{bean.columnsCountStr}" var="col" index="counter" + style="color: Red;" width="100px;"> + <h:outputText value="#{var[counter]}"></h:outputText> + </columns:columns> + </dt:dataTable> </h:form>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4688 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-12-10 22:25:06 -0500 (Mon, 10 Dec 2007) New Revision: 4688 Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js Log: http://jira.jboss.com/jira/browse/RF-1584 Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-12-11 02:54:05 UTC (rev 4687) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-12-11 03:25:06 UTC (rev 4688) @@ -1,4 +1,4 @@ -if(!window.Richfaces) var Richfaces = function(){}; +if (!window.Richfaces) { window.Richfaces = {}; } Richfaces.SelectItem = Class.create();

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4687 - branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-12-10 21:54:05 -0500 (Mon, 10 Dec 2007) New Revision: 4687 Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js Log: http://jira.jboss.com/jira/browse/RF-1582 Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-11 02:13:36 UTC (rev 4686) +++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-11 02:54:05 UTC (rev 4687) @@ -1771,16 +1771,28 @@ var dim = Richfaces.Calendar.getOffsetDimensions(element); te.style.width = te_shadow.style.width = dim.width + 'px'; te.style.height = te_shadow.style.height = dim.height + 'px'; - te.style.left = te_shadow.style.left = element.style.left; - te.style.top = te_shadow.style.top = element.style.top; - + //Element.clonePosition(te, element); //Element.clonePosition(te_shadow, element); this.updateTimeEditor(); + te_shadow.style.visibility = 'hidden'; + te_shadow.show(); + + te_shadow.style.left = '0px'; + te_shadow.style.top = '0px'; + + var o1 = element.cumulativeOffset(); + var o2 = te_shadow.cumulativeOffset(); + + te.style.left = te_shadow.style.left = (o1[0] - o2[0]) + 'px'; + te.style.top = te_shadow.style.top = (o1[1] - o2[1]) + 'px'; + + te_shadow.style.visibility = ''; + te.show(); - te_shadow.show(); + Element.clonePosition(this.TIME_EDITOR_LAYOUT_SHADOW_ID, this.TIME_EDITOR_LAYOUT_ID, {offsetLeft: 3, offsetTop: 3}); },

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4686 - in trunk: cdk/generator/src/main/java/org/ajax4jsf/builder/xml and 7 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-12-10 21:13:36 -0500 (Mon, 10 Dec 2007) New Revision: 4686 Added: trunk/cdk/maven-cdk-plugin/src/main/resources/templates/xcss.vm trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/xcss.vm Modified: trunk/cdk/generator/pom.xml trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBody.java trunk/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyTest.java trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java trunk/framework/impl/pom.xml trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml trunk/ui/assembly/pom.xml Log: Generate united script and css for a project Modified: trunk/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/cdk/generator/pom.xml 2007-12-11 02:13:36 UTC (rev 4686) @@ -1,4 +1,6 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> @@ -77,11 +79,11 @@ <groupId>cglib</groupId> <artifactId>cglib</artifactId> <version>2.1_3</version> - </dependency> - <dependency> - <groupId>wutka</groupId> - <artifactId>dtdparser</artifactId> - <version>1.21</version> - </dependency> + </dependency> + <dependency> + <groupId>wutka</groupId> + <artifactId>dtdparser</artifactId> + <version>1.21</version> + </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBody.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBody.java 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/xml/XMLBody.java 2007-12-11 02:13:36 UTC (rev 4686) @@ -31,7 +31,9 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.ErrorListener; import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; @@ -70,12 +72,24 @@ * @throws ParsingException */ public void loadXML(InputStream input) throws ParsingException { + loadXML(input,false); + } + + + /** + * Load XML document and parse it into DOM. + * + * @param input + * @throws ParsingException + */ + public void loadXML(InputStream input, boolean namespaceAware) throws ParsingException { try { // Create Document Builder Factory DocumentBuilderFactory docFactory = DocumentBuilderFactory .newInstance(); docFactory.setValidating(false); + docFactory.setNamespaceAware(namespaceAware); // Create Document Builder DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); @@ -146,6 +160,27 @@ TransformerFactory transformerFactory = TransformerFactory .newInstance(); Transformer transformer = transformerFactory.newTransformer(); + transformer.setErrorListener(new ErrorListener(){ + + public void error(TransformerException exception) + throws TransformerException { + // TODO Auto-generated method stub + + } + + public void fatalError(TransformerException exception) + throws TransformerException { + // TODO Auto-generated method stub + + } + + public void warning(TransformerException exception) + throws TransformerException { + // TODO Auto-generated method stub + + } + + }); transformer.setOutputProperty("omit-xml-declaration", "yes"); StringWriter out = new StringWriter(); StreamResult result = new StreamResult(out); Modified: trunk/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyTest.java =================================================================== --- trunk/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyTest.java 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XMLBodyTest.java 2007-12-11 02:13:36 UTC (rev 4686) @@ -185,4 +185,23 @@ assertTrue(e.getMessage(),false); } } + + public void testGetContentWithNS() throws Exception { + String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<f:faces-config xmlns=\"http://foo.bar\" xmlns:f=\"http://foo.baz\">" + + "<f:component><test f:foo=\"xxx\">blabla</test></f:component>" + + "</f:faces-config>"; + InputStream in = new ByteArrayInputStream(xml.getBytes()); + XMLBody body = new XMLBody(); + body.loadXML(in,true); + try { + assertEquals( + "<f:component xmlns:f=\"http://foo.baz\"><test f:foo=\"xxx\" xmlns=\"http://foo.bar\">blabla</test></f:component>", + body.getContent()); + } catch (ParsingException e) { + e.printStackTrace(); + assertTrue(e.getMessage(),false); + } + + } } Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2007-12-11 02:13:36 UTC (rev 4686) @@ -90,6 +90,8 @@ private static final String RESOURCES_CONFIG_TEMPLATE = "resources-config.vm"; + private static final String XCSS_TEMPLATE = "xcss.vm"; + private static final String TLD_TEMPLATE = "tld.vm"; private static final String TAGLIB_TEMPLATE = "taglib.vm"; @@ -156,6 +158,11 @@ private File buildDirectory; /** + * @parameter default-value="${project.build.directory}/modules" + */ + private File modulesDirectory; + + /** * The directory for compiled classes. * * @parameter expression="${project.build.directory}/pom.xml" @@ -188,8 +195,21 @@ */ private String includeTaglib = "META-INF/*.taglib.xml"; + /** + * @parameter + */ + private String includeXcss = "**/*.xcss"; /** + * @parameter + */ + private String commonStyle; + + /** + * @parameter + */ + private String templateXpath; + /** * */ public AssemblyLibraryMojo() { @@ -214,7 +234,13 @@ "META-INF/resources-config.xml"); mergeXML(models, "META-INF/resources-config.xml", RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource", - "name/text()", new VelocityContext(), resourcesConfig); + "name/text()", new VelocityContext(), resourcesConfig, false); + if (null != commonStyle) { + File commonXcss = new File(outputDirectory, commonStyle); + mergeXML(models, includeXcss, XCSS_TEMPLATE, templateXpath, null, + new VelocityContext(), commonXcss, true); + + } if (null != library.getTaglibs() && library.getTaglibs().length > 0) { for (int i = 0; i < library.getTaglibs().length; i++) { Taglib taglib = library.getTaglibs()[i]; @@ -238,7 +264,10 @@ .hasNext();) { Model model = (Model) iterator.next(); String id = model.getArtifactId(); - if((includeModules == null || Arrays.binarySearch(includeModules, id)>=0)&&(excludeModules == null || Arrays.binarySearch(excludeModules, id)<0)){ + if ((includeModules == null || Arrays.binarySearch( + includeModules, id) >= 0) + && (excludeModules == null || Arrays + .binarySearch(excludeModules, id) < 0)) { taglibModels.add(model); } } @@ -256,25 +285,27 @@ */ private void generateTaglib(List models, Taglib taglib) throws MojoExecutionException { - getLog().debug("Assembly taglib for uri " + taglib.getUri()+" with short name "+taglib.getShortName()); + getLog().debug( + "Assembly taglib for uri " + taglib.getUri() + + " with short name " + taglib.getShortName()); VelocityContext taglibContext = new VelocityContext(); taglibContext.put("taglib", taglib); // Build includes/excludes Xpath condition String nameTag = "name"; createTagCondition(taglib, nameTag); - File tld = new File(outputDirectory, "META-INF/" - + taglib.getTaglib() + ".tld"); - getLog().debug("Write JSP taglib "+tld.getPath()); + File tld = new File(outputDirectory, "META-INF/" + taglib.getTaglib() + + ".tld"); + getLog().debug("Write JSP taglib " + tld.getPath()); mergeXML(models, includeTld, TLD_TEMPLATE, "/taglib/tag" + createTagCondition(taglib, "name") + " | /taglib/listener", - null, new VelocityContext(taglibContext), tld); + null, new VelocityContext(taglibContext), tld, false); File faceletsTaglib = new File(outputDirectory, "META-INF/" + taglib.getTaglib() + ".taglib.xml"); mergeXML(models, includeTaglib, TAGLIB_TEMPLATE, "/facelet-taglib/tag" + createTagCondition(taglib, "tag-name") + " | /facelet-taglib/function", null, new VelocityContext( - taglibContext), faceletsTaglib); - getLog().debug("Write Facelets taglib "+faceletsTaglib.getPath()); + taglibContext), faceletsTaglib, false); + getLog().debug("Write Facelets taglib " + faceletsTaglib.getPath()); } /** @@ -393,7 +424,7 @@ Artifact artifact = factory.createBuildArtifact(model.getGroupId(), model.getArtifactId(), model.getVersion(), model .getPackaging()); - File moduleDir = new File(buildDirectory, model.getArtifactId()); + File moduleDir = new File(modulesDirectory, model.getArtifactId()); unpackArtifact(artifact, moduleDir, true); artifact = factory .createArtifactWithClassifier(model.getGroupId(), model @@ -425,7 +456,7 @@ .addAll(projectsDependencies.values()); writePom(generatedProject); project.setDependencies(new ArrayList(projectsDependencies.values())); -// project.setFile(generatedPom); + // project.setFile(generatedPom); } /** @@ -480,7 +511,7 @@ } for (Iterator iter = models.iterator(); iter.hasNext();) { Model model = (Model) iter.next(); - File moduleFacesConfig = new File(buildDirectory, model + File moduleFacesConfig = new File(modulesDirectory, model .getArtifactId() + "/META-INF/faces-config.xml"); if (moduleFacesConfig.exists()) { @@ -538,22 +569,23 @@ * XPath expression fof common part of result file. * @param keyXPath - * XPath expression for key part of common parts + * @param context - + * Velocity context for template processing. + * @param namespaceAware TODO * @param keySet - * {@link Set} to check for duplicate keys. Must not be null - * @param context - - * Velocity context for template processing. * @throws MojoExecutionException */ private void mergeXML(List models, String filename, String templateName, String commonXpath, String keyXPath, VelocityContext context, - File target) throws MojoExecutionException { + File target, boolean namespaceAware) throws MojoExecutionException { Set<String> keySet = new HashSet<String>(); StringBuffer content = new StringBuffer(); List<XMLBody> xmls = new ArrayList<XMLBody>(models.size()); String[] split = filename.split(","); for (Iterator iter = models.iterator(); iter.hasNext();) { Model model = (Model) iter.next(); - File moduleDir = new File(buildDirectory, model.getArtifactId()); + File moduleDir = new File(modulesDirectory, model.getArtifactId()); DirectoryScanner ds = new DirectoryScanner(); ds.setFollowSymlinks(true); ds.setBasedir(moduleDir); @@ -568,7 +600,7 @@ + model.getArtifactId()); XMLBody configBody = new XMLBody(); try { - configBody.loadXML(new FileInputStream(moduleFacesConfig)); + configBody.loadXML(new FileInputStream(moduleFacesConfig),namespaceAware); xmls.add(configBody); if (commonXpath != null) { if (keyXPath == null) { Added: trunk/cdk/maven-cdk-plugin/src/main/resources/templates/xcss.vm =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/templates/xcss.vm (rev 0) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/templates/xcss.vm 2007-12-11 02:13:36 UTC (rev 4686) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > +${content} +</f:template> \ No newline at end of file Added: trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/xcss.vm =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/xcss.vm (rev 0) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/xcss.vm 2007-12-11 02:13:36 UTC (rev 4686) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > +${content} +</f:template> \ No newline at end of file Modified: trunk/framework/impl/pom.xml =================================================================== --- trunk/framework/impl/pom.xml 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/framework/impl/pom.xml 2007-12-11 02:13:36 UTC (rev 4686) @@ -64,37 +64,55 @@ </resourceRoot> </configuration> </execution> + <execution> + <id>framevork-javascript</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy todir="target/classes/org/ajax4jsf" file="target/compressed/framework.pack.js"/> + </tasks> + </configuration> + </execution> </executions> </plugin> <plugin> <groupId>net.sf.alchim</groupId> <artifactId>yuicompressor-maven-plugin</artifactId> - <executions> + </execution> </executions> <configuration> <nosuffix>false</nosuffix> <outputDirectory>${project.build.directory}/compressed/</outputDirectory> - <blaBla>foo</blaBla> <aggregations> <aggregation>   - <insertNewLine>false</insertNewLine> + <insertNewLine>true</insertNewLine> <output>${project.build.directory}/compressed/framework.pack.js</output>  <includes> - <include>**/*.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> + <include>**/*-min.js</include> </includes>  <excludes> <exclude>**/*.pack.js</exclude> +  + <exclude>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/*.js</exclude> + <exclude>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.jcarousel-min.js</exclude> <exclude>**/compressed.css</exclude> </excludes> </aggregation> Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-12-11 02:13:36 UTC (rev 4686) @@ -42,7 +42,16 @@ <context-param> <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> <param-value>NEKO</param-value> - </context-param> + </context-param> + <context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>ALL</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>ALL</param-value> + </context-param> + <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> Modified: trunk/ui/assembly/pom.xml =================================================================== --- trunk/ui/assembly/pom.xml 2007-12-11 00:35:09 UTC (rev 4685) +++ trunk/ui/assembly/pom.xml 2007-12-11 02:13:36 UTC (rev 4686) @@ -1,4 +1,6 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> @@ -57,7 +59,9 @@ <includeModules>core</includeModules> </taglib> </taglibs> - </library> + </library><commonStyle>org/richfaces/skin.xcss</commonStyle> </configuration> <executions> <execution> @@ -123,7 +127,7 @@ </execution> </executions> <configuration> - <javadocVersion>1.5</javadocVersion> + <javadocVersion>1.5</javadocVersion> </configuration> </plugin> <plugin> @@ -197,7 +201,75 @@ </outputDirectory> </configuration> </plugin> - </plugins> + <plugin> + <groupId>net.sf.alchim</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + </execution> + </executions> + <configuration> + <nosuffix>false</nosuffix> + <outputDirectory> + ${project.build.directory}/compressed/ + </outputDirectory> + <aggregations> + <aggregation> +  +  + <insertNewLine>true</insertNewLine> + <output> + ${project.build.directory}/compressed/ui.pack.js + </output> +  + <includes><include>**/*-min.js</include> + </includes> +  + <excludes> + <exclude>**/*.pack.js</exclude> +  + <exclude>**/scriptaculo*</exclude> + <exclude>**/scriptaculo*/**</exclude> + </excludes> + </aggregation> + </aggregations><includes> + <include>**/*.js</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>framevork-javascript</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy todir="target/classes/org/richfaces" file="target/compressed/ui.pack.js"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies /> </project> \ No newline at end of file

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r4685 - in trunk: ui/calendar/src/main/java/org/richfaces/renderkit and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-12-10 19:35:09 -0500 (Mon, 10 Dec 2007) New Revision: 4685 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-1573 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-11 00:26:30 UTC (rev 4684) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-11 00:35:09 UTC (rev 4685) @@ -83,7 +83,7 @@ Set ajaxAreasToRender = new HashSet(); - Set ajaxRenderedAreas = new HashSet(); + Set ajaxRenderedAreas = new LinkedHashSet(); boolean ajaxRequest = false; @@ -118,7 +118,7 @@ ajaxAreasToRender = new HashSet(); - ajaxRenderedAreas = new HashSet(); + ajaxRenderedAreas = new LinkedHashSet(); ajaxRequest = false; Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-12-11 00:26:30 UTC (rev 4684) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-12-11 00:35:09 UTC (rev 4685) @@ -33,6 +33,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; +import java.util.Set; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -87,16 +88,17 @@ UICalendar component) { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); - if (ajaxContext.isAjaxRequest()) { - String clientId = component.getClientId(context); - - ajaxContext.getAjaxRenderedAreas().add( + Set ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas(); + String clientId = component.getClientId(context); + + if (ajaxContext.isAjaxRequest() && ajaxRenderedAreas.contains(clientId)) { + ajaxRenderedAreas.add( clientId + "Popup"); - ajaxContext.getAjaxRenderedAreas().add( + ajaxRenderedAreas.add( clientId + "IFrame"); - ajaxContext.getAjaxRenderedAreas().add( + ajaxRenderedAreas.add( clientId + "Script"); } }

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits December 2007