July 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r14925 - root/framework/trunk/impl/src/main/java/org/richfaces/util.

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

Author: abelevich Date: 2009-07-15 04:04:38 -0400 (Wed, 15 Jul 2009) New Revision: 14925 Added: root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java Removed: root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java Log: rename logger Deleted: root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java 2009-07-14 18:03:37 UTC (rev 14924) +++ root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java 2009-07-15 08:04:38 UTC (rev 14925) @@ -1,40 +0,0 @@ -package org.richfaces.util; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @author Anton Belevich - * - */ -public enum RFLogger { - - RICH_RESOURCE("resource"), - - RICH_RENDERKIT("renderkit"), - - RICH_CONFIG("config"), - - RICH_CONNECTION("connection"), - - RICH_APPLICATION("application"), - - RICH_CACHE("cache"); - - private static final String LOGGER_NAME_PREFIX = "org.richfaces.logging"; - - private String loggerName; - - private RFLogger(String loggerName) { - this.loggerName = LOGGER_NAME_PREFIX + loggerName; - } - - public String getLoggerName() { - return loggerName; - } - - public Logger getLogger() { - return LoggerFactory.getLogger(loggerName); - } -} Added: root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/util/RichfacesLogger.java 2009-07-15 08:04:38 UTC (rev 14925) @@ -0,0 +1,40 @@ +package org.richfaces.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author Anton Belevich + * + */ +public enum RichfacesLogger { + + RESOURCE("resource"), + + RENDERKIT("renderkit"), + + CONFIG("config"), + + CONNECTION("connection"), + + APPLICATION("application"), + + CACHE("cache"); + + private static final String LOGGER_NAME_PREFIX = "org.richfaces.logging"; + + private String loggerName; + + private RichfacesLogger(String loggerName) { + this.loggerName = LOGGER_NAME_PREFIX + loggerName; + } + + public String getLoggerName() { + return loggerName; + } + + public Logger getLogger() { + return LoggerFactory.getLogger(loggerName); + } +}

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14924 - root/examples/trunk.

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

Author: abelevich Date: 2009-07-14 14:03:37 -0400 (Tue, 14 Jul 2009) New Revision: 14924 Modified: root/examples/trunk/pom.xml Log: add SLF4J binding for the simple logger implementation dependency Modified: root/examples/trunk/pom.xml =================================================================== --- root/examples/trunk/pom.xml 2009-07-14 18:01:27 UTC (rev 14923) +++ root/examples/trunk/pom.xml 2009-07-14 18:03:37 UTC (rev 14924) @@ -18,6 +18,13 @@ <version>4.0.0-SNAPSHOT</version> </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version >1.5.8</version> + </dependency> +  <!--dependency> <groupId>org.richfaces.ui</groupId>

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14923 - in root/framework/trunk: impl/src/main/java/org/richfaces/util and 1 other directories.

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

Author: abelevich Date: 2009-07-14 14:01:27 -0400 (Tue, 14 Jul 2009) New Revision: 14923 Added: root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java Modified: root/framework/trunk/impl/pom.xml root/framework/trunk/version-matrix/pom.xml Log: setup SLF4J logging Modified: root/framework/trunk/impl/pom.xml =================================================================== --- root/framework/trunk/impl/pom.xml 2009-07-14 14:45:10 UTC (rev 14922) +++ root/framework/trunk/impl/pom.xml 2009-07-14 18:01:27 UTC (rev 14923) @@ -169,6 +169,10 @@ <artifactId>easymockclassextension</artifactId> <scope>test</scope> </dependency> - </dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Added: root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/util/RFLogger.java 2009-07-14 18:01:27 UTC (rev 14923) @@ -0,0 +1,40 @@ +package org.richfaces.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author Anton Belevich + * + */ +public enum RFLogger { + + RICH_RESOURCE("resource"), + + RICH_RENDERKIT("renderkit"), + + RICH_CONFIG("config"), + + RICH_CONNECTION("connection"), + + RICH_APPLICATION("application"), + + RICH_CACHE("cache"); + + private static final String LOGGER_NAME_PREFIX = "org.richfaces.logging"; + + private String loggerName; + + private RFLogger(String loggerName) { + this.loggerName = LOGGER_NAME_PREFIX + loggerName; + } + + public String getLoggerName() { + return loggerName; + } + + public Logger getLogger() { + return LoggerFactory.getLogger(loggerName); + } +} Modified: root/framework/trunk/version-matrix/pom.xml =================================================================== --- root/framework/trunk/version-matrix/pom.xml 2009-07-14 14:45:10 UTC (rev 14922) +++ root/framework/trunk/version-matrix/pom.xml 2009-07-14 18:01:27 UTC (rev 14923) @@ -145,7 +145,12 @@ <artifactId>jsf-impl</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version >1.5.8</version> + </dependency> +

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14922 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.

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

