May 2008 - richfaces-svn-commits - Jboss List Archives

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

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

Author: alexsmirnov Date: 2008-05-13 20:33:20 -0400 (Tue, 13 May 2008) New Revision: 8566 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: fix http://jira.jboss.com/jira/browse/RF-3410 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-05-13 22:43:48 UTC (rev 8565) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-05-14 00:33:20 UTC (rev 8566) @@ -98,7 +98,13 @@ Iterator<UIComponent> childIterator = dataChildren(); while (childIterator.hasNext()) { UIComponent component = childIterator.next(); - processComponent(context, component, argument); + if (UIColumn.class.equals(component.getClass())) { + for (UIComponent children : component.getChildren()) { + processComponent(context, children, argument); + } + } else { + processComponent(context, component, argument); + } } } @@ -272,14 +278,11 @@ boolean rowAvailable = isRowAvailable(); - // if(key == localModel.getRowIndex()){ - // return; - // } - if (rowAvailable) { +// if (rowAvailable) { // save child state this.saveChildState(faces); - } +// } // Set current model row by int, but immediately get value from model. // for compability, complex models must provide values map between @@ -294,10 +297,10 @@ setupVariable(faces, localModel, rowSelected); - if (rowAvailable) { +// if (rowAvailable ) { // restore child state this.restoreChildState(faces); - } +// } } /* @@ -338,10 +341,10 @@ boolean rowAvailable = isRowAvailable(); - if (rowAvailable) { +// if (rowAvailable) { // save child state this.saveChildState(faces); - } +// } this._rowKey = key; this._clientId = null; @@ -354,10 +357,10 @@ //XXX check for row availability setupVariable(faces, localModel, rowSelected); - if (rowAvailable) { +// if (rowAvailable ) { // restore child state this.restoreChildState(faces); - } +// } } /** @@ -885,8 +888,8 @@ protected void saveChildState(FacesContext faces) { Iterator<UIComponent> itr = dataChildren(); + Map<String, SavedState> childState = this.getChildState(faces); while (itr.hasNext()) { - Map<String, SavedState> childState = this.getChildState(faces); this.saveChildState(faces, (UIComponent) itr.next(), childState); } } @@ -936,8 +939,8 @@ protected void restoreChildState(FacesContext faces) { Iterator<UIComponent> itr = dataChildren(); + Map<String, SavedState> childState = this.getChildState(faces); while (itr.hasNext()) { - Map<String, SavedState> childState = this.getChildState(faces); this.restoreChildState(faces, (UIComponent) itr.next(), childState); } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-05-13 22:43:48 UTC (rev 8565) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-05-14 00:33:20 UTC (rev 8566) @@ -68,6 +68,9 @@ public void encodeTableStructure(FacesContext context, UIDataTable table) throws IOException { ResponseWriter writer = context.getResponseWriter(); + Object key = table.getRowKey(); + table.captureOrigValue(context); + table.setRowKey(context, null); int columns = getColumnsCount(table); // Encode colgroup definition. writer.startElement("colgroup", table); @@ -88,6 +91,8 @@ encodeCaption(context, table); encodeHeader(context, table, columns); encodeFooter(context, table, columns); + table.setRowKey(context,key); + table.restoreOrigValue(context); } public void encodeHeader(FacesContext context, UIDataTable table,

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8565 - in trunk: framework/impl/src/main/java/org/ajax4jsf/resource and 7 other directories.

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

