richfaces-svn-commits March 2008

richfaces-svn-commits@lists.jboss.org

1 participants
1040 discussions

JBoss Rich Faces SVN: r6558 - trunk/test-applications/jsp/src/main/webapp/FileUpload.

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

Author: ayanul Date: 2008-03-05 07:47:06 -0500 (Wed, 05 Mar 2008) New Revision: 6558 Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp Log: +add properties Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-05 12:40:21 UTC (rev 6557) +++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-05 12:47:06 UTC (rev 6558) @@ -16,4 +16,30 @@ <h:outputText value="{_KB}KB from {KB}KB uploaded :[ {mm}:{ss} ]"></h:outputText> </f:facet> </rich:fileUpload> + +<h:panelGrid columns="2"> + <h:outputText value="listHeight"></h:outputText> + <h:inputText value="#{fileUpload.listHeight}" onchange="submit();"></h:inputText> + + <h:outputText value="listWidth"></h:outputText> + <h:inputText value="#{fileUpload.listWidth}" onchange="submit();"></h:inputText> + + <h:outputText value="maxFilesQuantity"></h:outputText> + <h:inputText value="#{fileUpload.maxFilesQuantity}" onchange="submit();"></h:inputText> + + <h:outputText value="autoclear"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.autoclear}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="disabled"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="required"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.required}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage"></h:outputText> + <h:inputText value="#{fileUpload.requiredMessage}" onchange="submit();"></h:inputText> +</h:panelGrid> </f:subview> \ No newline at end of file

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6557 - trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images.

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

Author: dsvyatobatsko Date: 2008-03-05 07:40:21 -0500 (Wed, 05 Mar 2008) New Revision: 6557 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java Log: just formatted Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-03-05 12:20:31 UTC (rev 6556) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-03-05 12:40:21 UTC (rev 6557) @@ -42,172 +42,170 @@ import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; -import com.opensymphony.oscache.util.StringUtil; - /** * Created 23.02.2008 + * * @author Nick Belaevski * @since 3.2 */ public class BaseControlBackgroundImage extends Java2Dresource { - private static final Dimension DIMENSION = new Dimension(1, 1); - - private String baseColor; - private String gradientColor; - private int width; - - public BaseControlBackgroundImage(String baseColor, String gradientColor, int width) { - super(); - - this.baseColor = baseColor; - this.gradientColor = gradientColor; - this.width = width; + private static final Dimension DIMENSION = new Dimension(1, 1); - setRenderer(new GifRenderer()); - setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); - } + private String baseColor; - public Dimension getDimensions(FacesContext facesContext, Object data) { - Data d = (Data) data; - if (d != null) { - return new Dimension(width, d.height.intValue()); - } else { - return DIMENSION; - } - } + private String gradientColor; - protected Dimension getDimensions(ResourceContext resourceContext) { - return getDimensions(null, restoreData(resourceContext)); - } + private int width; - protected void paint(ResourceContext resourceContext, Graphics2D g2d) { - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - Data dataToStore = (Data) restoreData(resourceContext); - if (dataToStore != null && dataToStore.headerBackgroundColor!=null && dataToStore.headerGradientColor!=null) { - Color baseColor = new Color(dataToStore.headerBackgroundColor.intValue()); - Dimension dim = getDimensions(resourceContext); - Rectangle2D rect = - new Rectangle2D.Float( - 0, - 0, - dim.width, - dim.height); - Color alternateColor = new Color(dataToStore.headerGradientColor.intValue()); + public BaseControlBackgroundImage(String baseColor, String gradientColor, int width) { + super(); + + this.baseColor = baseColor; + this.gradientColor = gradientColor; + this.width = width; + + setRenderer(new GifRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); + } + + public Dimension getDimensions(FacesContext facesContext, Object data) { + Data d = (Data) data; + if (d != null) { + return new Dimension(width, d.height.intValue()); + } else { + return DIMENSION; + } + } + + protected Dimension getDimensions(ResourceContext resourceContext) { + return getDimensions(null, restoreData(resourceContext)); + } + + protected void paint(ResourceContext resourceContext, Graphics2D g2d) { + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + Data dataToStore = (Data) restoreData(resourceContext); + if (dataToStore != null && dataToStore.headerBackgroundColor != null && dataToStore.headerGradientColor != null) { + Color baseColor = new Color(dataToStore.headerBackgroundColor.intValue()); + Dimension dim = getDimensions(resourceContext); + Rectangle2D rect = new Rectangle2D.Float(0, 0, dim.width, dim.height); + Color alternateColor = new Color(dataToStore.headerGradientColor.intValue()); GradientPaint gragient = new GradientPaint(0, 0, baseColor, 0, dim.height, alternateColor); - g2d.setPaint(gragient); - g2d.fill(rect); - } - } + g2d.setPaint(gragient); + g2d.fill(rect); + } + } - protected final Integer getHeight(FacesContext context, String heightParamName) { - SkinFactory skinFactory = SkinFactory.getInstance(); - Skin skin = skinFactory.getSkin(context); + protected final Integer getHeight(FacesContext context, String heightParamName) { + SkinFactory skinFactory = SkinFactory.getInstance(); + Skin skin = skinFactory.getSkin(context); - String height = (String) skin.getParameter(context, heightParamName); - if (height == null || height.length() == 0) { - skin = skinFactory.getDefaultSkin(context); - height = (String) skin.getParameter(context, heightParamName); - } + String height = (String) skin.getParameter(context, heightParamName); + if (height == null || height.length() == 0) { + skin = skinFactory.getDefaultSkin(context); + height = (String) skin.getParameter(context, heightParamName); + } - if (height != null && height.length() != 0) { - return Integer.valueOf(HtmlDimensions.decode(height).intValue()); - } else { - return Integer.valueOf(16); - } + if (height != null && height.length() != 0) { + return Integer.valueOf(HtmlDimensions.decode(height).intValue()); + } else { + return Integer.valueOf(16); } + } - protected Integer getHeight(FacesContext context) { - return getHeight(context, Skin.generalSizeFont); - } + protected Integer getHeight(FacesContext context) { + return getHeight(context, Skin.generalSizeFont); + } - protected Object deserializeData(byte[] objectArray) { - Data data = new Data(); - if (objectArray != null) { - Zipper2 zipper2 = new Zipper2(objectArray); - data.headerBackgroundColor = new Integer(zipper2.nextIntColor()); - data.headerGradientColor = new Integer(zipper2.nextIntColor()); - data.height = new Integer(zipper2.nextInt()); - } + protected Object deserializeData(byte[] objectArray) { + Data data = new Data(); + if (objectArray != null) { + Zipper2 zipper2 = new Zipper2(objectArray); + data.headerBackgroundColor = new Integer(zipper2.nextIntColor()); + data.headerGradientColor = new Integer(zipper2.nextIntColor()); + data.height = new Integer(zipper2.nextInt()); + } - return data; - } + return data; + } - protected Object getDataToStore(FacesContext context, Object data) { - Integer h = getHeight(context); - if (baseColor == null) { - return new Data(context, h).toByteArray(); - } else { - return new Data(context, baseColor, gradientColor, h).toByteArray(); - } - } + protected Object getDataToStore(FacesContext context, Object data) { + Integer h = getHeight(context); + if (baseColor == null) { + return new Data(context, h).toByteArray(); + } else { + return new Data(context, baseColor, gradientColor, h).toByteArray(); + } + } - public boolean isCacheable() { - return true; - } - - protected static class Data implements Serializable { - public Data() { - } + public boolean isCacheable() { + return true; + } - protected Data(FacesContext context, Integer height) { - this(context, Skin.headerBackgroundColor, "headerGradientColor", height); - } + protected static class Data implements Serializable { + public Data() { + } - protected Data(FacesContext context, String baseColor, String gradientColor, Integer height) { - this.headerBackgroundColor = getColorValueParameter(context, baseColor, false); - this.headerGradientColor = getColorValueParameter(context, gradientColor, false); - this.height = height; - - if (!(this.headerBackgroundColor == null && this.headerGradientColor == null)) { - if (this.headerBackgroundColor == null) { - this.headerBackgroundColor = getColorValueParameter(context, baseColor, true); - } - - if (this.headerGradientColor == null) { - this.headerGradientColor = getColorValueParameter(context, gradientColor, true); - } - } - } + protected Data(FacesContext context, Integer height) { + this(context, Skin.headerBackgroundColor, "headerGradientColor", height); + } - private Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) { - Skin skin; - if (useDefault) { - skin = SkinFactory.getInstance().getDefaultSkin(context); - } else { - skin = SkinFactory.getInstance().getSkin(context); - } - - String tmp = (String) skin.getParameter(context,name); - if (tmp!=null && tmp.length() != 0) { - return new Integer(HtmlColor.decode(tmp).getRGB()); - } else { - return null; - } - } + protected Data(FacesContext context, String baseColor, String gradientColor, Integer height) { + this.headerBackgroundColor = getColorValueParameter(context, baseColor, false); + this.headerGradientColor = getColorValueParameter(context, gradientColor, false); + this.height = height; - /** - * - */ - private static final long serialVersionUID = 1732700513743861250L; - protected Integer headerBackgroundColor; - protected Integer headerGradientColor; - protected Integer height; - public byte[] toByteArray() { - if (headerBackgroundColor != null && headerGradientColor != null) { - byte[] ret = new byte[10]; - new Zipper2(ret). - addColor(headerBackgroundColor.intValue()). - addColor(headerGradientColor.intValue()). - addInt(height); - return ret; - } else { - return null; - } - } - } + if (!(this.headerBackgroundColor == null && this.headerGradientColor == null)) { + if (this.headerBackgroundColor == null) { + this.headerBackgroundColor = getColorValueParameter(context, baseColor, true); + } + if (this.headerGradientColor == null) { + this.headerGradientColor = getColorValueParameter(context, gradientColor, true); + } + } + } + + private Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) { + Skin skin; + if (useDefault) { + skin = SkinFactory.getInstance().getDefaultSkin(context); + } else { + skin = SkinFactory.getInstance().getSkin(context); + } + + String tmp = (String) skin.getParameter(context, name); + if (tmp != null && tmp.length() != 0) { + return new Integer(HtmlColor.decode(tmp).getRGB()); + } else { + return null; + } + } + + /** + * + */ + private static final long serialVersionUID = 1732700513743861250L; + + protected Integer headerBackgroundColor; + + protected Integer headerGradientColor; + + protected Integer height; + + public byte[] toByteArray() { + if (headerBackgroundColor != null && headerGradientColor != null) { + byte[] ret = new byte[10]; + new Zipper2(ret).addColor(headerBackgroundColor.intValue()).addColor(headerGradientColor.intValue()) + .addInt(height); + return ret; + } else { + return null; + } + } + } + }

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6556 - in trunk/test-applications/jsp/src/main: java/pickList and 3 other directories.

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