Author: atsebro Date: 2009-07-14 10:45:10 -0400 (Tue, 14 Jul 2009) New Revision: 14922 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.desc.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml Log: RF-7485:a4j:page component description review Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.desc.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.desc.xml 2009-07-14 13:56:52 UTC (rev 14921) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.desc.xml 2009-07-14 14:45:10 UTC (rev 14922) @@ -1,14 +1,15 @@ <?xml version='1.0' encoding='UTF-8'?> <root> - <section> - <sectioninfo> - <keywordset> - <keyword>component</keyword> - <keyword>page</keyword> - </keywordset> - </sectioninfo> - -<title>Description</title> - <para><emphasis role="bold"><property><a4j:page></property></emphasis> is used for solving of incompatibility problems in early Ajax4jsf versions. The component encodes the full html page structure. </para> - </section> + <section> + <sectioninfo> + <keywordset> + <keyword>component</keyword> + <keyword>page</keyword> + </keywordset> + </sectioninfo> + <title>Description</title> + <para> + The <emphasis role="bold"><property><a4j:page></property></emphasis> component encodes the full HTML-page structure and used for solving some incompatibility in JSP environment with MyFaces in early Ajax4Jsf versions. + </para> + </section> </root> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml 2009-07-14 13:56:52 UTC (rev 14921) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml 2009-07-14 14:45:10 UTC (rev 14922) @@ -35,89 +35,60 @@ </tgroup> </table> - <section> - <title>Creating on a page</title> - <para>This component should be defined as a child component for <emphasis role="bold"> - <property><f:view>:</property> - </emphasis></para> - <programlisting role="XML"><![CDATA[<f:view> - <a4j:page> - <f:facet name="head"> -  - </f:facet> -  + <section> + <title>Creating the component with a Page Tag</title> + <para> + The <emphasis role="bold"><property><a4j:page></property></emphasis> should be the only child of <emphasis role="bold"><property><f:view></property></emphasis>: + </para> + <programlisting role="XML"><![CDATA[<f:view> + <a4j:page> + <f:facet name="head"> +  + </f:facet> +  </a4j:page> </f:view>]]></programlisting> </section> - <section> - <title>Creating the Component Dynamically Using Java</title> - <para> - <emphasis role="bold">Example:</emphasis> - </para> - <programlisting role="JAVA"><![CDATA[import org.ajax4jsf.component.html.HtmlPage; + <section> + <title>Creating the Component Dynamically Using Java</title> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="JAVA"><![CDATA[import org.ajax4jsf.component.html.HtmlPage; ... HtmlPage myPage = new HtmlPage(); ...]]></programlisting> - </section> - <section> - <title>Facets</title> - <table> - <title>Facets</title> - <tgroup cols="2"> - <thead> - <row> - <entry>Facet name</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry>head</entry> - <entry>Defines a head content</entry> - </row> - </tbody> - </tgroup> - </table> - </section> - <section> - <title>Key attributes and ways of usage</title> - <para>The component is mostly used to solve the following problem with MyFaces for erlier Ajax4jsf versions: in MyFaces <emphasis role="bold"> - <property><f:view></property> - </emphasis> doesn't get control over the - <property>RENDER_RESPONSE</property> - phase, thus Ajax can't get control and make a response also. To avoid this problem it was necessary to use <emphasis role="bold"> - <property><a4j:page></property> - </emphasis> on a page round the Ajax updatable area. In the last versions of both frameworks the problem is successfully fixed and no <emphasis role="bold"><property><a4j:page></property></emphasis> usage is required.</para> - <para>The component is rendered as a full HTML page template as it is shown in the <link linkend="exampl">example</link>. The - <property>head</property> - section is defined with the help of the corresponding <emphasis><property>"head"</property></emphasis> facet. + </section> - You do not need to use <emphasis><property>"body"</property></emphasis> facet in order to define first <property>body</property> section. - The second and more <property>body</property> sections is defined with the help of the corresponding <emphasis><property>"body"</property></emphasis> facet. - - </para> + <section> + <title>Details of usage</title> <para> - The attribute <emphasis><property>"format"</property></emphasis> defines page layout format for encoding DOCTYPE. + The component solves the problem with MyFaces for early Ajax4Jsf versions: in MyFaces implementation the <emphasis role="bold"><property><f:view></property></emphasis> JSP tag doesn't get control for encoding contents during the <property>RENDER_RESPONSE</property> phase, + thus Ajax can't neiher get a control nor make a response. + The <emphasis role="bold"><property><a4j:page></property></emphasis> solves this problem by wrapping the Ajax updatable areas. + In the last versions of both frameworks the problem is successfully fixed and no <emphasis role="bold"><property><a4j:page></property></emphasis> usage is required. </para> + <para> - The attribute <emphasis><property>"pageTitle"</property></emphasis> is rendered as <property>title</property> section. - </para> - - - <para> - <emphasis role="bold">Example:</emphasis> + The component uses <property>facet</property> <emphasis><property>"head"</property></emphasis> for defining the contents corresponding to the HTML HEAD. + There is no need to use <emphasis><property>"body"</property></emphasis> facet in order to define first <property>body</property> section. + The attribute <emphasis><property>"format"</property></emphasis> defines page layout format for encoding DOCTYPE. + The attribute <emphasis><property>"pageTitle"</property></emphasis> is rendered as <property>title</property> section. </para> - <programlisting role="XML"><![CDATA[<a4j:page format="xhtml" pageTitle="myPage"> - <f:facet name="head"> -  - </f:facet> -  + + <para> + According to the described above, the component defined at page as following + </para> + <programlisting role="XML"><![CDATA[<a4j:page format="xhtml" pageTitle="myPage"> + <f:facet name="head"> +  + </f:facet> +  </a4j:page>]]></programlisting> - <para>This structure is rendered as:</para> - + <para id="exampl"> - <emphasis role="bold">Example:</emphasis> + will be rendered on a page as </para> <programlisting role="XML"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> @@ -131,6 +102,27 @@ </html>]]></programlisting> </section> + <section> + <title>Facets</title> + <table> + <title>Facets</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Facet name</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>head</entry> + <entry>Defines a head content</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + <section> <title>Relevant resources links</title> <para>

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14921 - branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces.

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

Author: Alex.Kolonitsky Date: 2009-07-14 09:56:52 -0400 (Tue, 14 Jul 2009) New Revision: 14921 Modified: branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/Bean.java Log: UITree: queue expansion and collapse methods declared as throws IOException. https://jira.jboss.org/jira/browse/RF-7509 Modified: branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/Bean.java =================================================================== --- branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2009-07-14 13:55:19 UTC (rev 14920) +++ branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2009-07-14 13:56:52 UTC (rev 14921) @@ -99,7 +99,17 @@ private String ajaxNodeSelectionEncodeBehavior; private String ajaxChildActivationEncodeBehavior; - public String getIcon() { + private String value; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getIcon() { return icon; } @@ -279,12 +289,7 @@ public String expand() { if (expandPath != null && expandPath.length() != 0) { - try { - tree.queueNodeExpand(new ListRowKey(null, expandPath)); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + tree.queueNodeExpand(new ListRowKey(null, expandPath)); } return null; @@ -312,12 +317,7 @@ } public String expandAll() { - try { - this.tree.queueExpandAll(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + this.tree.queueExpandAll(); return null; } @@ -397,11 +397,7 @@ public String expandNode() { String pathToExpand = getPathToExpand(); if (pathToExpand != null && pathToExpand.trim().length() != 0) { - try { - ((UITree) getTree()).queueNodeExpand(new ListRowKey(null, pathToExpand)); - } catch (IOException e) { - throw new FacesException(e); - } + ((UITree) getTree()).queueNodeExpand(new ListRowKey(null, pathToExpand)); } return null;

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14920 - in branches/community/3.3.X/ui/tree/src/main/java/org/richfaces: renderkit and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2009-07-14 09:55:19 -0400 (Tue, 14 Jul 2009) New Revision: 14920 Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java Log: UITree: queue expansion and collapse methods declared as throws IOException. https://jira.jboss.org/jira/browse/RF-7509 Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java =================================================================== --- branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java 2009-07-14 11:23:13 UTC (rev 14919) +++ branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java 2009-07-14 13:55:19 UTC (rev 14920) @@ -721,9 +721,8 @@ * * @param rowKey * of the node to expand - * @throws IOException */ - public void queueNodeExpand(TreeRowKey rowKey) throws IOException { + public void queueNodeExpand(TreeRowKey rowKey) { new ExpandNodeCommandEvent(this, rowKey).queue(); } @@ -733,27 +732,22 @@ * * @param rowKey * of the node to expand - * @throws IOException */ - public void queueNodeCollapse(TreeRowKey rowKey) throws IOException { + public void queueNodeCollapse(TreeRowKey rowKey) { new CollapseNodeCommandEvent(this, rowKey).queue(); } /** * Queues all node expansion command - * - * @throws IOException */ - public void queueExpandAll() throws IOException { + public void queueExpandAll() { new ExpandAllCommandEvent(this).queue(); } /** * Queues all node collapsion command - * - * @throws IOException */ - public void queueCollapseAll() throws IOException { + public void queueCollapseAll() { new CollapseAllCommandEvent(this).queue(); } Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java =================================================================== --- branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2009-07-14 11:23:13 UTC (rev 14919) +++ branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2009-07-14 13:55:19 UTC (rev 14920) @@ -20,6 +20,7 @@ */ package org.richfaces.component; +import javax.el.ValueExpression; import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.component.UIViewRoot; @@ -526,6 +527,8 @@ if (this.ajaxSingleSet) { return this.ajaxSingle; } + + // ValueExpression ve = getValueExpression("ajaxSingle"); ValueBinding vb = getValueBinding("ajaxSingle"); if (vb != null) { Boolean value = (Boolean) vb.getValue(getFacesContext()); Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-07-14 11:23:13 UTC (rev 14919) +++ branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-07-14 13:55:19 UTC (rev 14920) @@ -262,7 +262,7 @@ String nodeExpandedId = id + NODE_EXPANDED_INPUT_SUFFIX; Object nodeExpandedValue = requestMap.get(nodeExpandedId); if (nodeExpandedValue != null) { - boolean nodeExpanded = Boolean.valueOf(nodeExpandedValue.toString()); + boolean nodeExpanded = Boolean.parseBoolean(nodeExpandedValue.toString()); if (tree.isExpanded() ^ nodeExpanded) { if (nodeExpanded) { new ExpandNodeCommandEvent(tree, key).queue();

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14919 - branches/community/3.3.X/samples/simpleTogglePanel-sample/src/main/webapp/pages.

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

Author: Alex.Kolonitsky Date: 2009-07-14 07:23:13 -0400 (Tue, 14 Jul 2009) New Revision: 14919 Added: branches/community/3.3.X/samples/simpleTogglePanel-sample/src/main/webapp/pages/RF-7518.jsp Log: SimpleTogglePanel generates empty display/height/width style attribute https://jira.jboss.org/jira/browse/RF-7518 Added: branches/community/3.3.X/samples/simpleTogglePanel-sample/src/main/webapp/pages/RF-7518.jsp =================================================================== --- branches/community/3.3.X/samples/simpleTogglePanel-sample/src/main/webapp/pages/RF-7518.jsp (rev 0) +++ branches/community/3.3.X/samples/simpleTogglePanel-sample/src/main/webapp/pages/RF-7518.jsp 2009-07-14 11:23:13 UTC (rev 14919) @@ -0,0 +1,29 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/simpleTogglePanel" prefix="stp" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<html> +<head> + <title>RF-2195</title> +</head> + +<body> + <f:view> + <h:form id="SimpleToglePanel_form"> + <stp:simpleTogglePanel + label="STP" + switchType="ajax" + reRender="out" + action="#{simpleBean.changeLabel}" + width="100px" + height="100px" + > + + <h:outputText value="content"/> + </stp:simpleTogglePanel> + <h:outputText value="#{simpleBean.property}" id="out"/> + </h:form> + <a4j:log popup="false"/> + </f:view> +</body> +</html> \ No newline at end of file

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14918 - in branches/community/3.3.X/ui/simpleTogglePanel/src: main/templates and 1 other directories.

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

Author: Alex.Kolonitsky Date: 2009-07-14 07:22:51 -0400 (Tue, 14 Jul 2009) New Revision: 14918 Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java Log: SimpleTogglePanel generates empty display/height/width style attribute https://jira.jboss.org/jira/browse/RF-7518 Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-07-14 10:25:07 UTC (rev 14917) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-07-14 11:22:51 UTC (rev 14918) @@ -30,6 +30,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.context.AjaxContext; @@ -187,6 +188,76 @@ } } + public void encodeDivStart(ResponseWriter writer, + FacesContext context, UISimpleTogglePanel component) throws IOException { + String clientId = component.getClientId(context); + writer.startElement("div", component); + getUtils().writeAttribute(writer, "class", "rich-stglpanel " + convertToString(component.getAttributes().get("styleClass")) ); + getUtils().writeAttribute(writer, "id", clientId ); + + String style = convertToString(component.getAttributes().get("style")); + String width = convertToString(component.getAttributes().get("width")); + if (!isEmpty(width)) { + width = "width: " + convertToString(width); + style = width + (isEmpty(style) ? ";" : "; " + style + ";"); + } + if (!isEmpty(style)) { + getUtils().writeAttribute(writer, "style", style); + } + + getUtils().encodeAttributesFromArray(context,component,new String[] { + "align", + "dir", + "lang", + "onclick", + "ondblclick", + "onkeydown", + "onkeypress", + "onkeyup", + "onmousedown", + "onmousemove", + "onmouseout", + "onmouseover", + "onmouseup", + "title", + "xml:lang" }); + } + + public void encodeBodyDivStart(ResponseWriter writer, + FacesContext context, UISimpleTogglePanel component) throws IOException { + String clientId = component.getClientId(context); + writer.startElement("div", component); + getUtils().writeAttribute(writer, "class", "rich-stglpanel-body " + convertToString(component.getAttributes().get("bodyClass")) ); + getUtils().writeAttribute(writer, "id", convertToString(clientId) + "_body" ); + + String display = convertToString(component.getAttributes().get("display")); + if (!isEmpty(display)) { + display = "display: " + convertToString(display) + "; "; + } + + String height = convertToString(component.getAttributes().get("height")); + if (!isEmpty(height)) { + height = "height: " + convertToString(component.getAttributes().get("height")) + ";"; + } + + String style = display + height; + if (!isEmpty(style)) { + getUtils().writeAttribute(writer, "style", style); + } + } + + private boolean isEmpty(String str) { + return str == null || str.length() == 0; + } + + private String convertToString(Object obj ) { + return ( obj == null ? "" : obj.toString() ); + } + + public void encodeDivEnd(ResponseWriter writer) throws IOException { + writer.endElement("div"); + } + public String getSwitchOnStatus(FacesContext context, UIComponent component) { UISimpleTogglePanel simpleTogglePanel = (UISimpleTogglePanel) component; return simpleTogglePanel.isOpened() ? EMPTY : NONE; Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2009-07-14 10:25:07 UTC (rev 14917) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2009-07-14 11:22:51 UTC (rev 14918) @@ -20,10 +20,9 @@ scripts/simpleTogglePanel.js </h:scripts> - <div id="#{clientId}" x:passThruWithExclusions="id,value,style,styleClass,class" - class="rich-stglpanel #{component.attributes['styleClass']}" - style="width: #{component.attributes['width']}; #{component.attributes['style']};"> - + <jsp:scriptlet> + encodeDivStart(writer, context, component); + </jsp:scriptlet> <script type="text/javascript"> SimpleTogglePanelManager.add(new SimpleTogglePanel("#{clientId}", "#{component.attributes['opened']}",{ @@ -38,7 +37,7 @@ <div id="#{clientId}_header" class="rich-stglpanel-header #{component.attributes['headerClass']}" onclick="#{this:getOnClick(context,component)}"> - + <div class="rich-stglpanel-marker"> <div id="#{clientId}_switch_on" style="display: #{this:getSwitchOnStatus(context, component)};" class="rich-stglpnl-marker"> <jsp:scriptlet><![CDATA[ @@ -92,15 +91,14 @@ </jsp:scriptlet> <f:call name="utils.encodeEndFormIfNessesary"/> - <div id="#{clientId}_body" - class="rich-stglpanel-body #{component.attributes['bodyClass']}" - style="display : #{this:getdivdisplay(context, component)}; - height: #{component.attributes['height']};"> - + <jsp:scriptlet> + encodeBodyDivStart(writer, context, component); + </jsp:scriptlet> <vcp:body> <f:call name="renderChildren" /> </vcp:body> - </div> - </div> - + <jsp:scriptlet> + encodeDivEnd(writer); + encodeDivEnd(writer); + </jsp:scriptlet> </f:root> Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-07-14 10:25:07 UTC (rev 14917) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-07-14 11:22:51 UTC (rev 14918) @@ -93,7 +93,7 @@ stp1.setId("simpleTogglePanel1"); stp1.setOpened(true); stp1.setSwitchType(UISimpleTogglePanel.SERVER_SWITCH_TYPE); - + openMarker1 = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE); openMarker1.setId("openMarker"); openMarker1.setValue("open"); @@ -163,10 +163,10 @@ HtmlElement div1 = page.getHtmlElementById(stp1.getClientId(facesContext)); assertNotNull(div1); assertEquals("div", div1.getNodeName()); + assertTrue(div1.getAttributeValue("class").contains("rich-stglpanel")); + assertEquals("", div1.getAttributeValue("style")); + - String classAttr1 = div1.getAttributeValue("class"); - assertTrue(classAttr1.contains("rich-stglpanel")); - HtmlDivision div2 = (HtmlDivision)page.getHtmlElementById(stp1.getClientId(facesContext) + "_header"); assertNotNull(div2); assertEquals("div", div2.getNodeName()); @@ -185,7 +185,8 @@ HtmlElement div4 = page.getHtmlElementById(stp1.getClientId(facesContext) + "_body"); assertNotNull(div4); assertEquals("div", div4.getNodeName()); - + assertEquals("", div4.getAttributeValue("style")); + try { page.getHtmlElementById(openMarker1.getClientId(facesContext)); assertTrue(false);

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14917 - branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.

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

Author: konstantin.mishin Date: 2009-07-14 06:25:07 -0400 (Tue, 14 Jul 2009) New Revision: 14917 Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: RF-7523 Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2009-07-14 09:32:48 UTC (rev 14916) +++ branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2009-07-14 10:25:07 UTC (rev 14917) @@ -521,7 +521,6 @@ this.currentInput = $(this.id + ":file"); this.actionUrl = actionUrl; - this.options = {allowFlash : "false"}; this.initFlashModule(); this.initEvents(); this.setupAutoUpload();

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r14916 - in branches/community/3.3.X/ui/spacer/src: test/java/org/richfaces/component and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2009-07-14 05:32:48 -0400 (Tue, 14 Jul 2009) New Revision: 14916 Modified: branches/community/3.3.X/ui/spacer/src/main/templates/spacer.jspx branches/community/3.3.X/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java Log: spacer: "title" attribute doesn't work https://jira.jboss.org/jira/browse/RF-7503 Modified: branches/community/3.3.X/ui/spacer/src/main/templates/spacer.jspx =================================================================== --- branches/community/3.3.X/ui/spacer/src/main/templates/spacer.jspx 2009-07-14 09:21:44 UTC (rev 14915) +++ branches/community/3.3.X/ui/spacer/src/main/templates/spacer.jspx 2009-07-14 09:32:48 UTC (rev 14916) @@ -15,7 +15,8 @@ <img id="#{clientId}" width="#{component.attributes['width']}" height="#{component.attributes['height']}" - alt="#{component.attributes['title']}" + alt="" + title="#{component.attributes['title']}" src="#{spacer}" class="rich-spacer #{component.attributes['styleClass']}" x:passThruWithExclusions="id,width,height,title,styleClass,class,alt,src" Modified: branches/community/3.3.X/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java =================================================================== --- branches/community/3.3.X/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2009-07-14 09:21:44 UTC (rev 14915) +++ branches/community/3.3.X/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2009-07-14 09:32:48 UTC (rev 14916) @@ -69,7 +69,7 @@ spacer.setId("spacer"); spacer.getAttributes().put("width", "30"); spacer.getAttributes().put("height", "10"); - spacer.getAttributes().put("title", "10"); + spacer.getAttributes().put("title", "title"); spacer.getAttributes().put("style", "background-color: lime"); // spacer.getAttributes().put("height", new Integer(10)); @@ -102,20 +102,14 @@ .getHtmlElementById(spacer.getClientId(facesContext)); assertNotNull(htmlSpacer); - String str = htmlSpacer.getAttributeValue("width"); - assertEquals("30", str); - str = htmlSpacer.getAttributeValue("height"); - assertEquals("10", str); - str = htmlSpacer.getAttributeValue("style"); - assertEquals("background-color: lime", str); + assertEquals("30", htmlSpacer.getAttributeValue("width")); + assertEquals("10", htmlSpacer.getAttributeValue("height")); + assertEquals("title", htmlSpacer.getAttributeValue("title")); + assertEquals("", htmlSpacer.getAttributeValue("alt")); + assertEquals("background-color: lime", htmlSpacer.getAttributeValue("style")); + assertTrue(htmlSpacer.getAttributeValue("class").contains("rich-spacer")); + assertTrue(htmlSpacer.getSrcAttribute().contains("images/spacer.gif")); - str = htmlSpacer.getClassAttribute(); - str = htmlSpacer.getAttributeValue("class"); - assertTrue(str.contains("rich-spacer")); - - str = htmlSpacer.getSrcAttribute(); - assertTrue(str.contains("images/spacer.gif")); - //System.out.println(renderedView.getWebResponse().getContentAsString()); /*

15 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2009