Author: alexsmirnov Date: 2008-05-13 18:43:48 -0400 (Tue, 13 May 2008) New Revision: 8565 Added: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java trunk/ui/assembly/src/main/resources/ trunk/ui/assembly/src/main/resources/META-INF/ trunk/ui/assembly/src/main/resources/META-INF/jsp.taglib.xml trunk/ui/dataTable/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/fileUpload/File.java trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/examples/fileUpload.xhtml trunk/ui/dataTable/src/main/java/org/richfaces/component/DataIterator.java trunk/ui/dataTable/src/main/java/org/richfaces/component/FixedChildrenIterator.java trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java Log: fix http://jira.jboss.com/jira/browse/RF-3344 start progress on http://jira.jboss.com/jira/browse/RF-3410 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -98,7 +98,7 @@ Iterator<UIComponent> childIterator = dataChildren(); while (childIterator.hasNext()) { UIComponent component = childIterator.next(); - processComponent(context, component, argument); + processComponent(context, component, argument); } } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -415,8 +415,8 @@ if (contentLength > 0) { context.setIntHeader("Content-Length", contentLength); - } else { - context.setHeader("Transfer-Encoding", "chunked"); +// } else { +// context.setHeader("Transfer-Encoding", "chunked"); } context.setHeader("Cache-control", "max-age=0, no-store, no-cache"); context.setHeader("Pragma", "no-cache"); Added: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -0,0 +1,38 @@ +/** + * + */ +package org.ajax4jsf.webapp.taglib; + +import java.io.IOException; + +import javax.el.ELException; +import javax.faces.FacesException; +import javax.faces.component.UIComponent; + +import com.sun.facelets.FaceletContext; +import com.sun.facelets.FaceletException; +import com.sun.facelets.tag.TagConfig; +import com.sun.facelets.tag.TagHandler; + +/** + * This if "empty" facelets tag handler stub. This handler used to ignore tags on a page. + * At most, it used to bypass <jsp:root> and other tags, so we can use same markup for an facelets an jsp pages. + * @author asmirnov + * + */ +public class EmptyHandler extends TagHandler { + + public EmptyHandler(TagConfig config) { + super(config); + } + + /* (non-Javadoc) + * @see com.sun.facelets.FaceletHandler#apply(com.sun.facelets.FaceletContext, javax.faces.component.UIComponent) + */ + public void apply(FaceletContext ctx, UIComponent parent) + throws IOException, FacesException, FaceletException, ELException { + this.nextHandler.apply(ctx, parent); + + } + +} Property changes on: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/fileUpload/File.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/fileUpload/File.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/fileUpload/File.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -3,6 +3,7 @@ public class File { private String Name; + private String mime; private long length; private byte[] data; public byte[] getData() { @@ -16,6 +17,21 @@ } public void setName(String name) { Name = name; + int extDot = name.lastIndexOf('.'); + if(extDot > 0){ + String extension = name.substring(extDot +1); + if("bmp".equals(extension)){ + mime="image/bmp"; + } else if("jpg".equals(extension)){ + mime="image/jpeg"; + } else if("gif".equals(extension)){ + mime="image/gif"; + } else if("png".equals(extension)){ + mime="image/png"; + } else { + mime = "image/unknown"; + } + } } public long getLength() { return length; @@ -23,4 +39,8 @@ public void setLength(long length) { this.length = length; } + + public String getMime(){ + return mime; + } } Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/examples/fileUpload.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/examples/fileUpload.xhtml 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/examples/fileUpload.xhtml 2008-05-13 22:43:48 UTC (rev 8565) @@ -36,7 +36,7 @@ var="file" rowKeyVar="row"> <rich:panel> <h:panelGrid columns="2"> - <a4j:mediaOutput element="img" mimeType="image/jpeg" + <a4j:mediaOutput element="img" mimeType="#{file.mime}" createContent="#{fileUploadBean.paint}" value="#{row}" style="width:100px; height:100px;" /> <h:panelGrid columns="2"> Added: trunk/ui/assembly/src/main/resources/META-INF/jsp.taglib.xml =================================================================== --- trunk/ui/assembly/src/main/resources/META-INF/jsp.taglib.xml (rev 0) +++ trunk/ui/assembly/src/main/resources/META-INF/jsp.taglib.xml 2008-05-13 22:43:48 UTC (rev 8565) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> + <namespace>http://java.sun.com/JSP/Page</namespace> + <tag> + <tag-name>root</tag-name> + <handler-class> + org.ajax4jsf.webapp.taglib.EmptyHandler + </handler-class> + </tag> +</facelet-taglib> \ No newline at end of file Property changes on: trunk/ui/assembly/src/main/resources/META-INF/jsp.taglib.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/DataIterator.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/DataIterator.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/DataIterator.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -22,25 +22,21 @@ @Override protected UIComponent nextColumn() { UIComponent nextColumn = null; - while (childrenIterator.hasNext()) { + while (null == nextColumn && childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); if (child.isRendered()) { if (child instanceof UIColumn || child instanceof Column) { nextColumn = child; - break; } else if (checkAjaxComponent(child)) { nextColumn = child; - break; } } } - if (null == nextColumn) { - while (facetsIterator.hasNext()) { - UIComponent child = facetsIterator.next(); - if (checkAjaxComponent(child)) { - nextColumn = child; - break; - } + while (null == nextColumn && facetsIterator.hasNext()) { + UIComponent child = facetsIterator.next(); + if (checkAjaxComponent(child)) { + nextColumn = child; + break; } } return nextColumn; Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/FixedChildrenIterator.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/FixedChildrenIterator.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/FixedChildrenIterator.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -10,29 +10,30 @@ class FixedChildrenIterator extends DataIterator { - private Iterator<UIComponent> currentColumnIterator; + private Iterator<UIComponent> currentColumnIterator; - public FixedChildrenIterator(UIComponent dataTable) { super(dataTable); } - + @Override protected UIComponent nextColumn() { UIComponent nextColumn = null; - if(null != currentColumnIterator){ + if (null != currentColumnIterator) { nextColumn = currentColumnIterator.next(); checkNextColumnChild(); } else { - while (childrenIterator.hasNext()) { + while (null == nextColumn && childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); - if ( child instanceof UIColumn || child instanceof Column ) { + if (child instanceof UIColumn || child instanceof Column) { boolean rendered = true; try { rendered = child.isRendered(); } catch (Exception e) { - // This exception can be thrown for a header/footer facets - // there column rendered attribute was binded to a row variable. + // This exception can be thrown for a header/footer + // facets + // there column rendered attribute was binded to a row + // variable. } if (rendered) { Iterator<UIComponent> iterator = getColumnChildrenIterator(child); @@ -40,23 +41,30 @@ currentColumnIterator = iterator; nextColumn = currentColumnIterator.next(); checkNextColumnChild(); - break; } } } else if (checkAjaxComponent(child)) { nextColumn = child; - break; } } } - if(null == nextColumn){ - while (facetsIterator.hasNext()) { - UIComponent child = facetsIterator.next(); - if(checkAjaxComponent(child)){ - nextColumn = child; - break; - } + if (null == nextColumn) { + nextColumn = getNextFacet(); + } + return nextColumn; + } + + /** + * @param nextColumn + * @return + */ + protected UIComponent getNextFacet() { + UIComponent nextColumn = null; + while (null == nextColumn && facetsIterator.hasNext()) { + UIComponent child = facetsIterator.next(); + if (checkAjaxComponent(child)) { + nextColumn = child; } } return nextColumn; @@ -66,17 +74,16 @@ protected boolean checkAjaxComponent(UIComponent child) { return !super.checkAjaxComponent(child); } - + @Override - protected Iterator<UIComponent> getColumnChildrenIterator( - UIComponent child) { + protected Iterator<UIComponent> getColumnChildrenIterator(UIComponent child) { return child.getFacets().values().iterator(); } - - protected void checkNextColumnChild() { - if(!currentColumnIterator.hasNext()){ - currentColumnIterator = null; - } + + protected void checkNextColumnChild() { + if (!currentColumnIterator.hasNext()) { + currentColumnIterator = null; } + } } \ No newline at end of file Added: trunk/ui/dataTable/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java (rev 0) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -0,0 +1,22 @@ +/** + * + */ +package org.richfaces.component; + +import javax.faces.component.UIComponent; + +/** + * @author asmirnov + * + */ +public class SubtableFixedChildrenIterator extends FixedChildrenIterator { + + public SubtableFixedChildrenIterator(UIComponent dataTable) { + super(dataTable); + } + + @Override + protected UIComponent getNextFacet() { + return null; + } +} Property changes on: trunk/ui/dataTable/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -26,8 +26,10 @@ import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.FacesException; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.component.AjaxSupport; import org.richfaces.model.ExtendedFilterField; import org.richfaces.model.FilterField; import org.richfaces.model.Ordering; @@ -169,4 +171,44 @@ filterValue = (String)states[1]; sortOrder = (Ordering)states[2]; } + + @Override + public void processDecodes(FacesContext context) { + for (UIComponent component : getChildren()) { + component.processDecodes(context); + } + for (UIComponent component : getFacets().values()) { + if (isAjaxComponent(component)) { + component.processDecodes(context); + } + } + decode(context); + } + + @Override + public void processValidators(FacesContext context) { + for (UIComponent component : getChildren()) { + component.processValidators(context); + } + for (UIComponent component : getFacets().values()) { + if (isAjaxComponent(component)) { + component.processValidators(context); + } + } + } + + @Override + public void processUpdates(FacesContext context) { + for (UIComponent component : getChildren()) { + component.processUpdates(context); + } + for (UIComponent component : getFacets().values()) { + if (isAjaxComponent(component)) { + component.processUpdates(context); + } + } + } + private boolean isAjaxComponent(UIComponent component) { + return component instanceof AjaxSupport; + } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java 2008-05-13 18:17:54 UTC (rev 8564) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java 2008-05-13 22:43:48 UTC (rev 8565) @@ -37,6 +37,11 @@ public static final String COMPONENT_FAMILY = "org.richfaces.SubTable"; + @Override + public Iterator<UIComponent> fixedChildren() { + return new SubtableFixedChildrenIterator(this); + } + /* (non-Javadoc) * @see org.richfaces.component.Column#isBreakBefore() */

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8564 - trunk/ui/panelmenu/src/main/config/component.

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