Author: ayanul Date: 2008-03-05 07:20:31 -0500 (Wed, 05 Mar 2008) New Revision: 6556 Modified: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java trunk/test-applications/jsp/src/main/java/pickList/PickList.java trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml Log: +fix FileUpload Modified: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java =================================================================== --- trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-05 11:46:13 UTC (rev 6555) +++ trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-05 12:20:31 UTC (rev 6556) @@ -8,6 +8,7 @@ import java.util.Map; import org.richfaces.event.UploadEvent; +import org.richfaces.model.UploadItem; public class FileUpload { private boolean disabled; @@ -32,11 +33,12 @@ } public void fileUploadListener(UploadEvent event) throws IOException{ - if (event.isFile()) { - File file = event.getFile(); + UploadItem upload = event.getUploadItem(); + if (upload.isFile()) { + File file = upload.getFile(); } else { ByteArrayOutputStream b = new ByteArrayOutputStream(); - b.write(event.getData()); + b.write(upload.getData()); } } Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java =================================================================== --- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-03-05 11:46:13 UTC (rev 6555) +++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-03-05 12:20:31 UTC (rev 6556) @@ -7,6 +7,8 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; +import util.data.Data; + public class PickList { public String copyAllControlLabel; public String copyControlLabel; @@ -80,7 +82,7 @@ this.requiredMessage = "requiredMessage"; data = new ArrayList<SelectItem>(); for (int i = 0; i < 10; i++) - data.add(new SelectItem("selectItems " + i)); + data.add(new SelectItem(new Data("selectItems " + i))); } Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-03-05 11:46:13 UTC (rev 6555) +++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-03-05 12:20:31 UTC (rev 6556) @@ -24,7 +24,7 @@ rendered="#{inplaceInput.rendered}" immediate="#{inplaceInput.immediate}"> </rich:inplaceInput> - are easy to exploit. <h:commandButton value="ok"></h:commandButton> + are easy to exploit. <h:panelGrid columns="2"> <a4j:commandButton value="refresh" reRender="inplaceInputValueCLID"></a4j:commandButton> <h:outputText id="inplaceInputValueCLID" Modified: trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp 2008-03-05 11:46:13 UTC (rev 6555) +++ trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelect.jsp 2008-03-05 12:20:31 UTC (rev 6556) @@ -103,5 +103,5 @@ <h:outputText value="openOnEdit"></h:outputText> <h:selectBooleanCheckbox value="#{inplaceSelect.openOnEdit}" onchange="submit();"></h:selectBooleanCheckbox> - </h:panelGrid><h:commandButton value="ok"></h:commandButton> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-05 11:46:13 UTC (rev 6555) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-05 12:20:31 UTC (rev 6556) @@ -18,6 +18,10 @@ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> + <param-value>enable</param-value> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name>

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6555 - in trunk/ui/core/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.

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

Author: dsvyatobatsko Date: 2008-03-05 06:46:13 -0500 (Wed, 05 Mar 2008) New Revision: 6555 Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss Log: some fixes on a hot scent Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class ButtonGradientImage extends BaseControlBackgroundImage { - public ButtonGradientImage(String baseColor, String gradientColor, int width) { + public ButtonGradientImage() { super(Skin.additionalBackgroundColor, "trimColor", 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class ButtonInverseGradientImage extends BaseControlBackgroundImage { - public ButtonInverseGradientImage(String baseColor, String gradientColor, int width) { + public ButtonInverseGradientImage() { super("trimColor", Skin.additionalBackgroundColor, 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class HeaderGradientImage extends BaseControlBackgroundImage { - public HeaderGradientImage(String baseColor, String gradientColor, int width) { + public HeaderGradientImage() { super(Skin.headerGradientColor, Skin.headerBackgroundColor, 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class HeaderInverseGradientImage extends BaseControlBackgroundImage { - public HeaderInverseGradientImage(String baseColor, String gradientColor, int width) { + public HeaderInverseGradientImage() { super(Skin.headerBackgroundColor, Skin.headerGradientColor, 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class InputGradientImage extends BaseControlBackgroundImage { - public InputGradientImage(String baseColor, String gradientColor, int width) { + public InputGradientImage() { super(Skin.additionalBackgroundColor, Skin.controlBackgroundColor, 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class MenuGradientImage extends BaseControlBackgroundImage { - public MenuGradientImage(String baseColor, String gradientColor, int width) { + public MenuGradientImage() { super("tabBackgroundColor", Skin.additionalBackgroundColor, 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class MenuInverseGradientImage extends BaseControlBackgroundImage { - public MenuInverseGradientImage(String baseColor, String gradientColor, int width) { + public MenuInverseGradientImage() { super(Skin.additionalBackgroundColor, "tabBackgroundColor", 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class TabGradientImage extends BaseControlBackgroundImage { - public TabGradientImage(String baseColor, String gradientColor, int width) { + public TabGradientImage() { super("tabBackgroundColor", Skin.generalBackgroundColor, 8); } Modified: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java 2008-03-05 11:46:13 UTC (rev 6555) @@ -26,7 +26,7 @@ public class TabInverseGradientImage extends BaseControlBackgroundImage { - public TabInverseGradientImage(String baseColor, String gradientColor, int width) { + public TabInverseGradientImage() { super(Skin.generalBackgroundColor, "tabBackgroundColor", 8); } Modified: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss =================================================================== --- trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2008-03-05 09:16:21 UTC (rev 6554) +++ trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2008-03-05 11:46:13 UTC (rev 6555) @@ -98,7 +98,7 @@ </u:selector> <u:selector name=".rich-field-error"> - <u:style name="background-color" skin="warningBackgroundColor" /; + <u:style name="background-color" skin="warningBackgroundColor" />; <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.InputErrorIcon"/> </u:style>

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6554 - in trunk/test-applications/facelets/src/main: java/contextMenu and 70 other directories.

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

Author: ayanul Date: 2008-03-05 04:16:21 -0500 (Wed, 05 Mar 2008) New Revision: 6554 Added: trunk/test-applications/facelets/src/main/java/fileUpload/ trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java trunk/test-applications/facelets/src/main/java/inplaceInput/ trunk/test-applications/facelets/src/main/java/inplaceInput/InplaceInput.java trunk/test-applications/facelets/src/main/java/inplaceSelect/ trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java trunk/test-applications/facelets/src/main/java/rich/Options.java trunk/test-applications/facelets/src/main/java/sortingAndFiltering/ trunk/test-applications/facelets/src/main/java/sortingAndFiltering/SortingAndFiltering.java trunk/test-applications/facelets/src/main/java/util/style/ trunk/test-applications/facelets/src/main/java/util/style/Style.java trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarDefault.xhtml trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxDefault.xhtml trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionDefault.xhtml trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListDefault.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerDefault.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableDefault.xhtml trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuDefault.xhtml trunk/test-applications/facelets/src/main/webapp/FileUpload/ trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml trunk/test-applications/facelets/src/main/webapp/Gmap/GmapDefault.xhtml trunk/test-applications/facelets/src/main/webapp/InplaceInput/ trunk/test-applications/facelets/src/main/webapp/InplaceInput/InplaceInput.xhtml trunk/test-applications/facelets/src/main/webapp/InplaceSelect/ trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderDefault.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerDefault.xhtml trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleDefault.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelDefault.xhtml trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListDefault.xhtml trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DDefault.xhtml trunk/test-applications/facelets/src/main/webapp/Panel/PanelDefault.xhtml trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarDefault.xhtml trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuDefault.xhtml trunk/test-applications/facelets/src/main/webapp/PickList/PickListDefault.xhtml trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBarDefault.xhtml trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableDefault.xhtml trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorDefault.xhtml trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.xhtml trunk/test-applications/facelets/src/main/webapp/SortingAndFiltering/ trunk/test-applications/facelets/src/main/webapp/SortingAndFiltering/SortingAndFiltering.xhtml trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerDefault.xhtml trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxDefault.xhtml trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelDefault.xhtml trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelDefault.xhtml trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarDefault.xhtml trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipDefault.xhtml trunk/test-applications/facelets/src/main/webapp/Tree/TreeDefault.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthDefault.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-FileUpload.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Options.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Style.xml trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankDefault.xhtml Modified: trunk/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java trunk/test-applications/facelets/src/main/java/dnd/DndBean.java trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java trunk/test-applications/facelets/src/main/java/pickList/PickList.java trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java trunk/test-applications/facelets/src/main/java/rich/RichBean.java trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java trunk/test-applications/facelets/src/main/java/util/data/Data.java trunk/test-applications/facelets/src/main/java/util/event/Event.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml trunk/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml trunk/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml trunk/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml Log: +update +add inplaceInput +add inplaceSelect +add fileUpload Modified: trunk/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java =================================================================== --- trunk/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -5,6 +5,8 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; +import rich.RichBean; + public class ContextMenu { private String info; private String inputText; Modified: trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -14,6 +14,7 @@ private String type; private String dir; private int mSize; + private ArrayList defaultArr; public String getDir() { return dir; @@ -37,6 +38,7 @@ public DataOrderedList(){ arr = new ArrayList<Data>(); + defaultArr = new ArrayList<String>(); dir ="LTR"; rows = 20; rows = 0; @@ -46,6 +48,8 @@ type = "1"; for(int i = 1; i < Data.cityAfrica.length; i++) arr.add(new Data(Data.cityAfrica[i])); + for(int i = 0; i < 5; i++) + defaultArr.add("text_" + i); } public int getFirst() { @@ -91,5 +95,13 @@ public ArrayList<Data> getArr() { return arr; } + + public ArrayList getDefaultArr() { + return defaultArr; + } + + public void setDefaultArr(ArrayList defaultArr) { + this.defaultArr = defaultArr; + } } \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -2,6 +2,8 @@ import java.util.ArrayList; +import javax.faces.event.ActionEvent; + import org.richfaces.event.DataScrollerEvent; public class DataScroller { @@ -15,7 +17,27 @@ public boolean limitToList; public boolean renderTable; public int maxPages; - + private String action; + private String actionListener; + + public String act() { + action = "action work!"; + return null; + } + + public String actListener(ActionEvent e) { + actionListener = "actionListener work!"; + return null; + } + + public String getAction() { + return action; + } + + public String getActionListener() { + return actionListener; + } + public boolean isRenderTable() { return renderTable; } @@ -41,6 +63,8 @@ } public DataScroller() { + action = "---"; + actionListener = "---"; fastControls = "auto"; render = true; renderIfSinglePage = true; Modified: trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java =================================================================== --- trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -2,6 +2,8 @@ import java.awt.Event; +import javax.faces.event.ActionEvent; + public class DDMenu { private int hideDelay; @@ -17,6 +19,8 @@ private String iconFolder = null; private String selectMenu; private String mode; + private String action; + private String actionListener; private boolean rendered; private boolean disabled; private boolean disabledDDM; @@ -40,8 +44,22 @@ disabled = false; disabledDDM = false; check = false; + action = "---"; + actionListener = "---"; } + public void act() { + action = "action work!"; + } + + public void actListener(ActionEvent e) { + actionListener = "actionListener work!"; + } + + public String getActionListener() { + return actionListener; + } + public String getIcon() { return icon; } @@ -258,4 +276,8 @@ public void setDisabledDDM(boolean disabledDDM) { this.disabledDDM = disabledDDM; } + + public String getAction() { + return action; + } } Modified: trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -30,10 +30,14 @@ */ public class DemoSliderBean { private boolean rendered; - DemoInventoryList demoInventoryList; + private DemoInventoryList demoInventoryList; + private String action; + private String actionListener; public DemoSliderBean() { rendered = true; + action = "---"; + actionListener = "---"; } public void setDemoInventoryList(DemoInventoryList demoInventoryList) { @@ -68,4 +72,22 @@ public void setRendered(boolean rendered) { this.rendered = rendered; } + + public String act() { + action = "action work!"; + return null; + } + + public String actListener() { + actionListener = "actionListener work!"; + return null; + } + + public String getAction() { + return action; + } + + public String getActionListener() { + return actionListener; + } } \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/java/dnd/DndBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dnd/DndBean.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/dnd/DndBean.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; +import javax.faces.event.ActionEvent; + import org.richfaces.event.DragEvent; import org.richfaces.event.DropEvent; @@ -14,14 +16,33 @@ private List types = new ArrayList(); private Object dragValue; private Object testParam; + private String actionDrop; + private String actionListenerDrop; + private String actionDrag; + private String actionListenerDrag; public DndBean() { super(); types.add("One"); types.add("Two"); + + actionDrag = "---"; + actionListenerDrag = "---"; + actionDrop = "---"; + actionListenerDrop = "---"; } + + public String actListenerDrag(ActionEvent e) { + actionListenerDrag = "actionListenerDrag work!"; + return null; + } + public String actListenerDrop(ActionEvent e) { + actionListenerDrop = "actionListenerDrop work!"; + return null; + } + public void processDrop(DropEvent event) { System.out.println("Bean.processDrop()" + event.getDropValue()); this.dragValue = event.getDragValue(); @@ -37,11 +58,13 @@ public String dragAction() { System.out.println("Bean.dragAction()"); + actionDrag = "actionDtag work!"; return null; } public String dropAction() { System.out.println("Bean.dropAction()"); + actionDrop = "actionDrop work!"; return null; } @@ -57,4 +80,36 @@ this.testParam = testParam; System.out.println("Bean.setTestParam()" + testParam); } + + public String getActionDrop() { + return actionDrop; + } + + public void setActionDrop(String actionDrop) { + this.actionDrop = actionDrop; + } + + public String getActionListenerDrop() { + return actionListenerDrop; + } + + public void setActionListenerDrop(String actionListenerDrop) { + this.actionListenerDrop = actionListenerDrop; + } + + public String getActionDrag() { + return actionDrag; + } + + public void setActionDrag(String actionDrag) { + this.actionDrag = actionDrag; + } + + public String getActionListenerDrag() { + return actionListenerDrag; + } + + public void setActionListenerDrag(String actionListenerDrag) { + this.actionListenerDrag = actionListenerDrag; + } } \ No newline at end of file Added: trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java =================================================================== --- trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,114 @@ +package fileUpload; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +import org.richfaces.event.UploadEvent; +import org.richfaces.model.UploadItem; + +public class FileUpload { + private boolean disabled; + private boolean autoclear; + private boolean rendered; + private boolean required; + private String requiredMessage; + private String listHeight; + private String listWidth; + private Map<String, InputStream> data = new HashMap<String, InputStream>(); + private Integer maxFilesQuantity; + + public FileUpload() { + disabled = false; + autoclear = false; + rendered = true; + required = false; + requiredMessage = "requiredMessage"; + listHeight = "200px"; + listWidth = "150px"; + maxFilesQuantity = 3; + } + + public void fileUploadListener(UploadEvent event) throws IOException{ + UploadItem upload = event.getUploadItem(); + if (upload.isFile()) { + File file = upload.getFile(); + } else { + ByteArrayOutputStream b = new ByteArrayOutputStream(); + b.write(upload.getData()); + } + + } + + public boolean isDisabled() { + return disabled; + } + + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + + public boolean isAutoclear() { + return autoclear; + } + + public void setAutoclear(boolean autoclear) { + this.autoclear = autoclear; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public Integer getMaxFilesQuantity() { + return maxFilesQuantity; + } + + public void setMaxFilesQuantity(Integer maxFilesQuantity) { + this.maxFilesQuantity = maxFilesQuantity; + } + + public String getListHeight() { + return listHeight; + } + + public void setListHeight(String listHeight) { + this.listHeight = listHeight; + } + + public String getListWidth() { + return listWidth; + } + + public void setListWidth(String listWidth) { + this.listWidth = listWidth; + } + + public void setData(Map<String, InputStream> data) { + this.data = data; + } + +} Added: trunk/test-applications/facelets/src/main/java/inplaceInput/InplaceInput.java =================================================================== --- trunk/test-applications/facelets/src/main/java/inplaceInput/InplaceInput.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/inplaceInput/InplaceInput.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,151 @@ +package inplaceInput; + +import javax.faces.event.ValueChangeEvent; + +public class InplaceInput { + private String inputMaxLength; + private String inputWidth; + private String maxInputWidth; + private String minInputWidth; + private boolean required; + private String requiredMessage; + private int tabindex; + private String editEvent; + private String defaultLabel; + private String controlsVerticalPosition; + private String controlsHorizontalPosition; + private String value; + private boolean selectOnEdit; + private boolean showControls; + private boolean rendered; + private boolean immediate; + private String valueCL; + + public InplaceInput() { + inputMaxLength = "200"; + inputWidth = "150"; + maxInputWidth = "250"; + minInputWidth = "100"; + required = false; + requiredMessage = "requiredMessage"; + tabindex = 1; + editEvent = "click"; + defaultLabel = "defaultLabel"; + controlsVerticalPosition = "top"; + controlsHorizontalPosition = "left"; + value = "errors"; + selectOnEdit = false; + showControls = false; + rendered = true; + immediate = false; + valueCL = "---"; + } + + public void valueChangeListener(ValueChangeEvent event){ + valueCL = "valueChangeListener work!"; + } + + public String getInputMaxLength() { + return inputMaxLength; + } + public void setInputMaxLength(String inputMaxLength) { + this.inputMaxLength = inputMaxLength; + } + public String getInputWidth() { + return inputWidth; + } + public void setInputWidth(String inputWidth) { + this.inputWidth = inputWidth; + } + public String getMaxInputWidth() { + return maxInputWidth; + } + public void setMaxInputWidth(String maxInputWidth) { + this.maxInputWidth = maxInputWidth; + } + public String getMinInputWidth() { + return minInputWidth; + } + public void setMinInputWidth(String minInputWidth) { + this.minInputWidth = minInputWidth; + } + public boolean isRequired() { + return required; + } + public void setRequired(boolean required) { + this.required = required; + } + public String getRequiredMessage() { + return requiredMessage; + } + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + public int getTabindex() { + return tabindex; + } + public void setTabindex(int tabindex) { + this.tabindex = tabindex; + } + public String getEditEvent() { + return editEvent; + } + public void setEditEvent(String editEvent) { + this.editEvent = editEvent; + } + public String getDefaultLabel() { + return defaultLabel; + } + public void setDefaultLabel(String defaultLabel) { + this.defaultLabel = defaultLabel; + } + public String getControlsVerticalPosition() { + return controlsVerticalPosition; + } + public void setControlsVerticalPosition(String controlsVerticalPosition) { + this.controlsVerticalPosition = controlsVerticalPosition; + } + public String getControlsHorizontalPosition() { + return controlsHorizontalPosition; + } + public void setControlsHorizontalPosition(String controlsHorizontalPosition) { + this.controlsHorizontalPosition = controlsHorizontalPosition; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + public boolean isSelectOnEdit() { + return selectOnEdit; + } + public void setSelectOnEdit(boolean selectOnEdit) { + this.selectOnEdit = selectOnEdit; + } + public boolean isShowControls() { + return showControls; + } + public void setShowControls(boolean showControls) { + this.showControls = showControls; + } + public boolean isRendered() { + return rendered; + } + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + public boolean isImmediate() { + return immediate; + } + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + public String getValueCL() { + return valueCL; + } + public void setValueCL(String valueCL) { + this.valueCL = valueCL; + } + +} Added: trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java =================================================================== --- trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/inplaceSelect/InplaceSelect.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,204 @@ +package inplaceSelect; + +import javax.faces.event.ValueChangeEvent; + +public class InplaceSelect { + private boolean applyFromControlsOnly; + private String controlsHorizontalPosition; + private String controlsVerticalPosition; + private String defaultLabel; + private String editEvent; + private boolean editOnTab; + private boolean immediate; + private String listHeight; + private String listWidth; + private String maxSelectWidth; + private String minSelectWidth; + private boolean openOnEdit; + private boolean rendered; + private boolean selectOnEdit; + private String selectWidth; + private boolean showControls; + private int tabindex; + private Object value; + private String valueCL; + + public InplaceSelect() { + valueCL = "---"; + editEvent = "click"; + maxSelectWidth = "150"; + minSelectWidth = "85"; + selectWidth = "170"; + defaultLabel = "defaultLabel"; + controlsVerticalPosition = "center"; + controlsHorizontalPosition = "left"; + value = "errors"; + listWidth = "200"; + listHeight = "150"; + selectOnEdit = false; + showControls = false; + applyFromControlsOnly = false; + editOnTab = false; + openOnEdit = false; + rendered = true; + immediate = false; + } + + public void valueChangeListener(ValueChangeEvent event){ + valueCL = "valueChangeListener work!"; + } + + public String getControlsHorizontalPosition() { + return controlsHorizontalPosition; + } + + public String getControlsVerticalPosition() { + return controlsVerticalPosition; + } + + public int getTabindex() { + return tabindex; + } + + public void setTabindex(int tabindex) { + this.tabindex = tabindex; + } + + public String getValueCL() { + return valueCL; + } + + public void setValueCL(String valueCL) { + this.valueCL = valueCL; + } + + public String getDefaultLabel() { + return defaultLabel; + } + + public String getEditEvent() { + return editEvent; + } + + public String getListHeight() { + return listHeight; + } + + public String getListWidth() { + return listWidth; + } + + public String getMaxSelectWidth() { + return maxSelectWidth; + } + + public String getMinSelectWidth() { + return minSelectWidth; + } + + public String getSelectWidth() { + return selectWidth; + } + + public Object getValue() { + return value; + } + + public boolean isApplyFromControlsOnly() { + return applyFromControlsOnly; + } + + public boolean isEditOnTab() { + return editOnTab; + } + + public boolean isImmediate() { + return immediate; + } + + public boolean isOpenOnEdit() { + return openOnEdit; + } + + public boolean isRendered() { + return rendered; + } + + public boolean isSelectOnEdit() { + return selectOnEdit; + } + + public boolean isShowControls() { + return showControls; + } + + public void setApplyFromControlsOnly(boolean applyFromControlsOnly) { + this.applyFromControlsOnly = applyFromControlsOnly; + } + + public void setControlsHorizontalPosition(String controlsHorizontalPosition) { + this.controlsHorizontalPosition = controlsHorizontalPosition; + } + + public void setControlsVerticalPosition(String controlsVerticalPosition) { + this.controlsVerticalPosition = controlsVerticalPosition; + } + + public void setDefaultLabel(String defaultLabel) { + this.defaultLabel = defaultLabel; + } + + public void setEditEvent(String editEvent) { + this.editEvent = editEvent; + } + + public void setEditOnTab(boolean editOnTab) { + this.editOnTab = editOnTab; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public void setListHeight(String listHeight) { + this.listHeight = listHeight; + } + + public void setListWidth(String listWidth) { + this.listWidth = listWidth; + } + + public void setMaxSelectWidth(String maxSelectWidth) { + this.maxSelectWidth = maxSelectWidth; + } + + public void setMinSelectWidth(String minSelectWidth) { + this.minSelectWidth = minSelectWidth; + } + + public void setOpenOnEdit(boolean openOnEdit) { + this.openOnEdit = openOnEdit; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public void setSelectOnEdit(boolean selectOnEdit) { + this.selectOnEdit = selectOnEdit; + } + + public void setSelectWidth(String selectWidth) { + this.selectWidth = selectWidth; + } + + public void setShowControls(boolean showControls) { + this.showControls = showControls; + } + + public void setValue(Object value) { + this.value = value; + } + + +} Modified: trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java =================================================================== --- trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -18,7 +18,7 @@ private String inputText; private boolean disabled; private boolean expandSingle; - + public PanelMenu() { width = "500px"; mode = "none"; @@ -39,39 +39,31 @@ icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); } - + public boolean isDisabled() { return disabled; } - public String getWidth() { return width; } - public void setWidth(String width) { this.width = width; } - public void setDisabled(boolean disabled) { this.disabled = disabled; } - public boolean isExpandSingle() { return expandSingle; } - public void setExpandSingle(boolean expandSingle) { this.expandSingle = expandSingle; } - public String getAlign() { return align; } - public void setAlign(String align) { this.align = align; } - public boolean isRendered() { return rendered; } @@ -83,39 +75,30 @@ public Icon getIcon() { return icon; } - public void setIcon(Icon icon) { this.icon = icon; } - public String getIconGroupPosition() { return iconGroupPosition; } - public void setIconGroupPosition(String iconGroupPosition) { this.iconGroupPosition = iconGroupPosition; } - public String getIconGroupTopPosition() { return iconGroupTopPosition; } - public void setIconGroupTopPosition(String iconGroupTopPosition) { this.iconGroupTopPosition = iconGroupTopPosition; } - public String getIconItemPosition() { return iconItemPosition; } - public void setIconItemPosition(String iconItemPosition) { this.iconItemPosition = iconItemPosition; } - public String getIconItemTopPosition() { return iconItemTopPosition; } - public void setIconItemTopPosition(String iconItemTopPosition) { this.iconItemTopPosition = iconItemTopPosition; } @@ -123,7 +106,7 @@ public String getMode() { return mode; } - + public void setMode(String mode) { this.mode = mode; } @@ -152,14 +135,14 @@ this.inputText = inputText; } - public void bTest1() { + public void bTest1(){ icon.setCollapsed(icon.iconCollapse); icon.setExpanded(icon.iconExpand); icon.setItem(icon.iconItem); icon.setIcon(icon.iconFileManager); icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); - + setWidth("400px"); setAlign("right"); setDisabled(false); @@ -173,14 +156,14 @@ setTabIndex("3"); } - public void bTest2() { + public void bTest2(){ icon.setCollapsed(icon.iconExpand); icon.setExpanded(icon.iconCollapse); icon.setItem(icon.iconHeader); icon.setIcon(icon.iconFileManagerReject); icon.setCollapsedGroup(icon.iconAjaxStoped); icon.setDisabledGroup(icon.iconAjaxProcess); - + setWidth("250px"); setAlign("bottom"); setDisabled(false); @@ -191,17 +174,17 @@ setIconItemPosition("right"); setIconItemTopPosition("left"); setMode("server"); - setTabIndex("2"); + setTabIndex("2"); } - public void bTest3() { + public void bTest3(){ icon.setCollapsed(icon.iconCollapse); icon.setExpanded(icon.iconExpand); icon.setItem(icon.iconItem); icon.setIcon(icon.iconFileManager); icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); - + setWidth("400px"); setAlign("middle"); setDisabled(false); @@ -212,18 +195,18 @@ setIconItemPosition("right"); setIconItemTopPosition("left"); setMode("none"); - setTabIndex("2"); - + setTabIndex("2"); + } - public void bTest4() { + public void bTest4(){ icon.setCollapsed(icon.iconExpand); icon.setExpanded(icon.iconCollapse); icon.setItem(icon.iconHeader); icon.setIcon(icon.iconFileManagerReject); icon.setCollapsedGroup(icon.iconAjaxStoped); icon.setDisabledGroup(icon.iconAjaxProcess); - + setWidth("250px"); setAlign("top"); setDisabled(true); @@ -234,18 +217,18 @@ setIconItemPosition("left"); setIconItemTopPosition("left"); setMode("ajax"); - setTabIndex("2"); - + setTabIndex("2"); + } - public void bTest5() { + public void bTest5(){ icon.setCollapsed(icon.iconCollapse); icon.setExpanded(icon.iconExpand); icon.setItem(icon.iconItem); icon.setIcon(icon.iconFileManager); icon.setCollapsedGroup(icon.iconAjaxProcess); icon.setDisabledGroup(icon.iconAjaxStoped); - + setWidth("250px"); setAlign("right"); setDisabled(false); @@ -256,7 +239,7 @@ setIconItemPosition("right"); setIconItemTopPosition("right"); setMode("none"); - setTabIndex("2"); + setTabIndex("2"); } } \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/java/pickList/PickList.java =================================================================== --- trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,6 +1,8 @@ package pickList; import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; @@ -10,7 +12,6 @@ public String copyControlLabel; public String dir; public boolean disabled; - public boolean displayValueOnly; public boolean fastOrderControlsVisible; public boolean immediate; public String listsHeight; @@ -26,17 +27,45 @@ public String targetListWidth; public String title; private ArrayList<SelectItem> data; + private boolean required; + private String requiredMessage; + private Object[] value; + private String valueCL; - public PickList() { - this.copyAllControlLabel = "copyAllControlLabel"; + public String getValueCL() { + return valueCL; + } + + public void setValueCL(String valueCL) { + this.valueCL = valueCL; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public PickList() { + this.copyAllControlLabel = "copyAllControlLabel"; this.copyControlLabel = "copyControlLabel"; - this.dir = "alert('work')"; + this.dir = "alert('work')"; this.disabled = false; - this.displayValueOnly = false; this.fastOrderControlsVisible = true; this.immediate = false; this.listsHeight = "400"; - //this.localValueSet = ; + this.valueCL = "---"; + // this.localValueSet = ; this.moveControlsVerticalAlign = "30"; this.removeAllControlLabel = "removeAllControlLabel"; this.removeControlLabel = "removeControlLabel"; @@ -47,16 +76,18 @@ this.switchByClick = false; this.targetListWidth = "400"; this.title = "title"; + this.required = false; + this.requiredMessage = "requiredMessage"; data = new ArrayList<SelectItem>(); - for(int i=0; i < 10; i++) + for (int i = 0; i < 10; i++) data.add(new SelectItem("selectItems " + i)); - + } - + public void valueChangeListener(ValueChangeEvent event) { - //event.getNewValue(); + valueCL = "valueChangeListener work!"; } - + public String getCopyAllControlLabel() { return copyAllControlLabel; } @@ -89,14 +120,6 @@ this.disabled = disabled; } - public boolean isDisplayValueOnly() { - return displayValueOnly; - } - - public void setDisplayValueOnly(boolean displayValueOnly) { - this.displayValueOnly = displayValueOnly; - } - public boolean isFastOrderControlsVisible() { return fastOrderControlsVisible; } @@ -210,9 +233,18 @@ } public ArrayList<SelectItem> getData() { - return data; + return data; } + public void setData(ArrayList<SelectItem> data) { this.data = data; } + + public Object[] getValue() { + return value; + } + + public void setValue(Object[] value) { + this.value = value; + } } Modified: trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java =================================================================== --- trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/progressBar/ProgressBar.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -119,7 +119,7 @@ public Integer getValue() { // without a vodka bottle you will not understand :) - return enabled ? (permanent ? new Integer(maxValue) - 1 : value++) : value; + return enabled ? (permanent ? new Integer(maxValue) : value++) : value; } public void setValue(Integer value) { Added: trunk/test-applications/facelets/src/main/java/rich/Options.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/Options.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/rich/Options.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,68 @@ +package rich; + +public class Options { + private static String [] CALENDAR_EVENT = {"onbeforedomupdate", "onchanged", "oncollapse", "oncomplete", "oncurrentdateselect", "ondatemouseout", "ondatemouseover", "ondateselect", "ondateselected", "onexpand", "oninputblur", "oninputchange", "oninputclick", "oninputfocus", "oninputkeydown", "oninputkeypress", "oninputkeyup", "oninputselect", "ontimeselect", "ontimeselected"}; + private static String [] CALENDAR_STYLE = {"style", "styleClass", "inputStyle"}; + private static String [] COLUMNS_STYLE = {"footerClass", "headerClass", "styleClass", "style"}; + private static String [] COMBOBOX_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onfocus", "onitemselected", "onkeydown", "onkeypress", "onkeyup", "onlistcall", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect"}; + private static String [] COMBOBOX_STYLE = {"buttonClass", "buttonDisabledClass", "buttonDisabledStyle", "buttonInactiveClass", "buttonInactiveStyle", "buttonStyle", "inputClass", "inputDisabledClass", "inputDisabledStyle", "inputInactiveClass", "inputInactiveStyle", "itemClass", "inputStyle", "listClass", "listStyle"}; + private static String [] CONTEXTMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover"}; + private static String [] CONTEXTMENU_STYLE = {"disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "style", "styleClass"}; + private static String [] DATADEFINITIONLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass"}; + private static String [] DATAORDEREDLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass", "footerClass", "headerClass"}; + private static String [] DATAFILTERSLIDER_EVENT = {"onbeforedomupdate", "onchange", "onclick", "oncomplete", "ondblclick", "onerror", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onslide", "onSlideSubmit"}; + private static String [] DATAFILTERSLIDER_STYLE = {"styleClass", "rangeStyleClass", "trailerStyleClass", "style", "fieldStyleClass", "trackStyleClass", "handleStyleClass"}; + private static String [] DATASCROLLER_EVENT = {"onbeforedomupdate", "onclick", "oncomplete", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"}; + private static String [] DATASCROLLER_STYLE = {"inactiveStyle", "inactiveStyleClass", "selectedStyle", "selectedStyleClass", "style", "styleClass", "tableStyle", "tableStyleClass"}; + private static String [] DATATABLE_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onRowClick", "onRowDblClick", "onRowMouseDown", "onRowMouseMove", "onRowMouseOut", "onRowMouseOver", "onRowMouseUp"}; + private static String [] DATATABLE_STYLE = {"captionClass", "rowClasses", "headerClass", "footerClass", "styleClass", "captionStyle", "columnClasses"}; + private static String [] DRAGANDDROP_EVENT = {"ondragenter", "ondragexit", "ondrop", "ondropend", "oncomplete", "onsubmit", "onbeforedomupdate", "oncomplete", "ondragend", "ondragstart", "onsubmit", "ondropout", "ondropover"}; + private static String [] DRAGANDDROP_STYLE = {"acceptClass", "rejectClass", "style", "styleClass"}; + private static String [] DROPDOWNMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover", "onbeforedomupdate", "onclick", "oncomplete", "onmousedown", "onmouseup", "onselect"}; + private static String [] DROPDOWNMENU_STYLE = {"iconClass", "iconStyle", "selectClass", "selectStyle", "style", "disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "styleClass"}; + private static String [] GMAP_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"}; + private static String [] GMAP_STYLE = {"style=", "styleClass"}; + private static String [] INPUTNUMBERSLIDER_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onerror", "onfocus", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect", "onslide"}; + private static String [] INPUTNUMBERSLIDER_STYLE = {"barClass", "barStyle", "handleClass", "inputClass", "handleSelectedClass", "inputSize", "styleClass", "inputStyle", "tipStyle", "style", "tipClass"}; + + + private boolean reDefault; + private boolean reComponent; + private boolean reProperty; + private boolean reStraightforward; + + public Options() { + + reDefault = true; + reComponent = true; + reProperty = true; + reStraightforward = true; + } + + public boolean isReComponent() { + return reComponent; + } + public void setReComponent(boolean reComponent) { + this.reComponent = reComponent; + } + public boolean isReProperty() { + return reProperty; + } + public void setReProperty(boolean reProperty) { + this.reProperty = reProperty; + } + public boolean isReStraightforward() { + return reStraightforward; + } + public void setReStraightforward(boolean reStraightforward) { + this.reStraightforward = reStraightforward; + } + + public boolean isReDefault() { + return reDefault; + } + + public void setReDefault(boolean reDefault) { + this.reDefault = reDefault; + } +} Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -3,7 +3,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; +import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; import org.richfaces.VersionBean; @@ -15,59 +17,58 @@ private String srcContainer; private MapComponent map; private List<SelectItem> list; - private boolean reComponent; - private boolean reProperty; - private boolean reStraightforward; + public RichBean() { list = new ArrayList<SelectItem>(); src = "Blank"; srcContainer = "Blank"; - reComponent = true; - reProperty = true; - reStraightforward = true; map = new MapComponent(); // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); - map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); - map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true})); - map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, false})); - map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true})); - map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true})); - map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false})); - map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {true, true})); - map.add("Effect", add("/Effect/Effect", new boolean [] {false, false})); - map.add("Gmap", add("/Gmap/Gmap", new boolean [] {true, false})); - map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {true, true})); - map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {true, true})); - map.add("Insert", add("/Insert/Insert", new boolean [] {true, false})); - map.add("Message", add("/Message/Message", new boolean [] {true, true})); - map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {true, true})); - map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {true, true})); - map.add("Panel", add("/Panel/Panel", new boolean [] {true, true})); - map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {true, true})); - map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {true, true})); - map.add("Separator", add("/Separator/Separator", new boolean [] {true, true})); - map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {true, true})); - map.add("Spacer", add("/Spacer/Spacer", new boolean [] {true, true})); - map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {true, true})); - map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {true, true})); - map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {true, true})); - map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false})); - map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true})); - map.add("Tree", add("/Tree/Tree", new boolean [] {true, false})); - map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, false})); - map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); - map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); - map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, true})); - map.add("DataDefinitionList", add("/DataDefinitionList/DataDefinitionList", new boolean [] {true, false})); - map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {true, false})); - map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false})); - map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true})); - map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false})); - map.add("Columns", add("/Columns/Columns", new boolean [] {true, false})); - map.add("PickList", add("/PickList/PickList", new boolean [] {true, false})); - map.add("Combobox", add("/Combobox/Combobox", new boolean [] {true, false})); - map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false})); + map.add("Blank", add("/pages/Blank/Blank", new boolean [] {false, true, true})); + map.add("Calendar", add("/Calendar/Calendar", new boolean [] {false, true, true})); + map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {false, true, false})); + map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {false, true, true})); + map.add("DataTable", add("/DataTable/DataTable", new boolean [] {false, true, true})); + map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false, false})); + map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {false, true, true})); + map.add("Effect", add("/Effect/Effect", new boolean [] {false, false, false})); + map.add("Gmap", add("/Gmap/Gmap", new boolean [] {false, true, false})); + map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {false, true, true})); + map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {false, true, true})); + map.add("Insert", add("/Insert/Insert", new boolean [] {false, true, false})); + map.add("Message", add("/Message/Message", new boolean [] {false, true, true})); + map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {false, true, true})); + map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {false, true, true})); + map.add("Panel", add("/Panel/Panel", new boolean [] {false, true, true})); + map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {false, true, true})); + map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {false, true, true})); + map.add("Separator", add("/Separator/Separator", new boolean [] {false, true, true})); + map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {false, true, true})); + map.add("Spacer", add("/Spacer/Spacer", new boolean [] {false, true, true})); + map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {false, true, true})); + map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {false, true, true})); + map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {false, true, true})); + map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {false, true, false})); + map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {false, true, true})); + map.add("Tree", add("/Tree/Tree", new boolean [] {false, true, false})); + map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {false, true, false})); + map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {false, true, false})); + map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false, false})); + map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {false, true, true})); + map.add("DataDefinitionList", add("/DataDefinitionList/DataDefinitionList", new boolean [] {false, true, false})); + map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {false, true, false})); + map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {false, true, false})); + map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {false, true, true})); + map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false, false})); + map.add("Columns", add("/Columns/Columns", new boolean [] {false, true, false})); + map.add("PickList", add("/PickList/PickList", new boolean [] {false, true, false})); + map.add("Combobox", add("/Combobox/Combobox", new boolean [] {false, true, false})); + map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false, false})); + map.add("SortingAndFiltering", add("/SortingAndFiltering/SortingAndFiltering", new boolean [] {false, false, false})); + map.add("FileUpload", add("/FileUpload/FileUpload", new boolean [] {false, false, false})); + map.add("InplaceSelect", add("/InplaceSelect/InplaceSelect", new boolean [] {false, false, false})); + map.add("InplaceInput", add("/InplaceInput/InplaceInput", new boolean [] {false, false, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ list.add(new SelectItem(iterator.next())); @@ -81,13 +82,17 @@ public String getPathComponent() { return map.get(src).get(0); } + + public String getDefaultPathComponent() { + return map.get(src).get(1); + } public String getPathProperty() { - return map.get(src).get(1); + return map.get(src).get(2); } public String getPathStraightforward() { - return map.get(src).get(2); + return map.get(src).get(3); } public void setSrc(String src) { @@ -97,35 +102,12 @@ private ArrayList<String> add(String path, boolean [] arr){ ArrayList<String> list = new ArrayList<String>(); list.add(path + EXT); - if(arr[0]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT); - if(arr[1]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT); + if(arr[0]) list.add(path + "Default" + EXT); else list.add("/pages/Blank/BlankDefault" + EXT); + if(arr[1]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT); + if(arr[2]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT); return list; } - public boolean isReComponent() { - return reComponent; - } - - public void setReComponent(boolean reComponent) { - this.reComponent = reComponent; - } - - public boolean isReProperty() { - return reProperty; - } - - public void setReProperty(boolean reProperty) { - this.reProperty = reProperty; - } - - public boolean isReStraightforward() { - return reStraightforward; - } - - public void setReStraightforward(boolean reStraightforward) { - this.reStraightforward = reStraightforward; - } - public String getVersion() { return version; } Modified: trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,7 @@ package sTP; +import javax.faces.event.ActionEvent; + public class SimpleTogglePanel { private String switchType; // "client", "server"(default), "ajax" @@ -8,6 +10,8 @@ private String position = "right"; private boolean focus; private boolean rendered; + private String action; + private String actionListener; public SimpleTogglePanel() { width = "75%"; @@ -15,8 +19,19 @@ switchType = "server"; focus = true; rendered = true; + action = "---"; + actionListener = "---"; } + public String act() { + action = "action work!"; + return null; + } + + public void actListener(ActionEvent e){ + actionListener = "actionListener work!"; + } + public String getHeight() { return height; } @@ -94,4 +109,12 @@ public void setPosition(String position) { this.position = position; } + + public String getAction() { + return action; + } + + public String getActionListener() { + return actionListener; + } } Modified: trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -21,7 +21,7 @@ private boolean hideWhenScrolling; private int dataLength; private int frozenColCount; - + private String sortMode; private int first; private boolean rendered; private int timeout; @@ -36,6 +36,7 @@ private boolean ajaxSingle; public ScrollableDataTable() { + sortMode = "single"; width = "400px"; rows = 30; hideWhenScrolling = false; @@ -213,4 +214,12 @@ public void setAjaxSingle(boolean ajaxSingle) { this.ajaxSingle = ajaxSingle; } + + public String getSortMode() { + return sortMode; + } + + public void setSortMode(String sortMode) { + this.sortMode = sortMode; + } } \ No newline at end of file Added: trunk/test-applications/facelets/src/main/java/sortingAndFiltering/SortingAndFiltering.java =================================================================== --- trunk/test-applications/facelets/src/main/java/sortingAndFiltering/SortingAndFiltering.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/sortingAndFiltering/SortingAndFiltering.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,127 @@ + +package sortingAndFiltering; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Random; + +import org.richfaces.model.Ordering; + +import util.data.Data; + +public class SortingAndFiltering { + private ArrayList<Data> data; + private String sortMode; + private boolean selfSorted; + private boolean sortable; + private String sortExpression; + private Ordering sortOrder; + private String currentSortOrder; + private String filterInput; + private String filterValue; + private final Comparator<Data> comparator = new Comparator<Data> () { + public int compare(Data o1, Data o2) { + return o2.getStr1().length() - o1.getStr1().length(); + } + }; + public String getFilterValue() { + return filterValue; + } + + public void setFilterValue(String filterValue) { + this.filterValue = filterValue; + } + + public String getFilterInput() { + return filterInput; + } + + public void setFilterInput(String filterInput) { + this.filterInput = filterInput; + } + + public SortingAndFiltering() { + filterValue = ""; + filterInput = ""; + data = new ArrayList<Data>(); + sortMode = "single"; + sortOrder = Ordering.ASCENDING; + currentSortOrder = "ASCENDING"; + boolean b = true; + Random r = new Random(); + for(int i = 0; i < 10; i++) + data.add(new Data(i, r.nextInt(1000), Data.Random(6), r.nextInt(10000) + 98389, Data.Random(r.nextInt(10) + 1), r.nextInt(500000), Data.statusIcon[i % 5], Data.Random(3), false)); //new Data(i, Data.Random(5), Data.statusIcon[i % 5], Data.Random(6), false)); + } + + public String getSortMode() { + return sortMode; + } + + public void setSortMode(String sortMode) { + this.sortMode = sortMode; + } + + public boolean isSelfSorted() { + return selfSorted; + } + + public void setSelfSorted(boolean selfSorted) { + this.selfSorted = selfSorted; + } + + public String getSortExpression() { + return sortExpression; + } + + public void setSortExpression(String sortExpression) { + this.sortExpression = sortExpression; + } + + public ArrayList<Data> getData() { + return data; + } + + public void setData(ArrayList<Data> data) { + this.data = data; + } + + public boolean isSortable() { + return sortable; + } + + public void setSortable(boolean sortable) { + this.sortable = sortable; + } + + public Ordering getSortOrder() { + return sortOrder; + } + + public void setSortOrder(Ordering sortOrder) { + this.sortOrder = sortOrder; + } + + public String getCurrentSortOrder() { + return currentSortOrder; + } + + public void setCurrentSortOrder(String currentSortOrder) { + if("DESCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.DESCENDING; + else if("UNSORTED".equals(currentSortOrder)) this.sortOrder = Ordering.UNSORTED; + else if("ASCENDING".equals(currentSortOrder)) this.sortOrder = Ordering.ASCENDING; + this.currentSortOrder = currentSortOrder; + } + + public boolean filterMethod(Object obj) { + Data d = (Data)obj; + if(d.getStr0().startsWith(filterInput)) return true; + return false; + } + + + public Comparator<Data> getComparator() { + return comparator; + } + + +} Modified: trunk/test-applications/facelets/src/main/java/util/data/Data.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/data/Data.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/util/data/Data.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,7 @@ package util.data; +import java.util.Random; + public class Data { public static final String[] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"}; public static final String[] status = {"error", "fatal", "info", "passed", "warn"}; @@ -42,6 +44,18 @@ this.bool2 = false; this.bool3 = false; } + + public Data(int int0, int int1, String str0, int int2, String str1, int int3, String str2, String str3, boolean bool0) { + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.str3 = str3; + this.int0 = int0; + this.int1 = int1; + this.int2 = int2; + this.int3 = int3; + this.bool0 = bool0; + } public Data(String str0, String str1, String str2, String str3, int int0, int int1, int int2, int int3, boolean bool0, boolean bool1, @@ -75,6 +89,14 @@ this.str3 = str3; } + public Data(int int0, String str0, String str1, String str2, boolean bool0){ + this.int0 = int0; + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.bool0 = bool0; + } + public Data(String str0){ this.str0 = str0; } @@ -171,6 +193,22 @@ public void setBool3(boolean bool3) { this.bool3 = bool3; } + + public static String Random(int size){ + char [] c = new char[size]; + for(int i = 0; i < size; i++){ + c[i] = (char)(new Random().nextInt(25) + 97); + } + return new String(c); + } + + public static String RandomUp(int size){ + char [] c = new char[size]; + for(int i = 0; i < size; i++){ + c[i] = (char)(new Random().nextInt(25) + 65); + } + return new String(c); + } @Override public int hashCode() { Modified: trunk/test-applications/facelets/src/main/java/util/event/Event.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/event/Event.java 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/java/util/event/Event.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -92,7 +92,7 @@ private String ongroupexpand; private String oncontextmenu; private String ongroupcollapse; - private String onSlideSubmit; + private String opened; // showEvent('onkeypressInputID', 'onkeypress work!') public Event() { @@ -181,7 +181,7 @@ ontopclick = "showEvent('ontopclickInputID', 'ontopclick work!')"; onupclick = "showEvent('onupclickInputID', 'onupclick work!')"; ongroupcollapse = "showEvent('ongroupcollapseInputID', 'ongroupcollapse work!')"; - onSlideSubmit = "showEvent('onSlideSubmitInputID', 'onSlideSubmit work!')"; + opened = "showEvent('openedInputID', 'opened work!')"; } public String getOncontextmenu() { @@ -1049,14 +1049,7 @@ this.onmaskcontextmenu = onmaskcontextmenu; } - public String getOnSlideSubmit() { - return onSlideSubmit; - } - public void setOnSlideSubmit(String onSlideSubmit) { - this.onSlideSubmit = onSlideSubmit; - } - public String getOngroupcollapse() { return ongroupcollapse; } @@ -1064,4 +1057,13 @@ public void setOngroupcollapse(String ongroupcollapse) { this.ongroupcollapse = ongroupcollapse; } + + public String getOpened() { + return opened; + } + + public void setOpened(String opened) { + this.opened = opened; + } + } \ No newline at end of file Added: trunk/test-applications/facelets/src/main/java/util/style/Style.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/style/Style.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,730 @@ +package util.style; + +import rich.RichBean; + +public class Style { + private RichBean curentComponent; + private String style; + private String styleClass; + private String rangeStyleClass; + private String fieldStyleClass; + private String trackStyleClass; + private String columnClasses; + private String footerClass; + private String headerClass; + private String rowClasses; + private String inactiveStyle; + private String inactiveStyleClass; + private String selectedStyle; + private String selectedStyleClass; + private String tableStyle; + private String tableStyleClass; + private String captionClass; + private String dayStyleClass; + private String inputStyle; + private String barStyle; + private String handleSelectedClass; + private String handleStyleClass; + private String tipStyle; + private String buttonClass; + private String buttonDisabledClass; + private String buttonDisabledStyle; + private String buttonInactiveClass; + private String buttonInactiveStyle; + private String buttonStyle; + private String inputClass; + private String inputDisabledClass; + private String inputDisabledStyle; + private String inputInactiveClass; + private String inputInactiveStyle; + private String itemClass; + private String listClass; + private String listStyle; + private String disabledItemClass; + private String disabledItemStyle; + private String itemStyle; + private String selectItemStyle; + private String selectItemClass; + private String iconClass; + private String iconStyle; + private String selectClass; + private String selectStyle; + private String highlightedClass; + private String tabClass; + private String entryClass; + private String popupClass; + private String popupStyle; + private String selectedClass; + private String remainClass; + private String initialClass; + private String finishClass; + private String completeClass; + private String controlClass; + private String captionStyle; + private String activeClass; + private String trailerStyleClass; + private String barClass; + private String handleStyle; + + private String styleA; + private String styleClassA; + private String selectStyleA; + private String iconClassA; + private String iconStyleA; + private String selectClassA; + private String rowClassesA; + private String columnClassesA; + private String footerClassA; + private String headerClassA; + + public Style() { + style = "style"; + styleClass = "styleClass"; + rangeStyleClass = "rangeStyleClass"; + fieldStyleClass = "fieldStyleClass"; + trackStyleClass = "trackStyleClass"; + columnClasses = "columnClasses"; + footerClass = "footerClass"; + headerClass = "headerClass"; + rowClasses = "rowClasses"; + inactiveStyle = "inactiveStyle"; + inactiveStyleClass = "inactiveStyleClass"; + selectedStyle = "selectedStyle"; + selectedStyleClass = "selectedStyleClass"; + tableStyle = "tableStyle"; + tableStyleClass = "tableStyleClass"; + captionClass = "captionClass"; + dayStyleClass = "dayStyleClass"; + inputStyle = "inputStyle"; + barStyle = "barStyle"; + handleSelectedClass = "handleSelectedClass"; + tipStyle = "tipStyle"; + buttonClass = "buttonClass"; + buttonDisabledClass = "buttonDisabledClass"; + buttonDisabledStyle = "buttonDisabledStyle"; + buttonInactiveClass = "buttonInactiveClass"; + buttonInactiveStyle = "buttonInactiveStyle"; + buttonStyle = "buttonStyle"; + inputClass = "inputClass"; + inputDisabledClass = "inputDisabledClass"; + inputDisabledStyle = "inputDisabledStyle"; + inputInactiveClass = "inputInactiveClass"; + inputInactiveStyle = "inputInactiveStyle"; + itemClass = "itemClass"; + listClass = "listClass"; + listStyle = "listStyle"; + disabledItemClass = "disabledItemClass"; + disabledItemStyle = "disabledItemStyle"; + itemStyle = "itemStyle"; + selectItemStyle = "selectItemStyle"; + selectItemClass = "selectItemClass"; + iconClass = "iconClass"; + iconStyle = "iconStyle"; + selectClass = "selectClass"; + selectStyle = "selectStyle"; + highlightedClass = "highlightedClass"; + handleStyleClass = "handleStyleClass"; + tabClass = "tabClass"; + entryClass = "entryClass"; + popupClass = "popupClass"; + popupStyle = "popupStyle"; + selectedClass = "selectedClass"; + remainClass = "remainClass"; + initialClass = "initialClass"; + finishClass = "finishClass"; + completeClass = "completeClass"; + controlClass = "controlClass"; + captionStyle = "captionStyle"; + activeClass = "activeClass"; + trailerStyleClass = "trailerStyleClass"; + barClass = "barClass"; + handleStyle = "handleStyle"; + + styleA = "styleA"; + styleClassA = "styleClassA"; + selectStyleA = "selectStyleA"; + iconClassA = "iconClassA"; + iconStyleA = "iconStyleA"; + selectClassA = "selectClassA"; + rowClassesA = "rowClassesA"; + columnClassesA = "columnClassesA"; + footerClassA = "footerClassA"; + headerClassA = "headerClassA"; + } + + public String getStyle() { + return style; + } + + public void setStyle(String style) { + this.style = style; + } + + public String getStyleClass() { + return styleClass; + } + + public void setStyleClass(String styleClass) { + this.styleClass = styleClass; + } + + public String getRangeStyleClass() { + return rangeStyleClass; + } + + public void setRangeStyleClass(String rangeStyleClass) { + this.rangeStyleClass = rangeStyleClass; + } + + public String getFieldStyleClass() { + return fieldStyleClass; + } + + public void setFieldStyleClass(String fieldStyleClass) { + this.fieldStyleClass = fieldStyleClass; + } + + public String getTrackStyleClass() { + return trackStyleClass; + } + + public void setTrackStyleClass(String trackStyleClass) { + this.trackStyleClass = trackStyleClass; + } + + public String getColumnClasses() { + return columnClasses; + } + + public void setColumnClasses(String columnClasses) { + this.columnClasses = columnClasses; + } + + public String getFooterClass() { + return footerClass; + } + + public void setFooterClass(String footerClass) { + this.footerClass = footerClass; + } + + public String getHeaderClass() { + return headerClass; + } + + public void setHeaderClass(String headerClass) { + this.headerClass = headerClass; + } + + public String getRowClasses() { + return rowClasses; + } + + public void setRowClasses(String rowClasses) { + this.rowClasses = rowClasses; + } + + public String getInactiveStyle() { + return inactiveStyle; + } + + public void setInactiveStyle(String inactiveStyle) { + this.inactiveStyle = inactiveStyle; + } + + public String getInactiveStyleClass() { + return inactiveStyleClass; + } + + public void setInactiveStyleClass(String inactiveStyleClass) { + this.inactiveStyleClass = inactiveStyleClass; + } + + public String getSelectedStyle() { + return selectedStyle; + } + + public void setSelectedStyle(String selectedStyle) { + this.selectedStyle = selectedStyle; + } + + public String getSelectedStyleClass() { + return selectedStyleClass; + } + + public void setSelectedStyleClass(String selectedStyleClass) { + this.selectedStyleClass = selectedStyleClass; + } + + public String getTableStyle() { + return tableStyle; + } + + public void setTableStyle(String tableStyle) { + this.tableStyle = tableStyle; + } + + public String getTableStyleClass() { + return tableStyleClass; + } + + public void setTableStyleClass(String tableStyleClass) { + this.tableStyleClass = tableStyleClass; + } + + public String getCaptionClass() { + return captionClass; + } + + public void setCaptionClass(String captionClass) { + this.captionClass = captionClass; + } + + public String getDayStyleClass() { + return dayStyleClass; + } + + public void setDayStyleClass(String dayStyleClass) { + this.dayStyleClass = dayStyleClass; + } + + public String getInputStyle() { + return inputStyle; + } + + public void setInputStyle(String inputStyle) { + this.inputStyle = inputStyle; + } + + public String getBarStyle() { + return barStyle; + } + + public void setBarStyle(String barStyle) { + this.barStyle = barStyle; + } + + public String getHandleSelectedClass() { + return handleSelectedClass; + } + + public void setHandleSelectedClass(String handleSelectedClass) { + this.handleSelectedClass = handleSelectedClass; + } + + public String getTipStyle() { + return tipStyle; + } + + public void setTipStyle(String tipStyle) { + this.tipStyle = tipStyle; + } + + public String getButtonClass() { + return buttonClass; + } + + public void setButtonClass(String buttonClass) { + this.buttonClass = buttonClass; + } + + public String getButtonDisabledClass() { + return buttonDisabledClass; + } + + public void setButtonDisabledClass(String buttonDisabledClass) { + this.buttonDisabledClass = buttonDisabledClass; + } + + public String getButtonDisabledStyle() { + return buttonDisabledStyle; + } + + public void setButtonDisabledStyle(String buttonDisabledStyle) { + this.buttonDisabledStyle = buttonDisabledStyle; + } + + public String getButtonInactiveClass() { + return buttonInactiveClass; + } + + public void setButtonInactiveClass(String buttonInactiveClass) { + this.buttonInactiveClass = buttonInactiveClass; + } + + public String getButtonInactiveStyle() { + return buttonInactiveStyle; + } + + public void setButtonInactiveStyle(String buttonInactiveStyle) { + this.buttonInactiveStyle = buttonInactiveStyle; + } + + public String getButtonStyle() { + return buttonStyle; + } + + public void setButtonStyle(String buttonStyle) { + this.buttonStyle = buttonStyle; + } + + public String getInputClass() { + return inputClass; + } + + public void setInputClass(String inputClass) { + this.inputClass = inputClass; + } + + public String getInputDisabledClass() { + return inputDisabledClass; + } + + public void setInputDisabledClass(String inputDisabledClass) { + this.inputDisabledClass = inputDisabledClass; + } + + public String getInputDisabledStyle() { + return inputDisabledStyle; + } + + public void setInputDisabledStyle(String inputDisabledStyle) { + this.inputDisabledStyle = inputDisabledStyle; + } + + public String getInputInactiveClass() { + return inputInactiveClass; + } + + public void setInputInactiveClass(String inputInactiveClass) { + this.inputInactiveClass = inputInactiveClass; + } + + public String getInputInactiveStyle() { + return inputInactiveStyle; + } + + public void setInputInactiveStyle(String inputInactiveStyle) { + this.inputInactiveStyle = inputInactiveStyle; + } + + public String getItemClass() { + return itemClass; + } + + public void setItemClass(String itemClass) { + this.itemClass = itemClass; + } + + public String getListClass() { + return listClass; + } + + public void setListClass(String listClass) { + this.listClass = listClass; + } + + public String getListStyle() { + return listStyle; + } + + public void setListStyle(String listStyle) { + this.listStyle = listStyle; + } + + public String getDisabledItemClass() { + return disabledItemClass; + } + + public void setDisabledItemClass(String disabledItemClass) { + this.disabledItemClass = disabledItemClass; + } + + public String getDisabledItemStyle() { + return disabledItemStyle; + } + + public void setDisabledItemStyle(String disabledItemStyle) { + this.disabledItemStyle = disabledItemStyle; + } + + public String getItemStyle() { + return itemStyle; + } + + public void setItemStyle(String itemStyle) { + this.itemStyle = itemStyle; + } + + public String getSelectItemStyle() { + return selectItemStyle; + } + + public void setSelectItemStyle(String selectItemStyle) { + this.selectItemStyle = selectItemStyle; + } + + public String getSelectItemClass() { + return selectItemClass; + } + + public void setSelectItemClass(String selectItemClass) { + this.selectItemClass = selectItemClass; + } + + public String getIconClass() { + return iconClass; + } + + public void setIconClass(String iconClass) { + this.iconClass = iconClass; + } + + public String getIconStyle() { + return iconStyle; + } + + public void setIconStyle(String iconStyle) { + this.iconStyle = iconStyle; + } + + public String getSelectClass() { + return selectClass; + } + + public void setSelectClass(String selectClass) { + this.selectClass = selectClass; + } + + public String getSelectStyle() { + return selectStyle; + } + + public void setSelectStyle(String selectStyle) { + this.selectStyle = selectStyle; + } + + public String getHighlightedClass() { + return highlightedClass; + } + + public void setHighlightedClass(String highlightedClass) { + this.highlightedClass = highlightedClass; + } + + public String getTabClass() { + return tabClass; + } + + public void setTabClass(String tabClass) { + this.tabClass = tabClass; + } + + public String getEntryClass() { + return entryClass; + } + + public void setEntryClass(String entryClass) { + this.entryClass = entryClass; + } + + public String getPopupClass() { + return popupClass; + } + + public void setPopupClass(String popupClass) { + this.popupClass = popupClass; + } + + public String getPopupStyle() { + return popupStyle; + } + + public void setPopupStyle(String popupStyle) { + this.popupStyle = popupStyle; + } + + public String getSelectedClass() { + return selectedClass; + } + + public void setSelectedClass(String selectedClass) { + this.selectedClass = selectedClass; + } + + public String getRemainClass() { + return remainClass; + } + + public void setRemainClass(String remainClass) { + this.remainClass = remainClass; + } + + public String getInitialClass() { + return initialClass; + } + + public void setInitialClass(String initialClass) { + this.initialClass = initialClass; + } + + public String getFinishClass() { + return finishClass; + } + + public void setFinishClass(String finishClass) { + this.finishClass = finishClass; + } + + public String getCompleteClass() { + return completeClass; + } + + public void setCompleteClass(String completeClass) { + this.completeClass = completeClass; + } + + public String getControlClass() { + return controlClass; + } + + public void setControlClass(String controlClass) { + this.controlClass = controlClass; + } + + public String getStyleA() { + return styleA; + } + + public void setStyleA(String styleA) { + this.styleA = styleA; + } + + public String getStyleClassA() { + return styleClassA; + } + + public void setStyleClassA(String styleClassA) { + this.styleClassA = styleClassA; + } + + public String getSelectStyleA() { + return selectStyleA; + } + + public void setSelectStyleA(String selectStyleA) { + this.selectStyleA = selectStyleA; + } + + public String getIconClassA() { + return iconClassA; + } + + public void setIconClassA(String iconClassA) { + this.iconClassA = iconClassA; + } + + public String getIconStyleA() { + return iconStyleA; + } + + public void setIconStyleA(String iconStyleA) { + this.iconStyleA = iconStyleA; + } + + public String getSelectClassA() { + return selectClassA; + } + + public void setSelectClassA(String selectClassA) { + this.selectClassA = selectClassA; + } + + public String getCaptionStyle() { + return captionStyle; + } + + public void setCaptionStyle(String captionStyle) { + this.captionStyle = captionStyle; + } + + public String getRowClassesA() { + return rowClassesA; + } + + public void setRowClassesA(String rowClassesA) { + this.rowClassesA = rowClassesA; + } + + public String getColumnClassesA() { + return columnClassesA; + } + + public void setColumnClassesA(String columnClassesA) { + this.columnClassesA = columnClassesA; + } + + public String getFooterClassA() { + return footerClassA; + } + + public void setFooterClassA(String footerClassA) { + this.footerClassA = footerClassA; + } + + public String getHeaderClassA() { + return headerClassA; + } + + public void setHeaderClassA(String headerClassA) { + this.headerClassA = headerClassA; + } + + public String getActiveClass() { + return activeClass; + } + + public void setActiveClass(String activeClass) { + this.activeClass = activeClass; + } + + public RichBean getCurentComponent() { + return curentComponent; + } + + public void setCurentComponent(RichBean curentComponent) { + this.curentComponent = curentComponent; + } + + public String getHandleStyleClass() { + return handleStyleClass; + } + + public void setHandleStyleClass(String handleStyleClass) { + this.handleStyleClass = handleStyleClass; + } + + public String getTrailerStyleClass() { + return trailerStyleClass; + } + + public void setTrailerStyleClass(String trailerStyleClass) { + this.trailerStyleClass = trailerStyleClass; + } + + public String getBarClass() { + return barClass; + } + + public void setBarClass(String barClass) { + this.barClass = barClass; + } + + public String getHandleStyle() { + return handleStyle; + } + + public void setHandleStyle(String handleStyle) { + this.handleStyle = handleStyle; + } +} Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarSubviewID"> <h:messages /> <rich:messages showDetail="true"></rich:messages> @@ -11,6 +11,7 @@ rendered="#{calendarBean.renderedAjax}" /> <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" + style="#{style.style}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" @@ -170,4 +171,5 @@ </h:panelGrid> </rich:calendar> </h:panelGrid> + </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,2 @@ + +<rich:calendar></rich:calendar> Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,9 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarPropertySubviewID"> <h:panelGrid columns="2"> <h:panelGroup> <a4j:commandButton value="reRender" reRender="calendarClientID,calendarAjaxID"></a4j:commandButton> - <a4j:commandButton reRender="calendarClientID,calendarAjaxID" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> - <h:commandButton action="submit();" value="submit();" /> - <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> </h:panelGroup> <h:column></h:column> Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{calendarBean.bTest1}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,6 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="columnsSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="columnsSubviewID"> + <h:selectBooleanCheckbox value="#{columns.dataTableRendered}"> <a4j:support event="onchange" reRender="richGridID"></a4j:support> </h:selectBooleanCheckbox> @@ -27,15 +28,16 @@ </f:facet> </rich:column> - <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" + <rich:columns value="#{columns.data2}" var="d2" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" - begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" > + begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" style="#{style.style}" styleClass="#{style.styleClass}"> <f:facet name="header"> <h:outputText value="header #{d2.int0}"></h:outputText> </f:facet> <h:outputText value="#{index}. "></h:outputText> <h:outputText value="#{d1.str0}, "></h:outputText> <h:outputText value="#{d2.str0}"></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="footer #{d2.int0}"></h:outputText> </f:facet> @@ -72,6 +74,7 @@ <h:outputText value="#{index}. "></h:outputText> <h:outputText value="#{d1.str0}, "></h:outputText> <h:outputText value="#{d2.str0}"></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="footer #{d2.int0}"></h:outputText> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="columnsPropertyID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="columnsPropertyID"> <h:commandButton value="submit"></h:commandButton> <a4j:commandButton value="submit [a4j]" reRender="columnsID"></a4j:commandButton> <h:panelGrid columns="2"> Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,13 +1,13 @@ - -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxSubviewID"> <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}" defaultLabel="#{combobox.defaultLabel}" - filterNewValues="#{combobox.filterNewValues}" + buttonClass="#{style.buttonClass}" buttonDisabledClass="#{style.buttonDisabledClass}" buttonDisabledStyle="#{style.buttonDisabledStyle}" buttonInactiveClass="#{style.buttonInactiveClass}" buttonInactiveStyle="#{style.buttonInactiveStyle}" buttonStyle="#{style.buttonStyle}" inputClass="#{style.inputClass}" inputDisabledClass="#{style.inputDisabledClass}" inputDisabledStyle="#{style.inputDisabledStyle}" inputInactiveClass="#{style.inputInactiveClass}" inputInactiveStyle="#{style.inputInactiveStyle}" itemClass="#{style.itemClass}" inputStyle="#{style.inputStyle}" listClass="#{style.listClass}" listStyle="#{style.listStyle}" + filterNewValues="#{combobox.filterNewValues}" directInputSuggestions="#{combobox.directInputSuggestions}" immediate="#{combobox.immediate}" inputSize="#{combobox.inputSize}" width="#{combobox.width}" valueChangeListener="#{combobox.valueChangeListener}" value="#{combobox.value}" tabindex="#{combobox.tabindex}" suggestionValues="#{combobox.suggestionValues}" size="#{combobox.size}" required="#{combobox.required}" requiredMessage="#{combobox.requiredMessage}" rendered="#{combobox.rendered}" selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}" maxlength="#{combobox.maxlength}" - enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}" + enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}" style="#{style.style}" styleClass="#{style.styleClass}" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onfocus="#{event.onfocus}" onitemselected="#{event.onitemselected}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" Added: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,7 @@ + <rich:comboBox> + <f:selectItem itemValue="item 1"/> + <f:selectItem itemValue="item 2"/> + <f:selectItem itemValue="item 3"/> + <f:selectItem itemValue="item 4"/> + <f:selectItem itemValue="item 5"/> + </rich:comboBox> Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,9 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxPropertySubviewID"> + + + + +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="defaultLabel"></h:outputText> <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText> Modified: trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="componentControlSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="componentControlSubviewID"> <h:inputText value="test"> <rich:componentControl name="controlMe" event="onclick" attachTiming="onload" for="ccToltipID" operation="show" /> Modified: trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,11 +1,12 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuSubviewID"> <h:panelGrid columns="2"> <rich:panel style="width: 130px; height: 50px; background-color: #98FB98;"> - <h:outputText value="panel with contextMenu(DEFAULT)" /><f:verbatim><br/></f:verbatim> + <h:outputText value="panel with contextMenu(DEFAULT)" /> <f:verbatim><br /></f:verbatim> <h:outputText value="testing events" /> - <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> - <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID"> + <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" style="#{style.style}" styleClass="#{style.styleClass}" disabledItemClass="#{style.disabledItemClass}" disabledItemStyle="#{style.disabledItemStyle}" itemClass="#{style.itemClass}" itemStyle="#{style.itemStyle}" selectItemStyle="#{style.selectItemStyle}" selectItemClass="#{style.selectItemClass}" + oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> + <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID" style="#{style.styleA}" styleClass="#{style.styleClassA}"> <f:param name="cmdParam" value="abc" /> </rich:menuItem> <rich:menuItem onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"><h:outputText value="event item"/></rich:menuItem> @@ -13,7 +14,7 @@ <f:param name="cmdParam" value="hide" /> </rich:menuItem> <rich:menuSeparator /> - <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID" iconClass="#{style.iconClassA}" iconStyle="#{style.iconStyleA}" selectClass="#{style.selectClassA}" styleClass="#{style.styleClassA}" selectStyle="#{style.selectStyleA}" style="#{style.styleA}"> <f:param name="cmdParam" value="a" /> </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value=" b" reRender="cmInfoID"> @@ -22,8 +23,8 @@ <rich:menuItem icon="/pics/info.gif" value="c" reRender="cmInfoID"> <f:param name="cmdParam" value="c" /> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="d" reRender="cmInfoID"> - <f:param name="cmdParam" value="d" /> + <rich:menuItem icon="/pics/info.gif" reRender="cmInfoID"> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:menuItem> <rich:menuGroup value="menuGroup"> <rich:menuItem icon="/pics/fatal.gif" value="a" reRender="cmInfoID"> @@ -58,7 +59,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -124,7 +125,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -219,7 +220,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -260,7 +261,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -301,7 +302,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> @@ -344,7 +345,7 @@ </rich:menuItem> <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID"> </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID"> + <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" reRender="cmInfoID"> <f:param name="cmdParam" value="ajaxSingle" /> </rich:menuItem> <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID"> Modified: trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="contextMenuPropertySubviewID"> <a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton> <a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,22 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" > +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <f:view> <head> <title></title> + + </head> <body> - <h:form> + <h:panelGroup binding="#{pTComponent.component}"> + + <f:attribute name="var" value="body" /> + <h:form id="test"> + <rich:inputNumberSlider ></rich:inputNumberSlider> </h:form> + </h:panelGroup> + + <h:outputText value="#{pttc}" escape="true"></h:outputText> + </body> </f:view> </html> Added: trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,3 @@ + <rich:dataDefinitionList value="#{dataDefinitionList.arrDefault}" var="def"> + <h:outputText value="#{def}" /> + </rich:dataDefinitionList> Modified: trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,13 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListSubviewID"> <rich:dataDefinitionList id="ddListID" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}" rendered="#{dataDefinitionList.rendered}" title="#{dataDefinitionList.title}" dir="#{dataDefinitionList.dir}" - rows="#{dataDefinitionList.rows}"> + rows="#{dataDefinitionList.rows}" style="#{style.style}" styleClass="#{style.styleClass}" columnClasses="#{style.columnClasses}" rowClasses="#{style.rowClasses}"> <f:facet name="header"> <h:outputText value="Africa(header):" /> </f:facet> - <h:outputText value="#{arr.str0}" /> + <h:outputText value="#{arr.str0} " /> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="Africa(footer);" /> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="title" /> <h:inputText value="#{dataDefinitionList.title}" > Modified: trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,14 +1,13 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderSubviewID"> - <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" + <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" action="#{dfs.act}" actionListener="#{dfs.actListener}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" for="carList" forValRef="inventoryList.carInventory" - filterBy="getMileage" manualInput="true" storeResults="true" - trackStyleClass="track" width="400px" styleClass="slider-container" + filterBy="getMileage" manualInput="true" storeResults="true" width="400px" + styleClass="#{style.styleClass}" rangeStyleClass="#{style.rangeStyleClass}" trailerStyleClass="#{style.trailerStyleClass}" style="#{style.style}" fieldStyleClass="#{style.fieldStyleClass}" trackStyleClass="#{style.trackStyleClass}" handleStyleClass="#{style.handleStyleClass}" startRange="10000" endRange="60000" increment="10000" - rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" - handleStyleClass="handle" handleValue="10000" id="dfsID" + trailer="true" handleValue="10000" id="dfsID" onbeforedomupdate="#{event.onbeforedomupdate}" onchange="#{event.onchange}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" @@ -75,4 +74,11 @@ <h:outputText value="click reRender for update page(RF-1365)" /> <h:commandButton value="reRender" /> + <h:panelGrid columns="2"> + <a4j:commandButton value="action" rendered="actionDFSID" style=" width : 95px;"></a4j:commandButton> /> + <h:outputText id="actionDFSID" value="#{dfs.action}" /> + + <a4j:commandButton value="actionListener" rendered="actionListenerDFSID" style=" width : 95px;"></a4j:commandButton> /> + <h:outputText id="actionListenerDFSID" value="#{dfs.actionListener}" /> + </h:panelGrid> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Rendered:" /> <h:selectBooleanCheckbox value="#{dfs.rendered}" > Modified: trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,14 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListSubviewID"> - <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}" +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListSubviewID"> + <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}" rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}" - rows="#{dataOrderedList.rows}"> + rows="#{dataOrderedList.rows}" + columnClasses="#{style.columnClasses}" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" style="#{style.style}" styleClass="#{style.styleClass}" > <f:facet name="header"> <h:outputText value="Africa(header):" /> </f:facet> - <h:outputText value="#{arr.str0}" /> + <h:outputText value="#{arr.str0} " /> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> <f:facet name="footer"> <h:outputText value="Africa(footer);" /> </f:facet> Added: trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,4 @@ + +<rich:dataOrderedList value="#{dataOrderedList.defaultArr}" var="def"> + <h:outputText value="#{def}" /> +</rich:dataOrderedList> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="title" /> <h:inputText value="#{dataOrderedList.title}" > Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,9 +1,10 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataScrollerSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataScrollerSubviewID"> <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" var="dT" cellpadding="5px" rows="5" border="1"> <f:facet name="header"> - <rich:datascroller fastControls="#{dataScroller.fastControls}" + <rich:datascroller inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}" selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}" styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}" + fastControls="#{dataScroller.fastControls}" action="#{dataScroller.act}" actionListener="#{dataScroller.actListener}" align="#{dataScroller.align}" rendered="#{dataScroller.render}" limitToList="#{dataScroller.limitToList}" renderIfSinglePage="#{dataScroller.renderIfSinglePage}" @@ -20,7 +21,12 @@ <h:outputText value="#{dT.data0}" /> </h:column> <h:column> - <h:outputText value="#{dT.data1}" /> + <h:outputText value="#{dT.data1} " /> <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </h:column> </h:dataTable> + <h:panelGrid id="dataScrollerActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="dataScrollerActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{dataScroller.action}" /> + <h:outputText value="#{dataScroller.actionListener}" /> + </h:panelGrid> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="datascrollerPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="datascrollerPropertySubviewID"> <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> <h:commandButton action="#{dataScroller.RestoreArray}" Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="datascrollerStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="datascrollerStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataScroller.bTest1}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,68 +1,74 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataTableSubviewID"> - <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="showEvent('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" -onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}" -onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:facet name="caption"> - <h:outputText value="caption facet" /> - </f:facet> - <f:facet name="header"> - <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> - <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> - <h:outputText value="2-row head" /> - </rich:column> - <h:column rendered="#{dataTable.r2rendered}"> - <h:outputText value="head in UIColumn" /> - </h:column> - <rich:column breakBefore="true"> - <h:outputText value="2-d row head" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <f:facet name="footer"> - <h:outputText value="table foot" /> - </f:facet> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataTableSubviewID"> + <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" + captionClass="#{style.captionClass}" rowClasses="#{style.rowClasses}" headerClass="#{style.headerClass}" footerClass="#{style.footerClass}" styleClass="#{style.styleClass}" captionStyle="#{style.captionStyle}" columnClasses="#{style.columnClasses}" + onRowClick="#{event.onRowClick};alert('row #{key}');" rendered="#{dataTable.rendered}" + align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" + width="#{dataTable.width}" title="DataTableTite" onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" + onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" + onRowMouseUp="#{event.onRowMouseUp}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> + <f:facet name="caption"> + <h:outputText value="caption facet" /> + </f:facet> + <f:facet name="header"> <rich:columnGroup> - <rich:column id="mounth" styleClass="column" rowspan="2" headerClass="cheader" footerClass="cfooter"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.mounth}" /> + <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> + <h:outputText value="2-row head" /> </rich:column> - <rich:column styleClass="column" headerClass="cheader" footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.town}" /> + <h:column rendered="#{dataTable.r2rendered}"> + <h:outputText value="head in UIColumn" /> + </h:column> + <rich:column breakBefore="true"> + <h:outputText value="2-d row head" /> </rich:column> </rich:columnGroup> - <rich:column styleClass="column" headerClass="cheader" footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="table foot" /> + </f:facet> + <rich:columnGroup columnClasses="#{style.columnClassesA}" rowClasses="#{style.rowClassesA}" style="#{style.styleA}" styleClass="#{style.styleClassA}"> + <rich:column id="mounth" > + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.mounth}" /> </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onRowClick="#{event.onRowClick}" onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}"> - <f:facet name="header"> - <h:outputText value="facet(header)" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="facet(footer)" /> - </f:facet> - <rich:column id="name"> - <h:outputText value="#{detail.name}" /> - </rich:column> - <rich:column id="qty" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{detail.qty}" /> - </rich:column> - </rich:subTable> - <rich:column id="total" styleClass="total" colspan="2"> - <h:outputText value="#{dataTableID.total}" /> + <rich:column rendered="#{dataTable.r2rendered}"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + <h:outputText value="#{dataTableID.town}" /> </rich:column> - </rich:dataTable> + </rich:columnGroup> + <rich:column styleClass="#{style.styleClassA}" headerClass="#{style.headerClassA}" footerClass="#{style.footerClassA}" style="#{style.styleA}" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{dataTableID.day}" /> + </rich:column> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}" + columnClasses="#{style.columnClassesA}" footerClass="#{style.footerClassA}" headerClass="#{style.headerClassA}" rowClasses="#{style.rowClassesA}" onclick="#{event.onclick}" + ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onRowClick="#{event.onRowClick}" + onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" + onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" onRowMouseUp="#{event.onRowMouseUp}"> + <rich:column id="name"> + <h:outputText value="#{detail.name}" /> + </rich:column> + <rich:column id="qty" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{detail.qty}" /> + </rich:column> + </rich:subTable> + <rich:column id="total" footerClass="#{style.footerClassA}" headerClass="#{style.headerClassA}" style="#{style.styleA}" styleClass="#{style.styleClassA}" colspan="2"> + <h:outputText value="#{dataTableID.total}" /> + </rich:column> + </rich:dataTable> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataTablePropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataTablePropertySubviewID"> <h:panelGrid columns="2" style="top"> <h:outputText value="Align:"></h:outputText> <h:selectOneMenu value="#{dataTable.align}"> Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="StraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="StraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataTable.bTest1}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataDefinitionListSubviewID"> <a4j:outputPanel ajaxRendered="true"> <h:messages /> @@ -18,7 +18,7 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drag1"> <h:outputText value="#{type} - drag" /> - <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" + <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" actionListener="#{dndBean.actListenerDrag}" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" oncomplete="#{event.oncomplete}" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}"> </rich:dragSupport> </h:panelGrid> @@ -29,16 +29,22 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drop2"> <h:outputText value="#{type} - drop" /> - <rich:dropSupport reRender="dragValueText" + <rich:dropSupport reRender="dragValueText" actionListener="#{dndBean.actListenerDrop}" action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> </rich:dropSupport> </h:panelGrid> </h:column> </h:dataTable> + <h:panelGrid id="dndActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{dndBean.actionDrag}" /> + <h:outputText value="#{dndBean.actionDrop}" /> + <h:outputText value="#{dndBean.actionListenerDrag}" /> + <h:outputText value="#{dndBean.actionListenerDrop}" /> + </h:panelGrid> </h:panelGrid> - - <rich:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject"> + <rich:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject" style="#{style.style}" styleClass="#{style.styleClass}"> <f:facet name="single"> <f:verbatim>{marker} <b>{testDrag}</b> {label}</f:verbatim> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,12 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DropDownMenuSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DropDownMenuSubviewID"> <h:panelGrid columns="2"> <rich:spacer width="400px" height="400px"></rich:spacer> <rich:panel> <rich:dropDownMenu id="ddmId" disabled="#{dDMenu.disabledDDM}" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}" popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" - verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" + verticalOffset="#{dDMenu.verticalOffset}" styleClass="#{style.styleClass}" style="#{style.style}" event="#{dDMenu.event}" oncollapse="#{event.oncollapse}" onexpand="#{event.onexpand}" ongroupactivate="#{event.ongroupactivate}" onitemselect="#{event.onitemselect}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:menuItem icon="#{dDMenu.icon}" onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}!')" oncomplete="#{event.oncomplete}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}"> <h:outputText value="Item1(test events)" /> @@ -22,6 +22,14 @@ <rich:menuItem icon="#{dDMenu.icon}"> <h:outputText value="Item3" /> </rich:menuItem> + <rich:menuItem> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:menuItem> + <rich:menuSeparator/> + <rich:menuItem icon="/pics/info.gif" value="action" action="#{dDMenu.act}" reRender="cmInfoID"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{dDMenu.actListener}" reRender="cmInfoID"> + </rich:menuItem> <rich:menuSeparator /> <rich:menuItem icon="/pics/ajax_process.gif" iconDisabled="/pics/ajax_stoped.gif" disabled="#{dDMenu.disabled}"> <h:outputText value="Image"></h:outputText> @@ -52,4 +60,9 @@ </rich:dropDownMenu> </rich:panel> </h:panelGrid> + <h:panelGrid id="dndActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{dDMenu.action}" /> + <h:outputText value="#{dDMenu.actionListener}" /> + </h:panelGrid> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dropDownMenuPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dropDownMenuPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="HideDelay (ms):" /> <h:inputText value="#{dDMenu.hideDelay}"> Modified: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dropDownMenuStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dropDownMenuStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="effectSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="effectSubviewID"> <rich:panel id="indexID"> <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> Added: trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,15 @@ + +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="FileUploadSubviewID"> +<rich:fileUpload id="fileUploadID" disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}" +required="#{fileUpload.required}" requiredMessage="#{fileUpload.requiredMessage}" rendered="#{fileUpload.rendered}" +listHeight="#{fileUpload.listHeight}" listWidth="#{fileUpload.listHeight}" data="#{fileUpload.data}" +maxFilesQuantity="#{fileUpload.maxFilesQuantity}" fileUploadListener="#{fileUpload.fileUploadListener}"> + <f:facet name="progress"> + <rich:progressBar style="height: 5px; width: 250px;"> + </rich:progressBar> + </f:facet> + <f:facet name="label"> + <h:outputText value="{_KB}KB from {KB}KB uploaded :[ {mm}:{ss} ]"></h:outputText> + </f:facet> +</rich:fileUpload> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,12 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapSubviewID"> <rich:gmap id="gMapID" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}" warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}" enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}" gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" showGScaleControl="#{gmap.showGScaleControl}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" - gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" /> + gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="#{style.style}" styleClass="#{style.styleClass}" /> <h:panelGroup> <f:verbatim> Added: trunk/test-applications/facelets/src/main/webapp/Gmap/GmapDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="GmapPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="mapType"></h:outputText> <h:selectOneMenu value="#{gmap.mapType}" onchange="submit();"> Added: trunk/test-applications/facelets/src/main/webapp/InplaceInput/InplaceInput.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InplaceInput/InplaceInput.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/InplaceInput/InplaceInput.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,102 @@ + +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inplaceInputSubviewID"> +This is because such an error can easily be made at programming level, <br /> +and while invisible for the user who does not understand or cannot <br /> +acquire the source code, many of those +<rich:inplaceInput inputMaxLength="#{inplaceInput.inputMaxLength}" + inputWidth="#{inplaceInput.inputWidth}" + maxInputWidth="#{inplaceInput.maxInputWidth}" + minInputWidth="#{inplaceInput.minInputWidth}" + required="#{inplaceInput.required}" + requiredMessage="#{inplaceInput.requiredMessage}" + tabindex="#{inplaceInput.tabindex}" + editEvent="#{inplaceInput.editEvent}" + defaultLabel="#{inplaceInput.defaultLabel}" + controlsVerticalPosition="#{inplaceInput.controlsVerticalPosition}" + controlsHorizontalPosition="#{inplaceInput.controlsHorizontalPosition}" + value="#{inplaceInput.value}" + selectOnEdit="#{inplaceInput.selectOnEdit}" + showControls="#{inplaceInput.showControls}" + rendered="#{inplaceInput.rendered}" + immediate="#{inplaceInput.immediate}"> + </rich:inplaceInput> + are easy to exploit. <h:commandButton value="ok"></h:commandButton> + <h:panelGrid columns="2"> + <a4j:commandButton value="refresh" reRender="inplaceInputValueCLID"></a4j:commandButton> + <h:outputText id="inplaceInputValueCLID" + value="#{inplaceInput.valueCL}"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="2"> + <h:outputText value="value"></h:outputText> + <h:inputText id="inplaceInputValueID" value="#{inplaceInput.value}" onchange="submit();"> + </h:inputText> + + + <h:outputText value="defaultLabel"></h:outputText> + <h:inputText value="#{inplaceInput.defaultLabel}" onchange="submit();"> + </h:inputText> + + <h:outputText value="inputMaxLength"></h:outputText> + <h:inputText value="#{inplaceInput.inputMaxLength}" onchange="submit();"> + </h:inputText> + + <h:outputText value="inputWidth"></h:outputText> + <h:inputText value="#{inplaceInput.inputWidth}" onchange="submit();"> + </h:inputText> + + <h:outputText value="maxInputWidth"></h:outputText> + <h:inputText value="#{inplaceInput.maxInputWidth}" onchange="submit();"> + </h:inputText> + + <h:outputText value="minInputWidth"></h:outputText> + <h:inputText value="#{inplaceInput.minInputWidth}" onchange="submit();"> + </h:inputText> + + <h:outputText value="tabindex"></h:outputText> + <h:inputText value="#{inplaceInput.tabindex}" onchange="submit();"> + </h:inputText> + + <h:outputText value="editEvent"></h:outputText> + <h:inputText value="#{inplaceInput.editEvent}" onchange="submit();"> + </h:inputText> + + <h:outputText value="controlsVerticalPosition"></h:outputText> + <h:selectOneRadio value="#{inplaceInput.controlsVerticalPosition}" onchange="submit();"> + <f:selectItem itemLabel="top" itemValue="top"/> + <f:selectItem itemLabel="bottom" itemValue="bottom"/> + <f:selectItem itemLabel="center" itemValue="center"/> + </h:selectOneRadio> + + <h:outputText value="controlsHorizontalPosition"></h:outputText> + <h:selectOneRadio value="#{inplaceInput.controlsHorizontalPosition}" onchange="submit();"> + <f:selectItem itemLabel="right" itemValue="right"/> + <f:selectItem itemLabel="center" itemValue="center"/> + <f:selectItem itemLabel="left" itemValue="left"/> + </h:selectOneRadio> + + <h:outputText value="selectOnEdit"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.selectOnEdit}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="showControls"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.showControls}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.rendered}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="immediate"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.immediate}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="required"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.required}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage"></h:outputText> + <h:inputText value="#{inplaceInput.requiredMessage}" onchange="submit();"> + </h:inputText> + + </h:panelGrid> +</f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelect.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,103 @@ + +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inplaceSelectSubviewID"> +This is because such an error can easily be made at programming level, <br /> +and while invisible for the user who does not understand or cannot <br /> +acquire the source code, many of those +<rich:inplaceSelect + + tabindex="#{inplaceSelect.tabindex}" + editEvent="#{inplaceSelect.editEvent}" + maxSelectWidth="#{inplaceSelect.maxSelectWidth}" + minSelectWidth="#{inplaceSelect.minSelectWidth}" + selectWidth="#{inplaceSelect.selectWidth}" + defaultLabel="#{inplaceSelect.defaultLabel}" + controlsVerticalPosition="#{inplaceSelect.controlsVerticalPosition}" + controlsHorizontalPosition="#{inplaceSelect.controlsHorizontalPosition}" + value="#{inplaceSelect.value}" listWidth="#{inplaceSelect.listWidth}" + listHeight="#{inplaceSelect.listHeight}" + selectOnEdit="#{inplaceSelect.selectOnEdit}" + showControls="#{inplaceSelect.showControls}" + editOnTab="#{inplaceSelect.editOnTab}" + openOnEdit="#{inplaceSelect.openOnEdit}" + rendered="#{inplaceSelect.rendered}" + immediate="#{inplaceSelect.immediate}"> + <f:selectItem itemLabel="errors" itemValue="errors" /> + <f:selectItem itemLabel="fatals" itemValue="fatals" /> + <f:selectItem itemLabel="infos" itemValue="infos" /> + <f:selectItem itemLabel="passeds" itemValue="passeds" /> + <f:selectItem itemLabel="warns" itemValue="warns" /> + </rich:inplaceSelect> + are easy to exploit. + <h:panelGrid columns="2"> + <a4j:commandButton value="refresh" reRender="inplaceSelectValueCLID"></a4j:commandButton> + <h:outputText id="inplaceSelectValueCLID" + value="#{inplaceSelect.valueCL}"></h:outputText> + </h:panelGrid> + + <h:panelGrid columns="2"> + <h:outputText value="value"></h:outputText> + + + <h:outputText value="defaultLabel"></h:outputText> + <h:inputText value="#{inplaceSelect.defaultLabel}" + onchange="submit();"></h:inputText> + + <h:outputText value="editEvent"></h:outputText> + <h:inputText value="#{inplaceSelect.editEvent}" onchange="submit();"></h:inputText> + + <h:outputText value="selectWidth"></h:outputText> + <h:inputText value="#{inplaceSelect.selectWidth}" onchange="submit();"></h:inputText> + + <h:outputText value="maxSelectWidth"></h:outputText> + <h:inputText value="#{inplaceSelect.maxSelectWidth}" + onchange="submit();"></h:inputText> + + <h:outputText value="minSelectWidth"></h:outputText> + <h:inputText value="#{inplaceSelect.minSelectWidth}" + onchange="submit();"></h:inputText> + + <h:outputText value="listWidth"></h:outputText> + <h:inputText value="#{inplaceSelect.listWidth}" onchange="submit();"></h:inputText> + + <h:outputText value="listHeight"></h:outputText> + <h:inputText value="#{inplaceSelect.listHeight}" onchange="submit();"></h:inputText> + + <h:outputText value="controlsVerticalPosition"></h:outputText> + <h:selectOneRadio value="#{inplaceSelect.controlsVerticalPosition}" + onchange="submit();"> + <f:selectItem itemLabel="top" itemValue="top" /> + <f:selectItem itemLabel="bottom" itemValue="bottom" /> + <f:selectItem itemLabel="center" itemValue="center" /> + </h:selectOneRadio> + + <h:outputText value="controlsHorizontalPosition"></h:outputText> + <h:selectOneRadio value="#{inplaceSelect.controlsHorizontalPosition}" + onchange="submit();"> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="left" itemValue="left" /> + </h:selectOneRadio> + <h:outputText value="tabindex"></h:outputText> + <h:inputText value="#{inplaceSelect.tabindex}" onchange="submit();"></h:inputText> + + <h:outputText value="selectOnEdit"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceSelect.selectOnEdit}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="showControls"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceSelect.showControls}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="applyFromControlsOnly"></h:outputText> + <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> + </h:panelGrid><h:commandButton value="ok"></h:commandButton> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,7 +1,7 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderSubviewID"> <h:panelGrid columns="1"> - <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" + <rich:inputNumberSlider id="SliderId" barStyle="#{style.barStyle}" handleSelectedClass="#{style.handleSelectedClass}" inputStyle="#{style.inputStyle}" tipStyle="#{style.tipStyle}" style="#{style.style}" immediate="#{inputNumberSlider.immediate}" inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="#{inputNumberSlider.valueChangeListener}" required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}" @@ -9,8 +9,8 @@ inputSize="#{inputNumberSlider.inputSize}" maxValue="#{inputNumberSlider.maxValue}" minValue="#{inputNumberSlider.minValue}" rendered="#{inputNumberSlider.rendered}" showBoundaryValues="#{inputNumberSlider.showBoundaryValues}" step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}" - barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}" - handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}" + barClass="#{style.barClass}" tipClass="#{style.barClass}" inputClass="#{style.inputClass}" + handleClass="#{style.handleStyle}" styleClass="#{style.tipStyle}" maxlength="#{inputNumberSlider.maxlength}" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}" onslide="#{event.onslide}"> </rich:inputNumberSlider> Added: trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderPropertySubviewID"> <h:panelGrid columns="2" cellspacing="10px" border="1"> <h:outputText value="value" /> <h:inputText value="#{inputNumberSlider.value}"> Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSliderStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSlider.bTest1}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinner.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,13 +1,13 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSpinnerSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="inputNumberSpinnerSubviewID"> <h:messages></h:messages> <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" disabled="#{inputNumberSpinner.disabled}" maxValue="#{inputNumberSpinner.max}" minValue="#{inputNumberSpinner.min}" step="#{inputNumberSpinner.step}" rendered="#{inputNumberSpinner.rendered}" value="#{inputNumberSpinner.value}" - inputClass="#{inputNumberSpinner.inputStyle}" styleClass="#{inputNumberSpinner.style}" + inputClass="#{style.inputClass}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}" style="#{style.style}" enableManualInput="#{inputNumberSpinner.manualInput}" inputSize="#{inputNumberSpinner.inputSize}" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onblur="showEvent('onblurInputID', 'onblur work!')" + onmousedown="#{event.onmousedown}" onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onfocus="#{event.onfocus}" onselect="#{event.onselect}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ondownclick="#{event.ondownclick}" onupclick="#{event.onupclick}"></rich:inputNumberSpinner> <rich:spacer height="20px"></rich:spacer> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="iNSpinnerPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="iNSpinnerPropertySubviewID"> <h:panelGrid columns="2" cellpadding="10px" border="1"> <h:outputText value="Max: "></h:outputText> <h:inputText value="#{inputNumberSpinner.max}"> Modified: trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="iNSpinnerStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="iNSpinnerStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSpinner.bTest1}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="insertSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="insertSubviewID"> <h:messages /> <rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}"> Modified: trunk/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="InsertPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="InsertPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Highlight:" /> <h:selectOneMenu value="#{insert.highlight}"> Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,6 +1,7 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttleSubviewID"> - <rich:listShuttle id="listShuttleID" var="item" sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}" +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttleSubviewID"> + <rich:listShuttle id="listShuttleID" var="item" + sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}" bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}" copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}" fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}" converter="listShuttleConverter" @@ -77,5 +78,12 @@ </f:facet> <h:graphicImage value="#{item.str3}" /> </h:column> + + <rich:column> + <f:facet name="header"> + <h:outputText value="Link"></h:outputText> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:column> </rich:listShuttle> </f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttlePropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttlePropertySubviewID"> <h:panelGrid columns="2"> <h:column></h:column> <h:panelGroup> Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttleStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="listShuttleStraightforwardSubviewID"> <h:panelGrid columns="3"> <a4j:commandButton value="Show selection (reRender)" reRender="infoLSID"></a4j:commandButton> <h:column> Modified: trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="messageSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="messageSubviewID"> <rich:panel> <h:outputText value="Rich Message Demo:" /> Modified: trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Message/MessageProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="MessagePropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="MessagePropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="1." /> <h:selectOneMenu id="select1" value="#{message.select1}"> Modified: trunk/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="MessageStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="MessageStraightforwardSubviewID"> <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,11 +1,12 @@ + -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="modalPanelSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="modalPanelSubviewID"> <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> <f:selectItems value="#{richBean.listContainer}" /> </h:selectOneMenu> - <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" + <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" shadowDepth="#{modalPanel.shadowDepth}" @@ -29,12 +30,19 @@ <br /> <br /> </f:verbatim> - + + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> - ui:include src="${richBean.pathComponentContainer}" /> + <ui:include src="${richBean.pathComponentContainer}" /> </rich:modalPanel> <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show MP</a> Added: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="shadowDepth" /> <h:inputText value="#{modalPanel.shadowDepth}" > Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="modalPanelID,mpPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListSubviewID"> <a4j:outputPanel ajaxRendered="true"> <h:messages /> @@ -83,6 +83,13 @@ </f:facet> <h:graphicImage value="#{item.str3}" /> </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="Link"></h:outputText> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </h:column> </rich:orderingList> <h:panelGrid columns="3"> <h:column></h:column> Added: trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Enter quantity of lines" /> <h:panelGroup> Modified: trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="orderingListStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> Modified: trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="paint2DSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="paint2DSubviewID"> <rich:paint2D id="paint2dID" cacheable="#{paint2D.cacheable}" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}" Added: trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1 @@ +<rich:paint2D paint="#{paint2D.paint}" data="#{paintData}" width="200" height="200" /> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="Paint2DPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="Paint2DPropertySubviewID"> <h:panelGrid columns="2" cellpadding="5px" border="2"> <h:outputText value="Text"></h:outputText> <h:inputText value="#{paintData.text}"> Modified: trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="Paint2DStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="Paint2DStraightforwardSubviewID"> <rich:simpleTogglePanel switchType="client" opened="true" label="paint2D straightforward"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> Modified: trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,16 +1,5 @@ - -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="panelSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelSubviewID"> <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel styleClass="top"> - <f:facet name="header"> - <h:panelGroup> - <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> - </h:panelGroup> - - </f:facet> - - <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> - </rich:panel> <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> <f:facet name="header"> <h:outputText value="Header of the Panel"/> @@ -26,7 +15,7 @@ <h:panelGroup> <h:form> - <rich:panel + <rich:panel z onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" style="width:200px;" headerClass="hea2" bodyClass="bo3"> @@ -74,6 +63,7 @@ This is a panel with absolute position on the screen.<br /> Resize the browser's window for fun. </f:verbatim> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:panel> <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> Added: trunk/test-applications/facelets/src/main/webapp/Panel/PanelDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Panel/PanelDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Panel/PanelDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,7 @@ +<rich:panel styleClass="top"> + <f:facet name="header"> + <h:outputText value="default panel" /> + </f:facet> + + <h:outputText value="This is default panel. content here" /> +</rich:panel> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Panel/PanelProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PanelPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PanelPropertySubviewID"> <h:panelGrid columns="2" cellpadding="10px"> <h:outputText value="Title"></h:outputText> <h:inputText valueChangeListener="#{panel.makeTitle}"> Modified: trunk/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PanelStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="PanelStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panel.bTest1}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,13 +1,11 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarSubviewID"> - - <h:messages></h:messages> - +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarSubviewID"> <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="#{event.onclick}" onitemchange="#{event.onitemchange}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"> <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}"> <h:outputText value="Some text..."></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:panelBarItem> <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}" headerClass="#{panelBar.headerStyle}"> Added: trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,8 @@ +<rich:panelBar> + <rich:panelBarItem> + <h:outputText value="bar item 1" /> + </rich:panelBarItem> + <rich:panelBarItem> + <h:outputText value="bar item 2" /> + </rich:panelBarItem> +</rich:panelBar> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarPropertySubviewID"> <h:panelGrid columns="2" cellspacing="10px"> <h:outputText value="Label: "></h:outputText> <h:inputText valueChangeListener="#{panelBar.makeLabels}"> Modified: trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelBarStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelBar.bTest1}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,171 +1,183 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="panelMenuSubviewID"> -<rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" - expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" - iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" - iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" - iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" - iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" - iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" - iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" - iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" - onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ongroupcollapse="#{event.ongroupcollapse}" ongroupexpand="#{event.ongroupexpand}" onitemhover="#{event.onitemhover}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuSubviewID"> + <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" + expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" + iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" + iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" + iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" + iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" + iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" + iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" + iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ongroupcollapse="#{event.ongroupcollapse}" + ongroupexpand="#{event.ongroupexpand}" onitemhover="#{event.onitemhover}" onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> -<rich:panelMenuItem label="Item 1(Test event)" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onmouseup="#{event.onmouseup}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1(Test event)" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onmouseup="#{event.onmouseup}"></rich:panelMenuItem> -<rich:panelMenuItem><h:outputText value="select "></h:outputText> <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> - <f:selectItems value="#{richBean.listContainer}"/> -</h:selectOneMenu> -</rich:panelMenuItem> -<rich:panelMenuItem> - <ui:include src="${richBean.pathComponentContainer}"/> -</rich:panelMenuItem> -<rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> - <h:outputText value="Disabled Item"/> -</rich:panelMenuItem> -<rich:panelMenuItem label="Item Image"> - <h:graphicImage value="/pics/item.png"></h:graphicImage> -</rich:panelMenuItem> -<rich:panelMenuItem> - <h:outputText value="Item4"/> -</rich:panelMenuItem> -<rich:panelMenuItem label="CheckBox"> - <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> -</rich:panelMenuItem> -<rich:panelMenuItem> - <h:outputText value="CheckBox 2"></h:outputText> - <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> -</rich:panelMenuItem> -<rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputText value="select "></h:outputText> + <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> + <f:selectItems value="#{richBean.listContainer}" /> + </h:selectOneMenu> + </rich:panelMenuItem> + <rich:panelMenuItem> + <ui:include src="${richBean.pathComponentContainer}" /> + </rich:panelMenuItem> + <rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> + <h:outputText value="Disabled Item" /> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item Image"> + <h:graphicImage value="/pics/item.png"></h:graphicImage> + </rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputText value="Item4" /> + </rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:panelMenuItem> + <rich:panelMenuItem label="CheckBox"> + <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> + </rich:panelMenuItem> + <rich:panelMenuItem> + <h:outputText value="CheckBox 2"></h:outputText> + <h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox> + </rich:panelMenuItem> + <rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> -<rich:panelMenuGroup label="Group 1(expanded=true)" expanded="true"> - <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1(expanded=true)" expanded="true"> + <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> - <rich:panelMenuItem label="Imem 1_1"> - <h:inputText value="#{panelMenu.inputText}"></h:inputText> - </rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_1 (align)" align="#{panelMenu.align}"> + <rich:panelMenuItem label="Imem 1_1"> + <h:inputText value="#{panelMenu.inputText}"></h:inputText> + </rich:panelMenuItem> - <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 1_1_1"> - <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_1_1"> + <rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_1_2"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 4"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_1_2"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 4"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> - <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_2 (disabled, action)" disabled="true" onmousedown="alert('Disabled');"> + <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3"> - <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 1_3"> + <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group disabled" disabled="true"> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group disabled" disabled="true"> + </rich:panelMenuGroup> + </rich:panelMenuGroup> -</rich:panelMenuGroup> + </rich:panelMenuGroup> -<rich:panelMenuGroup label="Group 2 "> - <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group 2 "> + <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group 2_2"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 2_2"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> -</rich:panelMenuGroup> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> -<rich:panelMenuGroup label="Group 3"> - <rich:panelMenuItem label="Item 3_1"> - <f:verbatim> - <br/> - text <br/> - text <br/> + <rich:panelMenuGroup label="Group 3"> + <rich:panelMenuItem label="Item 3_1"> + <f:verbatim> + <br /> + text <br /> + text <br /> text </f:verbatim> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3_2"> - <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem> -</rich:panelMenuGroup> -</rich:panelMenu> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3_2"> + <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenu> -<f:verbatim> - <br/> - <br/> -</f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> -<h:outputText id="info" - value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> - -<f:verbatim> - <br/> -</f:verbatim> + <h:outputText id="info" + value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> +  + <f:verbatim> + <br /> + </f:verbatim> -<rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" - selectedChild="thisChild" styleClass="body"> - <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> - <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> + <rich:panelMenu id="panelMenuID2" expandMode="#{panelMenu.mode}" disabled="#{!panelMenu.disabled}" width="#{panelMenu.width}" + selectedChild="thisChild" styleClass="body"> + <rich:panelMenuGroup label="Group 1 (tabIdex, my Image)" tabindex="#{panelMenu.tabIndex}" align="#{panelMenu.align}"> + <rich:panelMenuGroup label="Group 1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_1_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item "></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_2 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuGroup label="Group 1_2_1 (tabIndex)" tabindex="#{panelMenu.tabIndex}"> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" disabled="true" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (iconDisabled)" disabled="true" iconDisabled="#{icon.iconItem}"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item "></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" - iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" + iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + </rich:panelMenuGroup> -  - <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> - <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> - <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> - <rich:panelMenuItem label="Item "></rich:panelMenuItem> - </rich:panelMenuGroup> +  + <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> + <rich:panelMenuGroup label="Group" iconCollapsed="triangleDown" iconExpanded="triangleUp" iconDisabled="triangle"> + <rich:panelMenuGroup label="Group" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem> + <rich:panelMenuItem label="Item "></rich:panelMenuItem> + </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenuGroup> -</rich:panelMenu> + <rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown" iconExpanded="chevronUp" iconDisabled="chevron"> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenuGroup> + </rich:panelMenu> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,8 @@ +<rich:panelMenu> + <rich:panelMenuItem label="item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="item 2"></rich:panelMenuItem> + <rich:panelMenuGroup label="gruop"> + <rich:panelMenuItem label="item 3"></rich:panelMenuItem> + <rich:panelMenuItem label="item 4"></rich:panelMenuItem> + </rich:panelMenuGroup> +</rich:panelMenu>> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Width"></h:outputText> <h:inputText value="#{panelMenu.width}"> Modified: trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="panelMenuStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelMenu.bTest1}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,12 +1,14 @@ +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListSubviewID"> -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListSubviewID"> - <rich:pickList id="pickListID" valueChangeListener="#{pickList.valueChangeListener}" - copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}" + <rich:pickList id="pickListID" value="#{pickList.value}" showButtonsLabel="#{pickList.showButtonLabels}" valueChangeListener="#{pickList.valueChangeListener}" + controlClass="#{style.controlClass}" listClass="#{style.listClass}" style="#{style.style}" styleClass="#{style.styleClass}" + copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}" disabled="#{pickList.copyControlLabel}" dir="#{pickList.dir}" immediate="#{pickList.immediate}" listsHeight="#{pickList.listsHeight}" moveControlsVerticalAlign="#{pickList.removeAllControlLabel}" removeAllControlLabel="#{pickList.removeAllControlLabel}" removeControlLabel="#{pickList.removeControlLabel}" rendered="#{pickList.rendered}" sourceListWidth="#{pickList.sourceListWidth}" title="#{pickList.title}" - switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}" size="#{pickList.size}" + switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}" size="#{pickList.size}" + required="#{pickList.required}" requiredMessage="#{pickList.requiredMessage}" onclick="#{event.onclick}" onblur="#{event.onblur}" onchange="#{event.onchange}" ondblclick="#{event.ondblclick}" onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" @@ -16,4 +18,9 @@ <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" /> <f:selectItems value="#{pickList.data}" /> </rich:pickList> + <h:panelGrid columns="2"> + <a4j:commandButton value="refresh" reRender="pickListvalueCLID"></a4j:commandButton> + <h:outputText id="pickListvalueCLID" value="#{pickList.valueCL}"></h:outputText> + </h:panelGrid> + </f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/PickList/PickListDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PickList/PickListDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/PickList/PickListDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,7 @@ +<rich:pickList> + <f:selectItem itemValue="Item 1" itemLabel="Item 1" /> + <f:selectItem itemValue="Item 2" itemLabel="Item 2" /> + <f:selectItem itemValue="Item 3" itemLabel="Item 3" /> + <f:selectItem itemValue="Item 4" itemLabel="Item 4" /> + <f:selectItem itemValue="Item 5" itemLabel="Item 5" /> +</rich:pickList> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,6 +1,12 @@ - -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListPropertySubviewID"> - <h:panelGrid columns="2"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListPropertySubviewID"> + <h:panelGrid columns="2"> + <a4j:commandButton reRender="pickListTargenID" value="refresh target"></a4j:commandButton> + <h:dataTable id="pickListTargenID" value="#{pickList.value}" var="list" border="1"> + <h:column> + <h:outputText value="#{list}"></h:outputText> + </h:column> + </h:dataTable> + <h:outputText value="title:"></h:outputText> <h:inputText value="#{pickList.title}" onchange="submit();"></h:inputText> @@ -48,9 +54,6 @@ <h:outputText value="size:"></h:outputText> <h:inputText value="#{pickList.size}" onchange="sumbit();"></h:inputText> - <h:outputText value="displayValueOnly:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.displayValueOnly}" onchange="submit();"></h:selectBooleanCheckbox> - <h:outputText value="rendered:"></h:outputText> <h:selectBooleanCheckbox value="#{pickList.rendered}" onchange="submit();"></h:selectBooleanCheckbox> @@ -58,6 +61,12 @@ <h:selectBooleanCheckbox value="#{pickList.immediate}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="required:"></h:outputText> + <h:selectBooleanCheckbox value="#{pickList.required}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage:"></h:outputText> + <h:inputText value="#{pickList.requiredMessage}" onchange="submit();"></h:inputText> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBar.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,14 +1,15 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="progressBarSubviewID"> - - <rich:progressBar id="progressBarID" - style="width: 450px; height: 19px;" value="#{progressBar.value}" +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="progressBarSubviewID"> +<rich:panelMenu> +<rich:panelMenuItem> + <rich:progressBar id="progressBarID" value="#{progressBar.value}" + style="width: 450px; height: 19px;#{style.style};" completeClass="#{style.completeClass}" finishClass="#{style.finishClass}" initialClass="#{style.initialClass}" remainClass="#{style.remainClass}" styleClass="#{style.styleClass}" mode="#{progressBar.mode}" enabled="#{progressBar.enabled}" actionListener="#{progressBar.actionListener}" interval="#{progressBar.interval}" action="#{progressBar.action}" maxValue="#{progressBar.maxValue}" minValue="#{progressBar.minValue}" rendered="#{progressBar.rendered}" reRender="loadInfoPBID,valuePBID" - progressVar="progressVar" parameters="params:'%'" + progressVar="progressVar" parameters="params:'%'" reRenderAfterComplete="completedPBID" ignoreDupResponses="#{progressBar.ignoreDupResponses}" dualColoredLabel="#{progressBar.dualColoredLabel}" @@ -30,7 +31,10 @@ <h:outputText id="loadInfoPBID" value="[Load: #{progressBar.loadInfo}] " /> <h:graphicImage value="/pics/ajax_process.gif" /> + </rich:progressBar> + </rich:panelMenuItem> + </rich:panelMenu> <f:verbatim> <br /> </f:verbatim> @@ -39,8 +43,8 @@ <h:panelGrid columns="1"> <a4j:commandButton value="getValue" onclick="alert($('formID:progressBarSubviewID:progressBarID').component.getValue())"></a4j:commandButton> - <a4j:commandLink value="doShow" - onclick="$('formID:progressBarSubviewID:progressBarID').component.doShow(event)"></a4j:commandLink> + <a4j:commandLink value="setLabel" + onclick="$('formID:progressBarSubviewID:progressBarID').component.setLabel('setLabel work')"></a4j:commandLink> <a4j:commandLink value="disable" onclick="$('formID:progressBarSubviewID:progressBarID').component.disable();"></a4j:commandLink> <a4j:commandLink value="enable" Added: trunk/test-applications/facelets/src/main/webapp/ProgressBar/ProgressBarDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/RichTest/menu.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> - <f:subview id="menuTestID"> + <f:subview xmlns:ui="http://java.sun.com/jsf/facelets" id="menuTestID"> <rich:toolBar itemSeparator="disc"> <rich:dropDownMenu value="File" event="onmouseover" submitMode="ajax"> <rich:menuItem value="Item 1" ></rich:menuItem> Modified: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,7 +1,36 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTableSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTableSubviewID"> + <h:panelGrid columns="6" border="1" style="font-size:12px"> + <h:outputText value="#1"></h:outputText> + <h:outputText value="#2"></h:outputText> + <h:outputText value="#3"></h:outputText> + <h:outputText value="#4"></h:outputText> + <h:outputText value="#5"></h:outputText> + <h:outputText value="#6"></h:outputText> + + <h:panelGrid columns="1" title="1"> + <h:outputText value="sortExpression"/> + <h:outputText value="sortable='true'"/> + </h:panelGrid> + <h:panelGrid columns="1" title="2"> + <h:outputText value="sortExpression"/> + <h:outputText value="sortable='false'"/> + </h:panelGrid> + <h:panelGrid columns="1" title="3"> + <h:outputText value="sortExpression"/> + </h:panelGrid> + <h:panelGrid columns="1" title="4"> + <h:outputText value="sortExpression"/> + </h:panelGrid> + <h:panelGrid columns="1" title="5"> + <h:outputText value="sortExpression"/> + </h:panelGrid> + <h:panelGrid columns="1" title="6"> + <h:outputText value=""/> + </h:panelGrid> + </h:panelGrid> <rich:scrollableDataTable id="sdt" var="sdt" rowKeyVar="key" onRowDblClick="alert('row:#{key}')" - ajaxSingle="#{scrollableDT.ajaxSingle}" + ajaxSingle="#{scrollableDT.ajaxSingle}" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" height="#{scrollableDT.height}" hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" @@ -9,13 +38,13 @@ first="#{scrollableDT.first}" ignoreDupResponses="#{scrollableDT.ignoreDupResponses}" bypassUpdates="#{scrollableDT.bypassUpdates}" rendered="#{scrollableDT.rendered}" limitToList="#{scrollableDT.limitToList}" - timeout="#{scrollableDT.timeout}" - selection="#{scrollableDT.selection}" + timeout="#{scrollableDT.timeout}" sortMode="#{scrollableDT.sortMode}" + selection="#{scrollableDT.selection}" eventsQueue="myEventsQueue" + captionClass="#{style.captionClass}" columnClasses="#{style.columnClasses}" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" activeClass="#{style.activeClass}" styleClass="#{style.styleClass}" style="#{style.style}" selectedClass="#{style.selectedClass}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" onRowClick="#{event.onRowClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseUp="#{event.onRowMouseUp}" onselectionchange="#{event.onselectionchange}"> <f:facet name="header"> <h:outputText value="facet header"></h:outputText> </f:facet> - <rich:column sortExpression="#{sdt.int0}" sortable="true"> <f:facet name="header"><h:outputText value="#"/></f:facet> <h:outputText value="#{sdt.int0}"></h:outputText> @@ -52,6 +81,16 @@ <f:facet name="footer"><h:outputText value="Select"></h:outputText> </f:facet> </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Link"></h:outputText> + </f:facet> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + <f:facet name="footer"> + <h:outputText value="Link"></h:outputText> + </f:facet> + </rich:column> + <f:facet name="footer"> <h:outputText value="facet footer"></h:outputText> </f:facet> Added: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,52 +1,58 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTablePropertySubviewID"> - <h:panelGrid columns="2"> - <h:outputText value="length:"></h:outputText> - <h:inputText value="#{scrollableDT.dataLength}" onchange="submit();"> - </h:inputText> - - <h:outputText value="rows:" /> - <h:inputText value="#{scrollableDT.rows}" onchange="submit();"> - </h:inputText> - - <h:outputText value="first:"></h:outputText> - <h:inputText value="#{scrollableDT.first}" onchange="submit();"> - </h:inputText> - - <h:outputText value="timeout"></h:outputText> - <h:inputText value="#{scrollableDT.timeout}" onchange="submit();"> - </h:inputText> - - <h:outputText value="width:" /> - <h:inputText value="#{scrollableDT.width}" onchange="submit();"> - </h:inputText> - - <h:outputText value="height:"></h:outputText> - <h:inputText value="#{scrollableDT.height}" onchange="submit();"> - </h:inputText> - - <h:outputText value="frozenColCount"></h:outputText> - <h:inputText value="#{scrollableDT.frozenColCount}" onchange="submit();"> - </h:inputText> - - <h:outputText value="limitToList"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.limitToList}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="bypassUpdates:"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.bypassUpdates}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="ajaxSingle:"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{scrollableDT.rendered}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="hideWhenScrolling:" /> - <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" onchange="submit();"> - </h:selectBooleanCheckbox> - </h:panelGrid> - <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTablePropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="length:"></h:outputText> + <h:inputText value="#{scrollableDT.dataLength}" onchange="submit();"> + </h:inputText> + + <h:outputText value="rows:" /> + <h:inputText value="#{scrollableDT.rows}" onchange="submit();"> + </h:inputText> + + <h:outputText value="first:"></h:outputText> + <h:inputText value="#{scrollableDT.first}" onchange="submit();"> + </h:inputText> + + <h:outputText value="timeout"></h:outputText> + <h:inputText value="#{scrollableDT.timeout}" onchange="submit();"> + </h:inputText> + + <h:outputText value="width:" /> + <h:inputText value="#{scrollableDT.width}" onchange="submit();"> + </h:inputText> + + <h:outputText value="height:"></h:outputText> + <h:inputText value="#{scrollableDT.height}" onchange="submit();"> + </h:inputText> + + <h:outputText value="frozenColCount"></h:outputText> + <h:inputText value="#{scrollableDT.frozenColCount}" onchange="submit();"> + </h:inputText> + + <h:outputText value="limitToList"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.limitToList}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="bypassUpdates:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.bypassUpdates}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="ajaxSingle:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{scrollableDT.rendered}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="hideWhenScrolling:" /> + <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="sortMode" /> + <h:selectOneRadio value="#{sortingAndFiltering.sortMode}" onchange="submit();"> + <f:selectItem itemLabel="single" itemValue="single" /> + <f:selectItem itemLabel="multy" itemValue="multy" /> + </h:selectOneRadio> + </h:panelGrid> + <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,8 +1,9 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="separatorSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="separatorSubviewID"> <h:outputText value="Some text one..." styleClass="text"></h:outputText> <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" - title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" + title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" + style="#{style.style}" styleClass="#{style.styleClass}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> Added: trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,2 @@ + +<rich:separator width="150" height="10"></rich:separator> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="SeparatorPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="SeparatorPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Width (px or %): "></h:outputText> <h:inputText value="#{separator.width}"> Modified: trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="SeparatorStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="SeparatorStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{separator.bTest1}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="simpleTogglePanelSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="simpleTogglePanelSubviewID"> <rich:simpleTogglePanel id="stpIncludeID" switchType="client"> <f:facet name="closeMarker"> @@ -14,9 +14,10 @@ </h:selectOneMenu> <ui:include src="${richBean.pathComponentContainer}"/> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}" width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" - onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> + style="#{style.style}" styleClass="#{style.styleClass}" + oncollapse="#{event.oncollapse}" onbeforedomupdate="#{event.onbeforedomupdate}" onexpand="#{event.onexpand}" opened="#{event.opened}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="closeMarker"> <h:outputText value="Close It"/> </f:facet> @@ -31,15 +32,16 @@ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... </f:verbatim> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" + <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}" height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" opened="false" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}" focus="#{simpleTogglePanel.focus}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> @@ -61,6 +63,10 @@ </h:panelGrid> </rich:simpleTogglePanel> </rich:simpleTogglePanel> - + <h:panelGrid id="simpleTogglePanelActionID" columns="1"> + <a4j:commandButton value="Show action" reRender="simpleTogglePanelActionID" style=" width : 95px;"></a4j:commandButton> + <h:outputText value="#{simpleTogglePanel.action}" /> + <h:outputText value="#{simpleTogglePanel.actionListener}" /> + </h:panelGrid> <rich:spacer height="20px"></rich:spacer> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,10 @@ + <rich:simpleTogglePanel switchType="client"> + <f:facet name="closeMarker"> + <h:outputText value="Close it"/> + </f:facet> + + <f:facet name="openMarker"> + <h:outputText value="Open it"/> + </f:facet> + <h:outputText value="default simpleTogglePanel" /> + </rich:simpleTogglePanel> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpPropertySubviewID"> <h:panelGrid columns="2" border="1"> <h:outputText value="Width:"> </h:outputText> Modified: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{simpleTogglePanel.bTest1}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> Added: trunk/test-applications/facelets/src/main/webapp/SortingAndFiltering/SortingAndFiltering.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SortingAndFiltering/SortingAndFiltering.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/SortingAndFiltering/SortingAndFiltering.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,173 @@ +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="sortingAndFilteringSubviewID"> + <h:panelGrid columns="9" border="1" style="font-size:12px"> + <h:outputText value="#1"></h:outputText> + <h:outputText value="#2"></h:outputText> + <h:outputText value="#3"></h:outputText> + <h:outputText value="#4"></h:outputText> + <h:outputText value="#5"></h:outputText> + <h:outputText value="#6"></h:outputText> + <h:outputText value="#7"></h:outputText> + <h:outputText value="#8"></h:outputText> + <h:outputText value="#9"></h:outputText> + <h:panelGrid columns="1" title="1"> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> + <h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText> + <h:outputText value="filterBy"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="2"> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> + <h:outputText value="filterBy"></h:outputText> + <h:outputText value="filterEvent='ondblclick'" /> + </h:panelGrid> + <h:panelGrid columns="1" title="3"> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText> + <h:outputText value="filterMethod" /> + </h:panelGrid> + <h:panelGrid columns="1" title="4"> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="5"> + <h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText> + <h:outputText value="comparator: sort by length" /> + </h:panelGrid> + <h:panelGrid columns="1" title="6"> + <h:outputText value=" filterExpression='data > filterValue"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="7"> + <h:outputText value="filterValue='/pics/error.gif'"></h:outputText> + </h:panelGrid> + <h:panelGrid columns="1" title="8"> + <h:outputText value="filterBy" /> + </h:panelGrid> + <h:panelGrid columns="1" title="9"> + <h:outputText value="sortBy"></h:outputText> + </h:panelGrid> + </h:panelGrid> + <rich:dataTable id="dataTableSAFID" value="#{sortingAndFiltering.data}" var="data"> + <rich:column sortBy="#{data.int0}" selfSorted="#{sortingAndFiltering.selfSorted}" sortOrder="#{sortingAndFiltering.sortOrder}" + filterBy="#{data.int0}"> + <f:facet name="header"> + <h:outputText value="#1" /> + </f:facet> + <h:outputText value="#{data.int0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#1" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.int1}" sortBy="#{data.int1}" selfSorted="#{sortingAndFiltering.selfSorted}" + filterEvent="ondblclick"> + <f:facet name="header"> + <h:outputText value="#2" /> + </f:facet> + <h:outputText value="#{data.int1}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#2" /> + </f:facet> + </rich:column> + <rich:column sortBy="#{data.str0}" sortOrder="#{sortingAndFiltering.sortOrder}" + filterMethod="#{sortingAndFiltering.filterMethod}"> + <f:facet name="header"> + <h:outputText value="#3" /> + </f:facet> + <h:outputText value="#{data.str0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#3" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.int2}" selfSorted="#{sortingAndFiltering.selfSorted}"> + <f:facet name="header"> + <h:outputText value="#4" /> + </f:facet> + <h:outputText value="#{data.int2}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#4" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.str1}" sortOrder="#{sortingAndFiltering.sortOrder}" comparator="#{sortingAndFiltering.comparator}"> + <f:facet name="header"> + <h:outputText value="#5" /> + </f:facet> + <h:outputText value="#{data.str1}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#5" /> + </f:facet> + </rich:column> + <rich:column filterExpression="#{data.int3 > sortingAndFiltering.filterValue}"> + <f:facet name="header"> + <h:outputText value="#6" /> + </f:facet> + <h:outputText value="#{data.int3}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#6" /> + </f:facet> + </rich:column> + <rich:column filterValue="/pics/error.gif"> + <f:facet name="header"> + <h:outputText value="#7" /> + </f:facet> + <h:graphicImage value="#{data.str2}"></h:graphicImage> + <h:outputText value="#{data.str2}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#7" /> + </f:facet> + </rich:column> + <rich:column filterBy="#{data.str3}"> + <f:facet name="header"> + <h:outputText value="#8" /> + </f:facet> + <h:commandButton value="#{data.str3}"></h:commandButton> + <f:facet name="footer"> + <h:outputText value="#8" /> + </f:facet> + </rich:column> + <rich:column sortBy="#{data.bool0}"> + <f:facet name="header"> + <h:outputText value="#9" /> + </f:facet> + <h:selectBooleanCheckbox value="#{data.bool0}"></h:selectBooleanCheckbox> + <f:facet name="footer"> + <h:outputText value="#9" /> + </f:facet> + </rich:column> + </rich:dataTable> + + <rich:dataTable id="dataTableFilterValueID" value="#{sortingAndFiltering.data}" var="data"> + <rich:column filterValue="/pics/error.gif"> + <f:facet name="header"> + <h:outputText value="#7(filterValue='/pics/error.gif)'" /> + </f:facet> + <h:graphicImage value="#{data.str2}"></h:graphicImage> + <h:outputText value=" [#{data.str2}]"></h:outputText> + <f:facet name="footer"> + <h:outputText value="#7" /> + </f:facet> + </rich:column> + </rich:dataTable> + + <h:panelGrid columns="2"> + <h:outputText value="filterMethod (#3):"></h:outputText> + <h:inputText value="#{sortingAndFiltering.filterInput}" onchange="submit();" /> + + <h:outputText value="filterValue (#6):"></h:outputText> + <h:inputText value="#{sortingAndFiltering.filterValue}" onchange="submit();" /> + + <h:outputText value="sortMode" /> + <h:selectOneRadio value="#{sortingAndFiltering.sortMode}" onchange="submit();"> + <f:selectItem itemLabel="single" itemValue="single" /> + <f:selectItem itemLabel="multy" itemValue="multy" /> + </h:selectOneRadio> + + <h:outputText value="selfSorted" /> + <h:selectBooleanCheckbox value="#{sortingAndFiltering.selfSorted}" onchange="submit();" /> + + <h:outputText value="sortOrder" /> + <h:selectOneRadio value="#{sortingAndFiltering.currentSortOrder}" onchange="submit();"> + <f:selectItem itemLabel="DESCENDING" itemValue="DESCENDING" /> + <f:selectItem itemLabel="UNSORTED" itemValue="UNSORTED" /> + <f:selectItem itemLabel="ASCENDING" itemValue="ASCENDING" /> + </h:selectOneRadio> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerSubviewID"> <style type="text/css"> .text { font-size: 20px; @@ -10,13 +10,10 @@ } </style> <h:outputText value="Some text one..." styleClass="text"></h:outputText> + <rich:spacer id="spacerId" title="#{spacer.title}" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" - styleClass="#{spacer.style}" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" - onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" - onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"> + styleClass="#{spacer.style}" style="#{style.style}" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1 @@ +<rich:spacer width="100" height="50" style="background-color: red"></rich:spacer> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,26 +1,27 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerPropertySubviewID"> - <h:panelGrid columns="2"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{spacer.width}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{spacer.width}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{spacer.height}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> - - <h:outputText value="title:"></h:outputText> - <h:inputText value="#{spacer.title}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{spacer.height}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> + <h:outputText value="title:"></h:outputText> + <h:inputText value="#{spacer.title}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> - <h:outputText value="Style" /> - <a4j:commandButton id="btn" action="#{spacer.doStyle}" value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> - </h:panelGrid> + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Style" /> + <a4j:commandButton id="btn" action="#{spacer.doStyle}" + value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="spacerStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{spacer.bTest1}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionBoxSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionBoxSubviewID"> <h:messages showDetail="true" /> <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter <br /> @@ -8,11 +8,12 @@ <rich:suggestionbox id="suggestionBoxId" eventsQueue="myEventsQueue" ajaxSingle="#{sb.ajaxSingle}" dir="#{sb.dir}" rendered="#{sb.rendered}" requestDelay="#{sb.requestDelay}" selfRendered="#{sb.selfRendered}" value="#{sb.value}" for="text" var="result" fetchValue="#{result.text}" suggestionAction="#{sb.autocomplete}" width="#{sb.width}" height="#{sb.height}" - border="#{sb.border}" zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" cellpadding="#{sb.cellpadding}" + border="#{sb.border}" zindex="#{sb.zindex}" rules="#{sb.rules}" cellpadding="#{sb.cellpadding}" cellspacing="#{sb.cellspacing}" first="#{sb.first}" minChars="#{sb.minchars}" tokens="#{sb.tokens}" bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}" shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="nothingLabel work! " - oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}"> + entryClass="#{style.entryClass}" popupClass="#{style.popupClass}" popupStyle="#{style.popupStyle}" style="#{style.style}" styleClass="#{style.styleClass}" selectedClass="#{style.selectedClass}" rowClasses="#{style.rowClasses}" + oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}"> <h:column> <h:outputText value="#{result.city}" /> </h:column> @@ -22,7 +23,9 @@ <h:column> <h:outputText value="#{result.flag}" /> </h:column> - + <h:column> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </h:column> </rich:suggestionbox> <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionboxPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionboxPropertySubviewID"> <h:panelGrid columns="2" cellpadding="5px"> <h:outputText value="z-index"></h:outputText> Modified: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionboxStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="suggestionboxStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{sb.bTest1}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,51 +1,35 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="tabPanelSubviewID"> - <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" - height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" - headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" - disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" - contentClass="#{tabPanel.contentStyle}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" - onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" - onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" - onmouseup="#{event.onmouseup}"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelSubviewID"> + <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" + contentStyle="#{style.contentStyle}" headerClass="#{style.headerClass}" style="#{style.style}" styleClass="#{style.styleClass}" tabClass="#{style.tabClass}" + height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" + headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" + disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" + contentClass="#{tabPanel.contentStyle}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" onclick="#{event.onclick}" - oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" - onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" - ontableave="#{event.ontableave}"> - <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> - </rich:tab> - <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" onclick="#{event.onclick}" - oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" - onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" - ontableave="#{event.ontableave}"> - <f:facet name="header"> - <h:outputText value="client switchType from facet" /> - </f:facet> - <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> - </rich:tab> - <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" onclick="#{event.onclick}" - oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" - onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" - ontableave="#{event.ontableave}"> - <h:outputText - value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" ontableave="#{event.ontableave}"> + <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </rich:tab> + <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" ontableave="#{event.ontableave}"> + <f:facet name="header"> + <h:outputText value="client switchType from facet" /> + </f:facet> + <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> + </rich:tab> + <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" ontableave="#{event.ontableave}"> + <h:outputText + value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." /> - </rich:tab> - <rich:tab id="tabInclude" label="test containers"> - <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> - <f:selectItems value="#{richBean.listContainer}" /> - </h:selectOneMenu> - <ui:include src="${richBean.pathComponentContainer}" /> - </rich:tab> - </rich:tabPanel> + </rich:tab> + </rich:tabPanel> - <rich:spacer height="20px"></rich:spacer> + <rich:spacer height="20px"></rich:spacer> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,7 @@ +<rich:tabPanel> + <rich:tab label="tab1"> + <h:outputText value="tab 1" /> + </rich:tab> + <rich:tab label="tab2"> + </rich:tab> +</rich:tabPanel> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelStraightforwardSubviewID"> <h:panelGrid columns="2" cellspacing="10px"> <h:outputText value="Width (px or %):"></h:outputText> <h:inputText value="#{tabPanel.width}" onchange="submit();" /> Modified: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tabPanelPropertySubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,16 +1,16 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="togglePanelSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelSubviewID"> - <rich:togglePanel id="panelIncludeID" switchType="#{togglePanel.switchType}" initialState="blankInclude" stateOrder="blankInclude,blank" - style="width:300px!important;" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" styleClass="#{style.styleClass}" style="width:300px!important;#{style.style};" + onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:facet name="blankInclude"> + <f:facet name="blank"> <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_blankInclude" for="togglePanelSubviewID:panelIncludeID"> + <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID:panel1"> <h:outputText value="Expand" style="font-weight: bold;" /> <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> </rich:toggleControl> @@ -19,158 +19,129 @@ </rich:panel> </f:facet> - <f:facet name="include"> + <f:facet name="asus"> <rich:panel style="overflow: auto"> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_include" for="togglePanelSubviewID:panelIncludeID"> + <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1"> <h:outputText value="Collapse" style="font-weight: bold;" /> <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> - <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> - <f:selectItems value="#{richBean.listContainer}" /> - </h:selectOneMenu> - <ui:include src="${richBean.pathComponentContainer}"/> - </rich:panel> - </f:facet> - </rich:togglePanel> - - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px!important;" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:facet name="blank"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID:panel1"> - <h:outputText value="Expand" style="font-weight: bold;" /> - <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - </rich:panel> - </f:facet> - - <f:facet name="asus"> - <rich:panel style="overflow: auto"> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1"> - <h:outputText value="Collapse" style="font-weight: bold;" /> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" /> - <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> - <f:verbatim> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: NVIDIA GeForce Go 7300<br /> Drive: DVD- RW DL<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> - </rich:togglePanel> + </f:verbatim> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> + </h:panelGroup> + </h:panelGrid> + </rich:panel> + </f:facet> + </rich:togglePanel> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"> - <f:facet name="asus"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_1" for="togglePanelSubviewID:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" /> - <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> - <f:verbatim> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" + onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}"> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_1" for="togglePanelSubviewID:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: NVIDIA GeForce Go 7300<br /> Drive: DVD- RW DL<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> + </f:verbatim> + </h:panelGroup> + </h:panelGrid> + </rich:panel> + </f:facet> - <f:facet name="benq"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_2" for="togglePanelSubviewID:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;"> - <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg" /> - <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" /> - <f:verbatim> + <f:facet name="benq"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_2" for="togglePanelSubviewID:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;"> + <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" /> + <f:verbatim> Processor: Core Duo T2250 (1.73GHz)<br /> RAM: 1024 Mb<br /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: ATI Mobility Radeon X 200<br /> Drive: DVD- RW D<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> + </f:verbatim> + </h:panelGroup> + </h:panelGrid> + </rich:panel> + </f:facet> - <f:facet name="toshiba"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_3" for="togglePanelSubviewID:panel2"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;"> - <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg" /> - <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" /> - <f:verbatim> + <f:facet name="toshiba"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_3" for="togglePanelSubviewID:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;"> + <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" /> + <f:verbatim> Processor: Intel Core Duo T2250 - 1.73GHz<br /> RAM: 1024 Mb<br /> HDD: 100 Gb<br /> Screen: 15.4 WXGA<br /> Video: Intel Graphics Media 950<br /> Drive: DVD- RW DL<br /> - </f:verbatim> - </h:panelGroup> - </h:panelGrid> - </rich:panel> - </f:facet> - </rich:togglePanel> + </f:verbatim> + </h:panelGroup> + </h:panelGrid> + </rich:panel> + </f:facet> + </rich:togglePanel> - <ui:debug hotkey="L"></ui:debug> + <ui:debug hotkey="L"></ui:debug> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,14 @@ + <rich:togglePanel switchType="client" stateOrder="closed,tip1"> + + <f:facet name="closed"> + <rich:toggleControl> + <h:graphicImage style="border-width:0" value="/pics/ajax_process.gif" /> + </rich:toggleControl> + </f:facet> + + <f:facet name="tip1"> + <rich:toggleControl> + <h:graphicImage style="border-width:0" value="/pics/ajax_stoped.gif" /> + </rich:toggleControl> + </f:facet> + </rich:togglePanel> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelPropertySubviewID"> <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> <h:outputText value="InitialState:"></h:outputText> <h:selectOneRadio value="#{togglePanel.initialState}"> Modified: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="togglePanelStraightforwardSubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{togglePanel.bTest1}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolBarSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolBarSubviewID"> <h:messages></h:messages> <rich:toolBar id="toolBarId" width="#{toolBar.width}" @@ -7,7 +7,7 @@ itemSeparator="#{toolBar.itemSeparator}" contentClass="#{toolBar.contentStyle}" separatorClass="#{toolBar.separatorStyle}" - contentStyle="contentStyle" style="style" styleClass="styleClass"> + contentStyle="contentStyle" style="#{style.style}" styleClass="#{style.styleClass}"> <h:outputText value="ToolBar" style="font-style: italic"></h:outputText> <rich:toolBarGroup> Added: trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,4 @@ +<rich:toolBar> +<h:outputText value="File" /> +<h:outputText value="Edit" /> +</rich:toolBar> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolBarPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolBarPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="Image location:"></h:outputText> <h:selectOneRadio value="#{toolBar.location}"> Modified: trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,13 +1,7 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets" id="tooltipSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="tooltipSubviewID"> <h:messages></h:messages> - <h:outputText value="DEFAULT VALUE:"></h:outputText> - - <f:verbatim> - <br/> - </f:verbatim> - <h:inputText value="Text" id="inp1" size="50"> <rich:toolTip id="toolTipID" value="toolTip for input text" > <f:facet name="defaultContent"> @@ -42,12 +36,13 @@ </f:verbatim> <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" event="#{tooltip.event}" + <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" styleClass="#{style.styleClass}" style="#{style.style}" hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" - direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" - onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}"> + direction="#{tooltip.direction}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}" + event="#{tooltip.event}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}"> <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink> </rich:toolTip> </rich:panel> @@ -58,7 +53,7 @@ <f:selectItems value="#{richBean.listContainer}"/> </h:selectOneMenu> <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="includeToolTIpID" followMouse="false" layout="block" hideDelay="2000" showDelay="0" value="test include"> + <rich:toolTip id="includeToolTIpID" hideDelay="5000" showDelay="0" value="test include"> <ui:include src="${richBean.pathComponentContainer}"/> </rich:toolTip> </rich:panel> Added: trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,4 @@ + +<h:outputText value="Default tooltip!"> + <rich:toolTip value="tooltip"></rich:toolTip> +</h:outputText> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolTipStraightforwardSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolTipStraightforwardSubviewID"> <h:panelGrid columns="2"> <h:outputText value="Text:"></h:outputText> <h:inputText value="#{tooltip.value}"> Modified: trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolTipPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="toolTipPropertySubviewID"> <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> Modified: trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,10 +1,10 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="treeSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="treeSubviewID"> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> - <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" + <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" selectedClass="#{style.selectedClass}" styleClass="#{style.styleClass}" style="#{style.style}" highlightedClass="#{style.highlightedClass}" nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" changeExpandListener="#{bean.onExpand}" nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;" onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode" Added: trunk/test-applications/facelets/src/main/webapp/Tree/TreeDefault.xhtml =================================================================== Modified: trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,4 +1,4 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="treePropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="treePropertySubviewID"> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthSubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthSubviewID"> <h:panelGrid columns="2"> <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" Added: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1 @@ +<rich:virtualEarth></rich:virtualEarth> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,5 @@ -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthPropertySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthPropertySubviewID"> <h:panelGrid columns="2"> <h:outputText value="lat(-97 < x < 97):"></h:outputText> <h:inputText value="#{virtualEarth.lat}" onchange="submit();"></h:inputText> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-FileUpload.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-FileUpload.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-FileUpload.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>fileUpload</managed-bean-name> + <managed-bean-class>fileUpload.FileUpload</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceInput.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>inplaceInput</managed-bean-name> + <managed-bean-class>inplaceInput.InplaceInput</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-InplaceSelect.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>inplaceSelect</managed-bean-name> + <managed-bean-class>inplaceSelect.InplaceSelect</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + </faces-config> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Options.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Options.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Options.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>option</managed-bean-name> + <managed-bean-class>rich.Options</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>sortingAndFiltering</managed-bean-name> + <managed-bean-class>sortingAndFiltering.SortingAndFiltering</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Style.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Style.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Style.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>style</managed-bean-name> + <managed-bean-class>util.style.Style</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>curentComponent</property-name> + <value>#{richBean}</value> + </managed-property> + </managed-bean> +</faces-config> Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-03-05 09:16:21 UTC (rev 6554) @@ -33,22 +33,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, - /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, - /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, - /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, - /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, - /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, - /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, - /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, - /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, - /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, - /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, - /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, - /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml, - /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml, - /WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml</param-value> + <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,! /WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,5 +1,4 @@ - -<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="jQuerySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="jQuerySubviewID"> <style> .divSize_1 { width: 150px; Modified: trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -84,6 +84,5 @@ <f:verbatim><div style="position: relative"><input id="onitemhoverInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> <f:verbatim><div style="position: relative"><input id="ongroupexpandInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> <f:verbatim><div style="position: relative"><input id="oncontextmenuInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> - <f:verbatim><div style="position: relative"><input id="ongroupcollapseInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> - <f:verbatim><div style="position: relative"><input id="onSlideSubmitInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> + <f:verbatim><div style="position: relative"><input id="ongroupcollapseInputID" type="hidden" value="don't work!" size="42" /></div></f:verbatim> </f:subview> Added: trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankDefault.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankDefault.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/pages/Blank/BlankDefault.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -0,0 +1,2 @@ +<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="defaultSubviewID"> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -26,22 +26,19 @@ <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> </div> <h:messages showDetail="true" showSummary="true"></h:messages> - <h:panelGrid id="richGridID" columns="1" width="100%"> - <h:column rendered="#{richBean.reComponent}"> + + <h:panelGrid id="richGridID" columns="1" width="100%"> + <h:column rendered="#{option.reComponent}"> <ui:include src="${richBean.pathComponent}"/> </h:column> - <h:column rendered="#{!richBean.reComponent}"></h:column> - - <h:column rendered="#{richBean.reStraightforward}"> + <h:column rendered="#{option.reStraightforward}"> <ui:include src="${richBean.pathStraightforward}"/> </h:column> - <h:column rendered="#{!richBean.reStraightforward}"></h:column> - <h:column rendered="#{richBean.reProperty}"> + <h:column rendered="#{option.reProperty}"> <ui:include src="${richBean.pathProperty}"/> </h:column> - <h:column rendered="#{!richBean.reProperty}"></h:column> </h:panelGrid> <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;"> Modified: trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-03-05 00:33:25 UTC (rev 6553) +++ trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-03-05 09:16:21 UTC (rev 6554) @@ -1,22 +1,29 @@ <f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="richMenuSubviewID"> <h:panelGrid columns="5" border="1"> - <h:panelGrid columns="1"> + <h:panelGrid columns="2"> + <h:outputText value="h" /> + <h:outputText value="a4j" /> <h:commandButton value="submit" style="width : 85px; height : 21px;"></h:commandButton> - <a4j:commandButton value="submit[a4j]" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> + <a4j:commandButton value="submit" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> + <h:commandButton value="immediate" immediate="true" style="width : 85px; height : 21px;"></h:commandButton> + <a4j:commandButton value="immediate" immediate="true" reRender="richGridID" style="width : 85px; height : 21px;"></a4j:commandButton> </h:panelGrid> <h:panelGrid columns="1"> <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status> </h:panelGrid> <h:panelGrid columns="1"> - <h:panelGrid columns="2"> + <h:panelGrid columns="4"> + <h:outputText value="Default:" /> + <h:selectBooleanCheckbox value="#{option.reDefault}" /> + <h:outputText value="Component" /> - <h:selectBooleanCheckbox value="#{richBean.reComponent}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{option.reComponent}" onchange="submit();" /> <h:outputText value="Straightforward" /> - <h:selectBooleanCheckbox value="#{richBean.reStraightforward}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{option.reStraightforward}" onchange="submit();" /> <h:outputText value="Property" /> - <h:selectBooleanCheckbox value="#{richBean.reProperty}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{option.reProperty}" onchange="submit();" /> </h:panelGrid> </h:panelGrid> @@ -31,6 +38,7 @@ <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> <f:selectItems value="#{richBean.list}" /> + <f:param value="#{richBean.src}" name="currentComponent"/> </h:selectOneMenu> </h:panelGrid> </h:panelGrid>

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6553 - trunk/ui/dataTable/src/test/java/org/richfaces/renderkit.

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

Author: nbelaevski Date: 2008-03-04 19:33:25 -0500 (Tue, 04 Mar 2008) New Revision: 6553 Modified: trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java Log: DataTable made compileable Modified: trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2008-03-04 23:27:36 UTC (rev 6552) +++ trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2008-03-05 00:33:25 UTC (rev 6553) @@ -368,7 +368,6 @@ protected class SortComparator implements Comparator<Date> { - @Override public int compare(Date o1, Date o2) { return o1.compareTo(o2); }

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6552 - in trunk: framework/impl and 1 other directories.

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

Author: nbelaevski Date: 2008-03-04 18:27:36 -0500 (Tue, 04 Mar 2008) New Revision: 6552 Modified: trunk/framework/impl/pom.xml trunk/pom.xml trunk/ui/pom.xml Log: JavaCC plugin upgraded to 2.4 version Clover plugin upraded to 3.7 version Modified: trunk/framework/impl/pom.xml =================================================================== --- trunk/framework/impl/pom.xml 2008-03-04 19:20:52 UTC (rev 6551) +++ trunk/framework/impl/pom.xml 2008-03-04 23:27:36 UTC (rev 6552) @@ -30,7 +30,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> - <version>2.1</version> + <version>2.4</version> <executions> <execution> <goals> @@ -38,9 +38,6 @@ </goals> </execution> </executions> - <configuration> - <packageName>org.richfaces.javacc</packageName> - </configuration> </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -143,12 +140,12 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> <configuration> - <excludes combine.children="append"> - <exclude>**/javacc/**</exclude> - </excludes> + <includesAllSourceRoots> + false + </includesAllSourceRoots> </configuration> </plugin> </plugins> @@ -179,4 +176,4 @@ <version>3.2.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-03-04 19:20:52 UTC (rev 6551) +++ trunk/pom.xml 2008-03-04 23:27:36 UTC (rev 6552) @@ -75,7 +75,15 @@ <url>http://download.java.net/maven/1</url> <layout>legacy</layout> </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>atlassian-m2-repository</id> + <name>Atlassian Maven 2.x Repository</name> + <url>http://repository.atlassian.com/maven2</url> + </pluginRepository> + </pluginRepositories> <distributionManagement> <downloadUrl> http://labs.jboss.com/portal/jbossrichfaces/downloads @@ -205,8 +213,9 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> + <version>3.7</version> <configuration> <includesAllSourceRoots> true @@ -232,7 +241,7 @@ <reporting> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> <!-- <configuration> @@ -245,4 +254,4 @@ </reporting> </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: trunk/ui/pom.xml =================================================================== --- trunk/ui/pom.xml 2008-03-04 19:20:52 UTC (rev 6551) +++ trunk/ui/pom.xml 2008-03-04 23:27:36 UTC (rev 6552) @@ -64,6 +64,25 @@ </plugins> </pluginManagement> </build> + <profiles> + <profile> + <id>clover</id> + <build> + <resources> + <resource> + <directory> + src/main/resources + </directory> + </resource> + <resource> + <directory> + target/generated-component/resources + </directory> + </resource> + </resources> + </build> + </profile> + </profiles> <modules> <module>core</module> <module>drag-drop</module>

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6551 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.

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

Author: vsukhov Date: 2008-03-04 14:20:52 -0500 (Tue, 04 Mar 2008) New Revision: 6551 Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml trunk/docs/userguide/en/src/main/resources/images/comboBox.png Log: http://jira.jboss.com/jira/browse/RF-1216 Added Java Script API, updated the screenshot for the component. Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-03-04 19:15:29 UTC (rev 6550) +++ trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-03-04 19:20:52 UTC (rev 6551) @@ -197,19 +197,19 @@ <tbody> <row> <entry>showList()</entry> - <entry></entry> + <entry>Shows the popup list</entry> </row> <row> <entry>hideList()</entry> - <entry></entry> + <entry>Hides the popup list</entry> </row> <row> <entry>enable()</entry> - <entry></entry> + <entry>Enables the control for input</entry> </row> <row> <entry>disable()</entry> - <entry></entry> + <entry>Disables the control for input</entry> </row>` </tbody> </tgroup> Modified: trunk/docs/userguide/en/src/main/resources/images/comboBox.png =================================================================== (Binary files differ)

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6550 - in trunk/ui/core/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.

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

Author: dsvyatobatsko Date: 2008-03-04 14:15:29 -0500 (Tue, 04 Mar 2008) New Revision: 6550 Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java Modified: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss Log: Std. Components Skinning Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class ButtonGradientImage extends BaseControlBackgroundImage { + + public ButtonGradientImage(String baseColor, String gradientColor, int width) { + super(Skin.additionalBackgroundColor, "trimColor", 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class ButtonInverseGradientImage extends BaseControlBackgroundImage { + + public ButtonInverseGradientImage(String baseColor, String gradientColor, int width) { + super("trimColor", Skin.additionalBackgroundColor, 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/ButtonInverseGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class HeaderGradientImage extends BaseControlBackgroundImage { + + public HeaderGradientImage(String baseColor, String gradientColor, int width) { + super(Skin.headerGradientColor, Skin.headerBackgroundColor, 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class HeaderInverseGradientImage extends BaseControlBackgroundImage { + + public HeaderInverseGradientImage(String baseColor, String gradientColor, int width) { + super(Skin.headerBackgroundColor, Skin.headerGradientColor, 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/HeaderInverseGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class InputGradientImage extends BaseControlBackgroundImage { + + public InputGradientImage(String baseColor, String gradientColor, int width) { + super(Skin.additionalBackgroundColor, Skin.controlBackgroundColor, 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/InputGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class MenuGradientImage extends BaseControlBackgroundImage { + + public MenuGradientImage(String baseColor, String gradientColor, int width) { + super("tabBackgroundColor", Skin.additionalBackgroundColor, 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class MenuInverseGradientImage extends BaseControlBackgroundImage { + + public MenuInverseGradientImage(String baseColor, String gradientColor, int width) { + super(Skin.additionalBackgroundColor, "tabBackgroundColor", 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/MenuInverseGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class TabGradientImage extends BaseControlBackgroundImage { + + public TabGradientImage(String baseColor, String gradientColor, int width) { + super("tabBackgroundColor", Skin.generalBackgroundColor, 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java =================================================================== --- trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java (rev 0) +++ trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java 2008-03-04 19:15:29 UTC (rev 6550) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.gradientimages; + +import org.richfaces.renderkit.html.images.BaseControlBackgroundImage; +import org.richfaces.skin.Skin; + +public class TabInverseGradientImage extends BaseControlBackgroundImage { + + public TabInverseGradientImage(String baseColor, String gradientColor, int width) { + super(Skin.generalBackgroundColor, "tabBackgroundColor", 8); + } + +} Property changes on: trunk/ui/core/src/main/java/org/richfaces/renderkit/html/gradientimages/TabInverseGradientImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss =================================================================== --- trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2008-03-04 19:15:18 UTC (rev 6549) +++ trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2008-03-04 19:15:29 UTC (rev 6550) @@ -16,8 +16,16 @@ .rich-container isindex, .rich-isindex, - .rich-container legend, .rich-legend, - .rich-container a, .rich-link"> + .rich-container legend, .rich-legend, + + .rich-container a, .rich-link, + + .rich-container fieldset, .rich-fieldset, + + .rich-field, .rich-field-edit, .rich-field-error, + + .rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press"> + <u:style name="font-size" skin="generalSizeFont" /> <u:style name="font-family" skin="generalFamilyFont" /> <u:style name="color" skin="controlTextColor" /> @@ -35,6 +43,15 @@ border-width: 1px; border-style: solid; } + + .rich-container legend, .rich-legend { + font-weight : bold; + } + + .rich-container form, .rich-form { + padding : 0px; + margin : 0px; + } ]]> </f:verbatim> @@ -57,4 +74,340 @@ <u:selector name=".rich-container a:visited, .rich-link:visited"> <u:style name="color" skin="visitedLinkColor" /> </u:selector> + + + + + <u:selector name=".rich-field, .rich-field-edit, .rich-field-error"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="inset" /> + <u:style name="border-color" skin="panelBorderColor" /> + </u:selector> + + <u:selector name=".rich-field"> + <u:style name="background-color" skin="controlBackgroundColor" /> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/> + </u:style> + <u:style name="background-repeat" value="no-repeat" /> + <u:style name="background-position" value="1px 1px" /> + </u:selector> + + <u:selector name=".rich-field-edit"> + <u:style name="background-color" skin="editBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-field-error"> + <u:style name="background-color" skin="warningBackgroundColor" /; + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.InputErrorIcon"/> + </u:style> + <u:style name="background-repeat" value="no-repeat" /> + <u:style name="background-position" value="center left" /> + <u:style name="padding-left" value="7px" /> + </u:selector> + + + + <u:selector name=".rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press"> + <u:style name="border-width" value="1px" /> + <u:style name="border-style" value="solid" /> + <u:style name="border-color" skin="panelBorderColor" /> + <u:style name="background-color" skin="trimColor" /> + <u:style name="padding" value="2px 10px 2px 10px" /> + <u:style name="text-align" value="center" /> + <u:style name="cursor" value="pointer" /> + <u:style name="background-repeat" value="repeat-x" /> + <u:style name="background-position" value="top left" /> + </u:selector> + + <u:selector name=".rich-button"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonBgImage"/> + </u:style> + </u:selector> + + <u:selector name=".rich-button-disabled"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonBgImage"/> + </u:style> + </u:selector> + + <u:selector name=".rich-button-over"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonBgImage"/> + </u:style> + </u:selector> + + <u:selector name=".rich-button-press"> + StandardButtonBgImage + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonPressedBgImage"/> + </u:style> + <u:style name="background-position" value="bottom left" /> + </u:selector> + + /*border color styles*/ + + <u:selector name=".rich-box-border-color-control-select"> + <u:style name="border-color" skin="selectControlColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-subborder"> + <u:style name="border-color" skin="subBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-header"> + <u:style name="border-color" skin="headerBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-general"> + <u:style name="border-color" skin="generalBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-additional"> + <u:style name="border-color" skin="additionalBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-panel"> + <u:style name="border-color" skin="panelBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-tip"> + <u:style name="border-color" skin="tipBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-color-table"> + <u:style name="border-color" skin="tableBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-control-select, .rich-box-border-subborder, .rich-box-border-header, + .rich-box-border-general, .rich-box-border-additional, .rich-box-border-panel, .rich-box-border-tip, .rich-box-border-table"> + <u:style name="border-style" value="solid" /> + <u:style name="border-width" value="1px" /> + </u:selector> + + <u:selector name=".rich-box-border-control-select"> + <u:style name="border-color" skin="selectControlColor" /> + </u:selector> + + <u:selector name=".rich-box-border-subborder"> + <u:style name="border-color" skin="subBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-header"> + <u:style name="border-color" skin="headerBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-border-general"> + <u:style name="border-color" skin="generalBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-border-additional"> + <u:style name="border-color" skin="additionalBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-border-panel"> + <u:style name="border-color" skin="panelBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-tip"> + <u:style name="border-color" skin="tipBorderColor" /> + </u:selector> + + <u:selector name=".rich-box-border-table"> + <u:style name="border-color" skin="tableBorderColor" /> + </u:selector> + + /*background color styles*/ + + <u:selector name=".rich-box-bgcolor-header"> + <u:style name="background-color" skin="headerBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-general"> + <u:style name="background-color" skin="generalBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-additional"> + <u:style name="background-color" skin="additionalBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-panel"> + <u:style name="background-color" skin="panelBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-tab"> + <u:style name="background-color" skin="tabBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-trim"> + <u:style name="background-color" skin="trimColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-tip"> + <u:style name="background-color" skin="tipBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-table"> + <u:style name="background-color" skin="tableBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-table-footer"> + <u:style name="background-color" skin="tableFooterBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-table-subfooter"> + <u:style name="background-color" skin="tableSubfooterBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-editor"> + <u:style name="background-color" skin="editorBackgroundColor" /> + </u:selector> + + <u:selector name=".rich-box-bgcolor-edit"> + <u:style name="background-color" skin="editBackgroundColor" /> + </u:selector> + + /*text color styles*/ + + <u:selector name=".rich-text-color-header"> + <u:style name="color" skin="headerTextColor" /> + </u:selector> + + <u:selector name=".rich-text-color-general"> + <u:style name="color" skin="generalTextColor" /> + </u:selector> + + <u:selector name=".rich-text-color-tab-disabled"> + <u:style name="color" skin="tabDisabledTextColor" /> + </u:selector> + + <u:selector name=".rich-text-color-select"> + <u:style name="color" skin="selectControlColor" /> + </u:selector> + + <u:selector name=".rich-text-color-link-general"> + <u:style name="color" skin="generalLinkColor" /> + </u:selector> + + <u:selector name=".rich-text-color-link-hover"> + <u:style name="color" skin="hoverLinkColor" /> + </u:selector> + + <u:selector name=".rich-text-color-link-visited"> + <u:style name="color" skin="visitedLinkColor" /> + </u:selector> + + /*font size styles*/ + + <u:selector name=".rich-font-size-general"> + <u:style name="font-size" skin="generalSizeFont" /> + </u:selector> + + <u:selector name=".rich-font-size-header"> + <u:style name="font-size" skin="headerSizeFont" /> + </u:selector> + + /*font family styles*/ + + <u:selector name=".rich-font-family-general"> + <u:style name="font-family" skin="generalFamilyFont" /> + </u:selector> + + <u:selector name=".rich-font-family-header"> + <u:style name="font-family" skin="headerFamilyFont" /> + </u:selector> + + /* text styles */ + + <u:selector name=".rich-text-general"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="color" skin="generalTextColor" /> + </u:selector> + + <u:selector name=".rich-text-header"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="headerFamilyFont" /> + <u:style name="color" skin="headerTextColor" /> + </u:selector> + + <u:selector name=".rich-text-tab-disabled"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="color" skin="tabDisabledTextColor" /> + </u:selector> + + <u:selector name=".rich-text-control-select"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="headerFamilyFont" /> + <u:style name="color" skin="selectControlColor" /> + </u:selector> + + /*gradient styles*/ + + <u:selector name=".rich-gradient-header-inverse"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-header"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.HeaderGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-tab"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.TabGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-tab-inverse"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-input"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.InputGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-menu-inverse"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-menu"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.MenuGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-button-inverse"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + + <u:selector name=".rich-gradient-button"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.ButtonGradientImage"/> + </u:style> + <u:style name="background-repeat" value="repeat-x" /> + </u:selector> + </f:template> \ No newline at end of file

16 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6549 - trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images.

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

Author: dsvyatobatsko Date: 2008-03-04 14:15:18 -0500 (Tue, 04 Mar 2008) New Revision: 6549 Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java Log: Std. Components Skinning Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-03-04 19:10:36 UTC (rev 6548) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-03-04 19:15:18 UTC (rev 6549) @@ -42,6 +42,8 @@ import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; +import com.opensymphony.oscache.util.StringUtil; + /** * Created 23.02.2008 * @author Nick Belaevski @@ -101,6 +103,27 @@ } } + protected final Integer getHeight(FacesContext context, String heightParamName) { + SkinFactory skinFactory = SkinFactory.getInstance(); + Skin skin = skinFactory.getSkin(context); + + String height = (String) skin.getParameter(context, heightParamName); + if (height == null || height.length() == 0) { + skin = skinFactory.getDefaultSkin(context); + height = (String) skin.getParameter(context, heightParamName); + } + + if (height != null && height.length() != 0) { + return Integer.valueOf(HtmlDimensions.decode(height).intValue()); + } else { + return Integer.valueOf(16); + } + } + + protected Integer getHeight(FacesContext context) { + return getHeight(context, Skin.generalSizeFont); + } + protected Object deserializeData(byte[] objectArray) { Data data = new Data(); if (objectArray != null) { @@ -112,15 +135,16 @@ return data; } - + protected Object getDataToStore(FacesContext context, Object data) { - if (baseColor == null) { - return new Data(context).toByteArray(); + Integer h = getHeight(context); + if (baseColor == null) { + return new Data(context, h).toByteArray(); } else { - return new Data(context, baseColor, gradientColor).toByteArray(); + return new Data(context, baseColor, gradientColor, h).toByteArray(); } } - + public boolean isCacheable() { return true; } @@ -129,14 +153,14 @@ public Data() { } - protected Data(FacesContext context) { - this(context, Skin.headerBackgroundColor, "headerGradientColor"); + protected Data(FacesContext context, Integer height) { + this(context, Skin.headerBackgroundColor, "headerGradientColor", height); } - protected Data(FacesContext context, String baseColor, String gradientColor) { + protected Data(FacesContext context, String baseColor, String gradientColor, Integer height) { this.headerBackgroundColor = getColorValueParameter(context, baseColor, false); this.headerGradientColor = getColorValueParameter(context, gradientColor, false); - this.height = getHeight(context); + this.height = height; if (!(this.headerBackgroundColor == null && this.headerGradientColor == null)) { if (this.headerBackgroundColor == null) { @@ -149,23 +173,6 @@ } } - private Integer getHeight(FacesContext context) { - SkinFactory skinFactory = SkinFactory.getInstance(); - Skin skin = skinFactory.getSkin(context); - - String height = (String) skin.getParameter(context, Skin.generalSizeFont); - if (height == null || height.length() == 0) { - skin = skinFactory.getDefaultSkin(context); - height = (String) skin.getParameter(context, Skin.generalSizeFont); - } - - if (height != null && height.length() != 0) { - return Integer.valueOf(HtmlDimensions.decode(height).intValue()); - } else { - return Integer.valueOf(16); - } - } - private Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) { Skin skin; if (useDefault) { Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java 2008-03-04 19:15:18 UTC (rev 6549) @@ -0,0 +1,45 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import java.awt.Graphics2D; +import java.awt.RenderingHints; + +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.ResourceContext; + +public class InputErrorIcon extends OneColorBasedResource { + + public InputErrorIcon() { + super(6, 11, "warningColor"); + } + + /** + * @see Java2Dresource#paint(ResourceContext, Graphics2D) + */ + protected void paint(ResourceContext context, Graphics2D g2d) { + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setColor(getBasicColor()); + g2d.fillRect(3, 2, 2, 6); + g2d.fillRect(3, 9, 2, 2); + } + +} Property changes on: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java 2008-03-04 19:15:18 UTC (rev 6549) @@ -0,0 +1,117 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Color; +import java.awt.Dimension; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.GifRenderer; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.Zipper2; +import org.richfaces.skin.SkinFactory; + +public class OneColorBasedResource extends Java2Dresource { + + private Dimension dimension; + + private String basicColorParamName; + + private Color basicColor; + + public OneColorBasedResource(int width, int height, final String basicColorParamName) { + this.basicColorParamName = basicColorParamName; + this.dimension = new Dimension(width, height); + setRenderer(new GifRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); + } + + /** + * @see Java2Dresource#getDimensions(ResourceContext) + */ + protected Dimension getDimensions(ResourceContext resourceContext) { + return dimension; + } + + /** + * @see Java2Dresource#getDimensions(FacesContext, Object) + */ + public Dimension getDimensions(FacesContext facesContext, Object data) { + return dimension; + } + + /** + * @see Java2Dresource#isCacheable(ResourceContext) + */ + public boolean isCacheable(ResourceContext ctx) { + return true; + } + + /** + * Gets value of basicColor field. + * @return value of basicColor field + */ + public Color getBasicColor() { + return basicColor; + } + + /** + * @see InternetResourceBase#getDataToStore(FacesContext, Object) + */ + protected Object getDataToStore(FacesContext context, Object data) { + byte[] retVal = null; + if (basicColor == null) { + basicColor = getColorValueParameter(context, basicColorParamName); + } + + retVal = new byte[3 * 1]; + new Zipper2(retVal).addColor(basicColor); + + return retVal; + } + + /** + * @see InternetResourceBase#deserializeData(byte[]) + */ + protected Object deserializeData(byte[] objectArray) { + if (objectArray != null) { + Zipper2 zipper2 = new Zipper2(objectArray); + basicColor = zipper2.nextColor(); + } + + return objectArray; + } + + private Color getColorValueParameter(FacesContext context, String name) { + Color retVal = null; + String color = (String) SkinFactory.getInstance().getSkin(context).getParameter(context, name); + if (color != null && !color.trim().equals("")) { + retVal = HtmlColor.decode(color); + } + return retVal; + } +} Property changes on: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java 2008-03-04 19:15:18 UTC (rev 6549) @@ -0,0 +1,38 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import javax.faces.context.FacesContext; + +import org.richfaces.skin.Skin; + +public class StandardButtonBgImage extends BaseControlBackgroundImage { + + public StandardButtonBgImage() { + super(Skin.additionalBackgroundColor, "trimColor", 9); + } + + protected Integer getHeight(FacesContext context) { + return (int) (1.7 * super.getHeight(context, Skin.buttonSizeFont)); + } + +} Property changes on: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java 2008-03-04 19:15:18 UTC (rev 6549) @@ -0,0 +1,38 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import javax.faces.context.FacesContext; + +import org.richfaces.skin.Skin; + +public class StandardButtonPressedBgImage extends BaseControlBackgroundImage { + + public StandardButtonPressedBgImage() { + super("trimColor", Skin.additionalBackgroundColor, 9); + } + + protected Integer getHeight(FacesContext context) { + return (int) (1.7 * super.getHeight(context, Skin.buttonSizeFont)); + } + +} Property changes on: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native

16 years, 2 months

1
0
0 / 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2008