Author: konstantin.mishin Date: 2008-05-13 14:17:54 -0400 (Tue, 13 May 2008) New Revision: 8564 Modified: trunk/ui/panelmenu/src/main/config/component/panelMenu.xml Log: RF-3392 Modified: trunk/ui/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2008-05-13 17:10:23 UTC (rev 8563) +++ trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2008-05-13 18:17:54 UTC (rev 8564) @@ -617,7 +617,7 @@ Possible values are "ajax", "server", "none". Default value is "none". </description> - <defaultvalue><![CDATA["none"]]></defaultvalue> + <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>icon</name>

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8563 - trunk.

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

Author: maksimkaszynski Date: 2008-05-13 13:10:23 -0400 (Tue, 13 May 2008) New Revision: 8563 Modified: trunk/pom.xml Log: added more profiles Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-05-13 16:45:56 UTC (rev 8562) +++ trunk/pom.xml 2008-05-13 17:10:23 UTC (rev 8563) @@ -19,6 +19,11 @@ <artifactId>wagon-webdav</artifactId> <version>1.0-beta-2</version> </extension> + <extension> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504.jdbc3</version> + </extension>  - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - </plugin> - </plugins> </build> <modules> <module>cdk</module> <module>framework</module> <module>ui</module> <module>extensions</module> - <module>docs</module> +  <module>ui/assembly</module> <module>samples</module>  + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.1</version> + <configuration> + <configLocation>src/main/reports/exadel-checks.xml</configLocation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.3</version> + <configuration> + <rulesets> + <ruleset>src/main/reports/PMDExadelRuleSet.xml</ruleset> + </rulesets> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>dashboard-maven-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>1.2</version> + <configuration> + <xmlOutput>true</xmlOutput> + <onlyAnalyze>org.richfaces.-, org.ajax4jsf.-</onlyAnalyze> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <configuration> + <tags> + <tag>@fixme</tag> + <tag>FIXME</tag> + <tag>@todo</tag> + <tag>TODO</tag> + </tags> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> + <distributionManagement> + <site> + <url>${mangelWurzel}</url> + </site> + </distributionManagement> + </profile> </profiles> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.1</version> - <configuration> - <configLocation>src/main/reports/exadel-checks.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.3</version> - <configuration> - <rulesets> - <ruleset>src/main/reports/PMDExadelRuleSet.xml</ruleset> - </rulesets> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dashboard-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> </project> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8562 - in trunk/samples/laguna/src/main/resources: org/richfaces/laguna and 1 other directory.

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

Author: admitriev Date: 2008-05-13 12:45:56 -0400 (Tue, 13 May 2008) New Revision: 8562 Modified: trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/combobox.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inplaceselect.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inputNumberSlider.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/listShuttle.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/menuItem.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/orderingList.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/progressBar.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/suggestionbox.xcss trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss Log: Modified: trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties =================================================================== --- trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/META-INF/skins/laguna.skin.properties 2008-05-13 16:45:56 UTC (rev 8562) @@ -3,3 +3,4 @@ generalStyleSheet=resource:///META-INF/skins/laguna.xcss intShadow=#dadada +newBorder=#9CABC1 Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/calendar.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -7,7 +7,7 @@ </u:selector> <u:selector name=".rich-calendar-exterior"> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-calendar-header-optional"> @@ -29,7 +29,7 @@ </u:selector> <u:selector name=".rich-calendar-cell"> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-calendar-tool"> @@ -59,7 +59,7 @@ </u:selector> <u:selector name=".rich-calendar-days"> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-calendar-weekends"> @@ -73,10 +73,10 @@ <f:attribute name="valign" value="middle" /> <f:attribute name="gradientHeight" value="20px" /> - <f:attribute name="baseColor" skin="panelBorderColor" /> + <f:attribute name="baseColor" skin="calendarWeekBackgroundColor" /> </f:resource> </u:style> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/combobox.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/combobox.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/combobox.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -108,6 +108,9 @@ </u:selector> <u:selector name=".rich-combobox-item-selected"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> @@ -120,6 +123,9 @@ </u:selector> <u:selector name=".rich-combobox-list-decoration"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name="input.rich-combobox-button-hovered"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/dataFilterSlider.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -17,14 +17,15 @@ <u:selector name=".rich-dataFilterSlider-track"> <u:style name="border-width" value="1px" /> <u:style name="border-style" value="solid" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> - <f:attribute name="valign" value="middle" /> - - <f:attribute name="gradientHeight" value="4px" /> - <f:attribute name="baseColor" skin="headerBackgroundColor" /> + <f:attribute name="valign" value="middle " /> + <f:attribute name="gradientHeight" value="10px" /> + <f:attribute name="gradientType" value="plain" /> + <f:attribute name="baseColor" skin="generalBackgroundColor" /> + <f:attribute name="gradientColor" skin="headerBackgroundColor" /> </f:resource> </u:style> </u:selector> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/datascroller.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -10,7 +10,7 @@ <u:style name="border-color" skin="tableBorderColor" /> </u:selector> - <u:selector name=".rich-datascr-button-dsbld"> + <u:selector name=".rich-datascr-button"> <u:style name="border-color" skin="tableBorderColor" /> <u:style name="background-position" value="0% 0%" /> <u:style name="background-image"> @@ -18,12 +18,12 @@ <f:attribute name="valign" value="top" /> <f:attribute name="gradientHeight" value="16px" /> - <f:attribute name="baseColor" skin="headerGradientColor" /> + <f:attribute name="baseColor" skin="headerBackgroundColor" /> </f:resource> </u:style> </u:selector> - <u:selector name=".rich-datascr-button"> + <u:selector name=".rich-datascr-button-dsbld"> <u:style name="border-color" skin="tableBorderColor" /> <u:style name="background-position" value="0% 0%" /> <u:style name="background-image"> @@ -31,7 +31,7 @@ <f:attribute name="valign" value="top" /> <f:attribute name="gradientHeight" value="16px" /> - <f:attribute name="baseColor" skin="headerBackgroundColor" /> + <f:attribute name="baseColor" skin="headerGradientColor" /> </f:resource> </u:style> </u:selector> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inplaceselect.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inplaceselect.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inplaceselect.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -32,6 +32,7 @@ <u:selector name=".rich-inplace-select-selected-item"> <u:style name="background-position" value="0% 50%" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="color" skin="headerTextColor" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inputNumberSlider.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inputNumberSlider.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/inputNumberSlider.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -3,6 +3,17 @@ xmlns:u='http:/jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml" > + + + <u:selector name=".dr-insldr-track-decor-1"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> + </u:selector> + + <u:selector name=".dr-insldr-track-decor-2"> + </u:selector> + <u:selector name=".rich-slider"> </u:selector> @@ -10,13 +21,14 @@ </u:selector> <u:selector name=".rich-inslider-track"> - <u:style name="background-position" value="0% 50%" /> + <u:style name="background-position" value="0% 0%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> - <f:attribute name="valign" value="middle" /> - - <f:attribute name="gradientHeight" value="4px" /> - <f:attribute name="baseColor" skin="headerGradientColor" /> + <f:attribute name="valign" value="top" /> + <f:attribute name="gradientHeight" value="6px" /> + <f:attribute name="gradientType" value="plain" /> + <f:attribute name="baseColor" skin="generalBackgroundColor" /> + <f:attribute name="gradientColor" skin="headerBackgroundColor" /> </f:resource> </u:style> </u:selector> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/listShuttle.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/listShuttle.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/listShuttle.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -31,7 +31,8 @@ </u:selector> <u:selector name=".rich-list-shuttle-button-disabled"> - <u:style name="color" skin="panelBorderColor" /> + <u:style name="color" skin="newBorder" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> @@ -57,6 +58,7 @@ <u:selector name=".rich-list-shuttle-button-press"> <u:style name="background-position" value="0% 50%" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> <f:attribute name="valign" value="middle" /> @@ -83,6 +85,9 @@ </u:selector> <u:selector name=".rich-shuttle-control-disabled, .rich-shuttle-control-top, .rich-shuttle-control-bottom, .rich-shuttle-control-up, .rich-shuttle-control-down, .rich-shuttle-control-copyall, .rich-shuttle-control-copy, .rich-shuttle-control-remove, .rich-shuttle-control-removeall"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-list-shuttle-button-content img"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/menuItem.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/menuItem.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/menuItem.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -13,7 +13,7 @@ <f:attribute name="valign" value="middle" /> <f:attribute name="gradientHeight" value="20px" /> - <f:attribute name="baseColor" skin="tipBorderColor" /> + <f:attribute name="baseColor" skin="tipBackgroundColor" /> </f:resource> </u:style> </u:selector> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/orderingList.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/orderingList.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/orderingList.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -17,6 +17,7 @@ <u:selector name=".rich-ordering-list-button-disabled"> <u:style name="color" skin="panelBorderColor" /> + <u:style name="color" skin="newBorder" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> @@ -74,6 +75,9 @@ </u:selector> <u:selector name=".rich-ordering-control-disabled"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-ordering-list-button-content"> @@ -93,15 +97,27 @@ </u:selector> <u:selector name=".rich-ordering-control-top"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-ordering-control-bottom"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-ordering-control-up"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-ordering-control-down"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-ordering-list-button-valign"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -6,7 +6,7 @@ <u:selector name=".rich-panel"> <u:style name="padding" value="0px" /> <u:style name="margin-bottom" value="5px" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-panel-header"> @@ -14,7 +14,7 @@ <u:style name="border-top" value="0px" /> <u:style name="border-right" value="0px" /> <u:style name="border-left" value="0px" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 50%" /> @@ -34,6 +34,7 @@ <u:selector name=".rich-panel-body"> <u:style name="padding" value="10px 10px 10px 14px" /> <u:style name="background-position" value="0% 0%" /> + <u:style name="background-repeat" value="repeat-x" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> <f:attribute name="valign" value="top" /> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelBar.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -4,7 +4,7 @@ xmlns="http://www.w3.org/1999/xhtml" > <u:selector name=".rich-panelbar"> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="padding" value="0px" /> </u:selector> @@ -24,7 +24,7 @@ <u:selector name=".rich-panelbar-header-act"> <u:style name="padding" value="4px 4px 4px 14px" /> <u:style name="border-bottom" value="1px solid" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 0%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> @@ -39,6 +39,7 @@ <u:selector name=".rich-panelbar-content"> <u:style name="padding" value="10px 4px 4px 14px" /> <u:style name="background-position" value="0% 0%" /> + <u:style name="background-repeat" value="repeat-x" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> <f:attribute name="valign" value="top" /> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panelMenu.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -9,7 +9,7 @@ <u:selector name=".dr-pmenu-top-group-div"> <u:style name="padding" value="0px" /> <u:style name="margin-bottom" value="1px" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-pmenu-group"> @@ -28,7 +28,7 @@ <u:selector name=".rich-pmenu-item"> <u:style name="margin" value="0px" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-pmenu-selected-element"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/progressBar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/progressBar.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/progressBar.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -1,37 +1,39 @@ -<?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"> - - <u:selector name=".rich-progress-bar-uploaded"> - </u:selector> - - <u:selector name=".rich-progress-bar-shell"> - </u:selector> - - <u:selector name=".rich-progress-bar-uploaded-dig"> - </u:selector> - - <u:selector name=".rich-progress-bar-shell-dig"> - </u:selector> - - <u:selector name=".rich-progress-bar-remained"> - </u:selector> - - <u:selector name=".rich-progress-bar-completed"> - </u:selector> - - <u:selector name=".rich-progress-bar-height-dig"> - </u:selector> - - <u:selector name=".rich-progress-bar-width"> - </u:selector> - - <u:selector name=".rich-progress-bar-block"> - </u:selector> - - <u:selector name=".rich-progress-bar-padding"> - </u:selector> - +<?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"> + + <u:selector name=".rich-progress-bar-uploaded"> + </u:selector> + + <u:selector name=".rich-progress-bar-shell"> + <u:style name="border-color" skin="newBorder" /> + </u:selector> + + <u:selector name=".rich-progress-bar-uploaded-dig"> + </u:selector> + + <u:selector name=".rich-progress-bar-shell-dig"> + <u:style name="border-color" skin="newBorder" /> + </u:selector> + + <u:selector name=".rich-progress-bar-remained"> + </u:selector> + + <u:selector name=".rich-progress-bar-completed"> + </u:selector> + + <u:selector name=".rich-progress-bar-height-dig"> + </u:selector> + + <u:selector name=".rich-progress-bar-width"> + </u:selector> + + <u:selector name=".rich-progress-bar-block"> + </u:selector> + + <u:selector name=".rich-progress-bar-padding"> + </u:selector> + </f:template> \ No newline at end of file Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/simpleTogglePanel.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -6,14 +6,12 @@ <u:selector name=".rich-stglpanel" > <u:style name="padding" value="0px" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-stglpanel-header" > <u:style name="padding" value="4px 4px 4px 14px" /> <u:style name="border" value="0px" /> - <u:style name="border-bottom" value="1px solid" /> - <u:style name="border-color" skin="tableBorderColor" /> <u:style name="white-space" value="nowrap" /> <u:style name="background-position" value="0% 50%" /> @@ -34,6 +32,8 @@ <u:selector name=".rich-stglpanel-body" > <u:style name="padding" value="10px 10px 10px 14px" /> + <u:style name="border-top" value="1px solid" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 0%" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient"> Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/suggestionbox.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/suggestionbox.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/suggestionbox.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -11,9 +11,13 @@ </u:selector> <u:selector name=".rich-sb-ext-decor-2" > + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="newBorder" /> </u:selector> <u:selector name=".rich-sb-ext-decor-3" > + <u:style name="background" skin="generalBackgroundColor" /> </u:selector> <u:selector name=".rich-sb-overflow" > Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss =================================================================== --- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss 2008-05-13 15:37:12 UTC (rev 8561) +++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/toolBar.xcss 2008-05-13 16:45:56 UTC (rev 8562) @@ -7,7 +7,7 @@ <u:selector name=".rich-toolbar"> <u:style name="padding" value="0px 5px 0px 5px" /> <u:style name="height" value="0px" /> - <u:style name="border-color" skin="tableBorderColor" /> + <u:style name="border-color" skin="newBorder" /> <u:style name="background-position" value="0% 50%" /> <u:style name="background-image">

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8561 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: vmolotkov Date: 2008-05-13 11:37:12 -0400 (Tue, 13 May 2008) New Revision: 8561 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js Log: combolist positioning was corrected. Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-05-13 15:32:24 UTC (rev 8560) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-05-13 15:37:12 UTC (rev 8561) @@ -47,7 +47,7 @@ Richfaces.getDocumentHeight = function() { - var viewportheight = null; + /*var viewportheight = null; if (typeof window.innerWidth != 'undefined') { // the more standards compliant browsers (mozilla/netscape/opera/IE7) use window.innerWidth and window.innerHeight viewportheight = window.innerHeight; @@ -59,8 +59,9 @@ } else { // older versions of IE viewportheight = document.getElementsByTagName('body')[0].clientHeight; - } - return viewportheight; + }*/ + return (document.viewport.getDimensions().height + document.viewport.getScrollOffsets().top); + //return viewportheight; } Richfaces.getScrollWidth = function(elem) {

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8560 - in trunk: ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.

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

Author: pyaschenko Date: 2008-05-13 11:32:24 -0400 (Tue, 13 May 2008) New Revision: 8560 Modified: trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js Log: http://jira.jboss.com/jira/browse/RF-413 Modified: trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp 2008-05-13 15:22:28 UTC (rev 8559) +++ trunk/samples/suggestionbox-sample/src/main/webapp/pages/index.jsp 2008-05-13 15:32:24 UTC (rev 8560) @@ -41,12 +41,12 @@ <f:verbatim> </f:verbatim> <h:panelGroup> <h:inputText value="#{suggestionBox.property}" id="text"/> - <rich:suggestionbox id="suggestionBoxId" for="text" + <rich:suggestionbox id="suggestionBoxId" for="text" tokens="," rules="#{suggestionBox.rules}" suggestionAction="#{suggestionBox.autocomplete}" var="result" fetchValue="#{result.text}" first="#{suggestionBox.intFirst}" - minChars="#{suggestionBox.minchars}" + minChars="0" shadowOpacity="#{suggestionBox.shadowOpacity}" border="#{suggestionBox.border}" width="#{suggestionBox.width}" Modified: trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js =================================================================== --- trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2008-05-13 15:22:28 UTC (rev 8559) +++ trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2008-05-13 15:32:24 UTC (rev 8560) @@ -69,7 +69,7 @@ || " "; this.options.tokens = $A(options.tokens) || []; this.options.frequency = this.options.frequency || 0.4; - this.options.minChars = parseInt(this.options.minChars) || 1; + this.options.minChars = isNaN(this.options.minChars) ? 1 : parseInt(this.options.minChars); this.options.onShow = this.options.onShow || function(element, update, options) { if (!update.style.position @@ -259,6 +259,9 @@ var temp = this.update.cloneNode(true); this.update.parentNode.removeChild(this.update); this.update = temp; + this.update.component = this; + this["rich:destructor"] = "destroy"; + document.body.insertBefore(this.update, document.body.firstChild); this.initialized = true; } @@ -367,6 +370,7 @@ domEvt.screenY = event.screenY; domEvt.shiftKey = event.shiftKey; domEvt.which = event.which; + domEvt.rich = event.rich; } catch(e) { LOG.warn("Exception on clone event"); } @@ -689,7 +693,7 @@ this.changed = false; var oldValue = this.element.value; - if (this.oldValue!=oldValue) { + if ((event.rich && event.rich.isCallSuggestion) || this.oldValue!=oldValue) { this.startPosition = 0; this.endPosition = oldValue.length; if (this.options.tokens.length!=0) { @@ -704,9 +708,9 @@ if (this.options.usingSuggestObjects) this.updateItems(oldValue); } - if (this.getToken().length >= this.options.minChars) { + if ((event.rich && event.rich.ignoreMinChars) || this.getToken().length >= this.options.minChars) { LOG.debug("Call data for update choices"); - if ((event.keyCode == Event.KEY_DOWN || this.oldValue != oldValue) && oldValue.length > 0) { + if (event.keyCode == Event.KEY_DOWN || this.oldValue != oldValue) { this.startIndicator(); this.getUpdatedChoices(event); } @@ -718,6 +722,45 @@ this.observerHandle = null; }, + callSuggestion: function (ignoreMinChars) + { + if (!this.hasFocus) + { + this.element.focus(); + Richfaces.Selection.setCaretTo(this.element, this.element.value.length); + } + var domEvt = {}; + domEvt.target = this.element; + domEvt.type = "keydown"; + domEvt.altKey = false; + domEvt.clientX = 0; + domEvt.clientY = 0; + domEvt.ctrlKey = false; + domEvt.keyCode = 40; + domEvt.pageX = 0; + domEvt.pageY = 0; + domEvt.screenX = 0; + domEvt.screenY = 0; + domEvt.shiftKey = false; + domEvt.which = 40; + domEvt.rich = {"isCallSuggestion":true, "ignoreMinChars": ignoreMinChars}; + + this.onKeyDownListener(domEvt); + }, + + getSelectedItems: function() + { + var result = new Array(); + if (this.options.usingSuggestObjects) + { + for (var i=0;i<this.selectedItems.length; i++) + { + if (this.selectedItems[i].object ) result.push(this.selectedItems[i].object); + } + } + return result; + }, + updateItems:function (newValue) { this.isSelectedItemsUpdated = false; @@ -867,8 +910,16 @@ this.onsubmitFunction = new Function(onsubmit+';return true;').bind(this.element); } + this.update.component = this; + this["rich:destructor"] = "destroy"; + return this; }, + + destroy: function () + { + this.update.component = null; + }, getUpdatedChoices: function(event) { this.options.parameters[this.options.param] = this.getToken();

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8559 - trunk/test-applications/jsp/src/main/webapp/InplaceSelect.

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

Author: gmaksimenko Date: 2008-05-13 11:22:28 -0400 (Tue, 13 May 2008) New Revision: 8559 Modified: trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp Log: Erase editOnTab attribute Modified: trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp 2008-05-13 15:22:07 UTC (rev 8558) +++ trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp 2008-05-13 15:22:28 UTC (rev 8559) @@ -22,7 +22,6 @@ listWidth="#{inplaceSelect.listWidth}" listHeight="#{inplaceSelect.listHeight}" showControls="#{inplaceSelect.showControls}" - editOnTab="#{inplaceSelect.editOnTab}" openOnEdit="#{inplaceSelect.openOnEdit}" rendered="#{inplaceSelect.rendered}" immediate="#{inplaceSelect.immediate}" @@ -130,10 +129,6 @@ <h:selectBooleanCheckbox value="#{inplaceSelect.applyFromControlsOnly}" onchange="submit();"></h:selectBooleanCheckbox> - <h:outputText value="editOnTab"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceSelect.editOnTab}" - onchange="submit();"></h:selectBooleanCheckbox> - <h:outputText value="openOnEdit"></h:outputText> <h:selectBooleanCheckbox value="#{inplaceSelect.openOnEdit}" onchange="submit();"></h:selectBooleanCheckbox>

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8558 - trunk/test-applications/jsp/src/main/java/inplaceSelect.

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

Author: gmaksimenko Date: 2008-05-13 11:22:07 -0400 (Tue, 13 May 2008) New Revision: 8558 Modified: trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java Log: Erase editOnTab attribute Modified: trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java =================================================================== --- trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-05-13 15:21:52 UTC (rev 8557) +++ trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-05-13 15:22:07 UTC (rev 8558) @@ -11,7 +11,6 @@ private String controlsVerticalPosition; private String defaultLabel; private String editEvent; - private boolean editOnTab; private boolean immediate; private String listHeight; private String listWidth; @@ -46,7 +45,6 @@ listHeight = "150"; showControls = false; applyFromControlsOnly = false; - editOnTab = false; openOnEdit = true; rendered = true; immediate = false; @@ -159,10 +157,6 @@ return applyFromControlsOnly; } - public boolean isEditOnTab() { - return editOnTab; - } - public boolean isImmediate() { return immediate; } @@ -199,10 +193,6 @@ this.editEvent = editEvent; } - public void setEditOnTab(boolean editOnTab) { - this.editOnTab = editOnTab; - } - public void setImmediate(boolean immediate) { this.immediate = immediate; }

16 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r8557 - trunk/test-applications/facelets/src/main/webapp/InplaceSelect.

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

Author: gmaksimenko Date: 2008-05-13 11:21:52 -0400 (Tue, 13 May 2008) New Revision: 8557 Modified: trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml Log: Erase editOnTab attribute Modified: trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml 2008-05-13 15:21:22 UTC (rev 8556) +++ trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml 2008-05-13 15:21:52 UTC (rev 8557) @@ -25,7 +25,6 @@ binding="#{inplaceSelect.myInplaceSelect}" required="#{inplaceSelect.required}" requiredMessage="#{inplaceSelect.requiredMessage}" - value="qwer" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" @@ -125,10 +124,6 @@ <h:selectBooleanCheckbox value="#{inplaceSelect.applyFromControlsOnly}" onchange="submit();"></h:selectBooleanCheckbox> - <h:outputText value="editOnTab"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceSelect.editOnTab}" - onchange="submit();"></h:selectBooleanCheckbox> - <h:outputText value="openOnEdit"></h:outputText> <h:selectBooleanCheckbox value="#{inplaceSelect.openOnEdit}" onchange="submit();"></h:selectBooleanCheckbox>

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits May 2008