You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2005/05/11 18:45:12 UTC
svn commit: r169655 [6/8] - in /myfaces/trunk:
src/cactus/org/apache/myfaces/renderkit/html/
src/cactus/org/apache/myfaces/taglib/core/
src/cactus/org/apache/myfaces/taglib/html/
src/components/org/apache/myfaces/renderkit/html/ext/
src/components/org/apache/myfaces/taglib/html/ext/
src/junit/org/apache/myfaces/renderkit/
src/junit/org/apache/myfaces/renderkit/html/
src/junit/org/apache/myfaces/renderkit/html/util/
src/junit/org/apache/myfaces/util/ src/junit/org/apache/myfaces/webapp/
src/myfaces/org/apache/myfaces/lifecycle/
src/myfaces/org/apache/myfaces/portlet/
src/myfaces/org/apache/myfaces/renderkit/
src/myfaces/org/apache/myfaces/renderkit/html/
src/myfaces/org/apache/myfaces/taglib/core/
src/myfaces/org/apache/myfaces/taglib/html/
src/myfaces/org/apache/myfaces/util/ src/myfaces/org/apache/myfaces/webapp/
src/myfaces/org/apache/myfaces/webapp/filter/
src/share/org/apache/myfaces/renderkit/
src/share/org/apache/myfaces/renderkit/html/
src/share/org/apache/myfaces/renderkit/html/util/
src/share/org/apache/myfaces/taglib/
src/share/org/apache/myfaces/taglib/core/
src/share/org/apache/myfaces/taglib/html/ src/share/org/apache/myfaces/util/
src/share/org/apache/myfaces/webapp/webxml/
src/wml/org/apache/myfaces/wap/base/ src/wml/org/apache/myfaces/wap/def/
src/wml/org/apache/myfaces/wap/renderkit/
src/wml/org/apache/myfaces/wap/renderkit/wml/
src/xdoclet/org/apache/myfaces/xdoclet/
webapps/src/example/org/apache/myfaces/examples/validate/
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/Messages.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/Messages.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/Messages.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/Messages.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,48 +19,44 @@
* Render a single message for a specific component.
*
* Set-up for Rendering
- * Obtain the "summary" and "detail" properties fromUIMessage component. If not present, keep the empty string as the value, respectively. Obtain the firstFacesMessage to render from the component, using the "for" property of the UIMessage. This will be the only message we render.
+ * Obtain the "summary" and "detail" properties fromUIMessage component. If not present, keep the empty string as the value, respectively. Obtain the firstFacesMessage to render from the component, using the "for" property of the UIMessage. This will be the only message we render.
*
* Rendering
- * For the message renderer, we only render one row, for the first message. For the messages renderer, we render as many rows as we have messages.
+ * For the message renderer, we only render one row, for the first message. For the messages renderer, we render as many rows as we have messages.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UIMessage"
* rendererType="MessagesRenderer"
* tagName="messages"
* tagBaseClass="org.apache.myfaces.wap.base.MessageTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class Messages extends javax.faces.component.UIMessage {
-
+
/**
- * Flag indicating that only global messages (that is, messages not associated with any client identifier) are to be displayed.
- * Default value is "false".
+ * Flag indicating that only global messages (that is, messages not associated with any client identifier) are to be displayed.
+ * Default value is "false".
*
* @wapfaces.attribute
* valueBinding="true"
* initValue="false"
*/
- boolean globalOnly;
+ boolean globalOnly;
/**
- * The type of layout markup to use when rendering error messages. Valid values are "table" (an WML table) and "list"
- * (records disjoin with <br/> element). If not specified, the default value is "list".
+ * The type of layout markup to use when rendering error messages. Valid values are "table" (an WML table) and "list"
+ * (records disjoin with <br/> element). If not specified, the default value is "list".
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String layout;
-
+ java.lang.String layout;
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -70,16 +66,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -87,26 +83,26 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
-
+ java.lang.String binding;
+
/**
- * Flag indicating whether the summary portion of displayed messages should be included. Default value is "true".
+ * Flag indicating whether the summary portion of displayed messages should be included. Default value is "true".
*
* @wapfaces.attribute
- * initValue="true"
+ * initValue="true"
* abstract="true"
* inherit="true"
*/
boolean showDetail;
-
+
/**
- * Flag indicating whether the summary portion of displayed messages should be included. Default value is "false".
+ * Flag indicating whether the summary portion of displayed messages should be included. Default value is "false".
*
* @wapfaces.attribute
- * initValue="false"
+ * initValue="false"
* abstract="true"
* inherit="true"
*/
boolean showSummary;
-
+
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputLink.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputLink.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputLink.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputLink.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,22 +15,18 @@
*/
package org.apache.myfaces.wap.def;
-/**
- * Render an WML "a" anchor element. The value of the component is rendered as the value of the "href" attribute. Any child UIParameter components are appended to the String to be output as the value of the "href" attribute as query parameters before rendering. The entire "href" string must be passed through a call to the encodeResourceURL() method of theExternalContext. The name of the UIParameter goes on the left hand side, and the value of the UIParameter on the right hand side. The name and the value must be URLEncoded. Each UIParameter instance is separeted by an ampersand, as dictated in the URL spec. If the "styleClass" attribute is specified, render its value as the value of the "class" attribute.
+/**
+ * Render an WML "a" anchor element. The value of the component is rendered as the value of the "href" attribute. Any child UIParameter components are appended to the String to be output as the value of the "href" attribute as query parameters before rendering. The entire "href" string must be passed through a call to the encodeResourceURL() method of theExternalContext. The name of the UIParameter goes on the left hand side, and the value of the UIParameter on the right hand side. The name and the value must be URLEncoded. Each UIParameter instance is separeted by an ampersand, as dictated in the URL spec. If the "styleClass" attribute is specified, render its value as the value of the "class" attribute.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UIOutput"
* rendererType="OutputLinkRenderer"
* tagName="outputLink"
* tagBaseClass="org.apache.myfaces.wap.base.ValueHolderTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
@@ -42,8 +38,8 @@
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String title;
-
+ java.lang.String title;
+
/**
* The xml:lang attribute specifies the natural or formal language of an element or its attributes.
*
@@ -51,16 +47,16 @@
* valueBinding="true"
*/
java.lang.String xmllang;
-
+
/**
- * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
+ * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
*
* @wapfaces.attribute
* valueBinding="true"
*/
java.lang.String styleClass;
-
-
+
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -70,16 +66,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -87,16 +83,16 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
+ java.lang.String binding;
/**
- * Converter instance registered with this component.
+ * Converter instance registered with this component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String converter;
+ java.lang.String converter;
/**
* The current value of this component.
@@ -105,5 +101,5 @@
* inherit="true"
* abstract="true"
*/
- java.lang.Object value;
+ java.lang.Object value;
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputText.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputText.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputText.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/OutputText.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,23 +15,19 @@
*/
package org.apache.myfaces.wap.def;
-/**
+/**
* If the "styleClass" attribute is present, render its value as the value of the "class" attribute. If the "escape" attribute is not present, or it is present and its value is "true" all angle brackets should be converted to the ampersand xx semicolon syntax when rendering the value of the "value" attribute as the value of the component. If the "escape" attribute is present and is "false" the value of the component should be rendered as text without escaping.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UIOutput"
* rendererType="OutputTextRenderer"
* tagName="outputText"
* tagBaseClass="org.apache.myfaces.wap.base.ValueHolderTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class OutputText extends javax.faces.component.UIOutput {
@@ -52,16 +48,16 @@
* valueBinding="true"
*/
//java.lang.String style;
-
+
/**
- * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
+ * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
*
* @wapfaces.attribute
* valueBinding="true"
*/
//java.lang.String styleClass;
-
-
+
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -71,16 +67,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -88,16 +84,16 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
+ java.lang.String binding;
/**
- * Converter instance registered with this component.
+ * Converter instance registered with this component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String converter;
+ java.lang.String converter;
/**
* The current value of this component.
@@ -106,5 +102,5 @@
* inherit="true"
* abstract="true"
*/
- java.lang.Object value;
+ java.lang.Object value;
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGrid.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGrid.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGrid.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGrid.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,35 +15,31 @@
*/
package org.apache.myfaces.wap.def;
-/**
- * Renders an WML table element. Required attribute is "column" what sets number of colums in the table. Render the "header" and a "footer" facet if present, as the first or last row of the table. Render the children based on the value of the "columns" attribute, creating a new row each time a "columns" worth of children have been rendered. Each child is rendered inside of a "td" element. If a child has "rendered==false" it is not rendered, and the column counter must not be incremented.
+/**
+ * Renders an WML table element. Required attribute is "column" what sets number of colums in the table. Render the "header" and a "footer" facet if present, as the first or last row of the table. Render the children based on the value of the "columns" attribute, creating a new row each time a "columns" worth of children have been rendered. Each child is rendered inside of a "td" element. If a child has "rendered==false" it is not rendered, and the column counter must not be incremented.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UIPanel"
* rendererType="GridRenderer"
* tagName="panelGrid"
* tagBaseClass="org.apache.myfaces.wap.base.ComponentTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class PanelGrid extends javax.faces.component.UIPanel {
-
+
/**
- * Aligns the text in a column. Specify a list of the align values, one for each column. Posible are values: "C", "L" or "R". Example: aling="RRCL" - the first column is align to right, second right, third center and the fourth column to left. Default aling is left.
+ * Aligns the text in a column. Specify a list of the align values, one for each column. Posible are values: "C", "L" or "R". Example: aling="RRCL" - the first column is align to right, second right, third center and the fourth column to left. Default aling is left.
*
* @wapfaces.attribute
* valueBinding="true"
*/
java.lang.String align;
-
+
/**
* Sets the number of columns in the table.
*
@@ -52,7 +48,7 @@
* valueBinding="true"
*/
java.lang.String columns;
-
+
/**
* The attribute styleClass affiliates an element with one or more classes. Multiple elements can be given the same styleClass name.
*
@@ -68,7 +64,7 @@
* valueBinding="true"
*/
java.lang.String title;
-
+
/**
* The xml:lang attribute specifies the natural or formal language of an element or its attributes.
*
@@ -76,7 +72,7 @@
* valueBinding="true"
*/
java.lang.String xmllang;
-
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -86,16 +82,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -103,5 +99,5 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
+ java.lang.String binding;
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGroup.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGroup.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGroup.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/PanelGroup.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,27 +15,23 @@
*/
package org.apache.myfaces.wap.def;
-/**
+/**
* Intended for use in situations when only one UIComponent child can be nested, such as in the case of facets.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UIPanel"
* rendererType="GroupRenderer"
* tagName="panelGroup"
* tagBaseClass="org.apache.myfaces.wap.base.ComponentTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class PanelGroup extends javax.faces.component.UIPanel {
-
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -45,16 +41,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -63,5 +59,5 @@
* inherit="true"
*/
java.lang.String binding;
-
+
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectBoolean.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectBoolean.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectBoolean.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectBoolean.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,54 +15,50 @@
*/
package org.apache.myfaces.wap.def;
-/**
+/**
* Renders a checkbox for entry boolean value.
*
* Renders select tag with one option element.
- * Render the clientId of the component as the value of the "name" attribute.
+ * Render the clientId of the component as the value of the "name" attribute.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UISelectBoolean"
* rendererType="SelectBooleanRenderer"
* tagName="selectBoolean"
* tagBaseClass="org.apache.myfaces.wap.base.EditableValueHolderTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class SelectBoolean extends javax.faces.component.UISelectBoolean {
/**
- * The name of the variable that is set with the result of the selection. May also by use to set default value.
+ * The name of the variable that is set with the result of the selection. May also by use to set default value.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String name;
-
+ java.lang.String name;
+
/**
* Sets the tabbing position for the select element.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String tabindex;
-
+ java.lang.String tabindex;
+
/**
* Sets a title for the select element. Some browsers can ignore it.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String title;
-
+ java.lang.String title;
+
/**
* The xml:lang attribute specifies the natural or formal language of an element or its attributes.
*
@@ -70,16 +66,16 @@
* valueBinding="true"
*/
java.lang.String xmllang;
-
+
/**
- * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
+ * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
*
* @wapfaces.attribute
* valueBinding="true"
*/
java.lang.String styleClass;
-
-
+
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -89,16 +85,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -106,26 +102,26 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
+ java.lang.String binding;
/**
- * Converter instance registered with this component.
+ * Converter instance registered with this component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String converter;
+ java.lang.String converter;
/**
- * Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.
+ * Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.
*
* @wapfaces.attribute
* inherit="true"
* abstract="true"
*/
boolean immediate;
-
+
/**
* The current value of this component. Is rendered as attribute "value" in the select element. If is value "true" is checkbox checked.
*
@@ -134,31 +130,31 @@
* abstract="true"
*/
java.lang.Object value;
-
+
/**
- * Flag indicating that the user is required to provide a submitted value for this input component.
+ * Flag indicating that the user is required to provide a submitted value for this input component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- boolean required;
-
+ boolean required;
+
/**
- * MethodBinding representing a validator method that will be called during Process Validations to perform correctness checks on the value of this component. The expression must evaluate to a public method that takes FacesContext, UIComponent, and Object parameters, with a return type of void.
+ * MethodBinding representing a validator method that will be called during Process Validations to perform correctness checks on the value of this component. The expression must evaluate to a public method that takes FacesContext, UIComponent, and Object parameters, with a return type of void.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String validator;
-
+ java.lang.String validator;
+
/**
- * MethodBinding representing a value change listener method that will be notified when a new value has been set for this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with a return type of void.
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with a return type of void.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String valueChangeListener;
+ java.lang.String valueChangeListener;
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectMany.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectMany.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectMany.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectMany.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,54 +15,50 @@
*/
package org.apache.myfaces.wap.def;
-/**
+/**
* Renders a option list.
*
* Renders select tag with one option element.
* Render the clientId of the component as the value of the "name" attribute. Render "true" as the value of the "multiple" attribute.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UISelectMany"
* rendererType="SelectManyRenderer"
* tagName="selectMany"
* tagBaseClass="org.apache.myfaces.wap.base.EditableValueHolderTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class SelectMany extends javax.faces.component.UISelectMany {
/**
- * The name of the variable that is set with the result of the selection. May also by use to set default value(if any option value matches the value of this variable). If is any option select, don't enforce attribute value to set default value.
+ * The name of the variable that is set with the result of the selection. May also by use to set default value(if any option value matches the value of this variable). If is any option select, don't enforce attribute value to set default value.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String name;
-
+ java.lang.String name;
+
/**
* Sets the tabbing position for the select element.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String tabindex;
-
+ java.lang.String tabindex;
+
/**
* Sets a title for the select element. Some browsers can ignore it.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String title;
-
+ java.lang.String title;
+
/**
* The xml:lang attribute specifies the natural or formal language of an element or its attributes.
*
@@ -70,16 +66,16 @@
* valueBinding="true"
*/
java.lang.String xmllang;
-
+
/**
- * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
+ * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
*
* @wapfaces.attribute
* valueBinding="true"
*/
java.lang.String styleClass;
-
-
+
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -89,16 +85,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -106,26 +102,26 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
+ java.lang.String binding;
/**
- * Converter instance registered with this component.
+ * Converter instance registered with this component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String converter;
+ java.lang.String converter;
/**
- * Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.
+ * Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.
*
* @wapfaces.attribute
* inherit="true"
* abstract="true"
*/
boolean immediate;
-
+
/**
* The current value of this component. Is rendered as attribute "value" in the select element. First option item with matching value is selected.
*
@@ -134,31 +130,31 @@
* abstract="true"
*/
java.lang.Object value;
-
+
/**
- * Flag indicating that the user is required to provide a submitted value for this input component.
+ * Flag indicating that the user is required to provide a submitted value for this input component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- boolean required;
-
+ boolean required;
+
/**
- * MethodBinding representing a validator method that will be called during Process Validations to perform correctness checks on the value of this component. The expression must evaluate to a public method that takes FacesContext, UIComponent, and Object parameters, with a return type of void.
+ * MethodBinding representing a validator method that will be called during Process Validations to perform correctness checks on the value of this component. The expression must evaluate to a public method that takes FacesContext, UIComponent, and Object parameters, with a return type of void.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String validator;
-
+ java.lang.String validator;
+
/**
- * MethodBinding representing a value change listener method that will be notified when a new value has been set for this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with a return type of void.
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with a return type of void.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String valueChangeListener;
+ java.lang.String valueChangeListener;
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectOne.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectOne.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectOne.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/def/SelectOne.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,54 +15,50 @@
*/
package org.apache.myfaces.wap.def;
-/**
- * Renders a option list.
+/**
+ * Renders a option list.
*
* Renders select tag with one option element.
* Render the clientId of the component as the value of the "name" attribute. Render "false" as the value of the "multiple" attribute.
*
- * @wapfaces.tag
+ * @wapfaces.tag
* componentFamily="UISelectOne"
* rendererType="SelectOneRenderer"
* tagName="selectOne"
* tagBaseClass="org.apache.myfaces.wap.base.EditableValueHolderTagBase"
* bodyContent="JSP"
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:25 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
- */
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
public class SelectOne extends javax.faces.component.UISelectOne {
/**
- * The name of the variable that is set with the result of the selection. May also by use to set default value(if any option value matches the value of this variable). If is any option select, don't enforce attribute value to set default value.
+ * The name of the variable that is set with the result of the selection. May also by use to set default value(if any option value matches the value of this variable). If is any option select, don't enforce attribute value to set default value.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String name;
-
+ java.lang.String name;
+
/**
* Sets the tabbing position for the select element.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String tabindex;
-
+ java.lang.String tabindex;
+
/**
* Sets a title for the select element. Some browsers can ignore it.
*
* @wapfaces.attribute
* valueBinding="true"
*/
- java.lang.String title;
-
+ java.lang.String title;
+
/**
* The xml:lang attribute specifies the natural or formal language of an element or its attributes.
*
@@ -70,16 +66,16 @@
* valueBinding="true"
*/
java.lang.String xmllang;
-
+
/**
- * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
+ * Space-separated list of style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.
*
* @wapfaces.attribute
* valueBinding="true"
*/
java.lang.String styleClass;
-
-
+
+
// ============= ABSTARACT ATTRIBUTES ======================================
/**
* The component identifier for the associated component.
@@ -89,16 +85,16 @@
* inherit="true"
*/
java.lang.String id;
-
+
/**
- * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
+ * Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
boolean rendered;
-
+
/**
* The value binding expression linking this component to a property in a backing bean.
*
@@ -106,26 +102,26 @@
* abstract="true"
* inherit="true"
*/
- java.lang.String binding;
+ java.lang.String binding;
/**
- * Converter instance registered with this component.
+ * Converter instance registered with this component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String converter;
+ java.lang.String converter;
/**
- * Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.
+ * Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase.
*
* @wapfaces.attribute
* inherit="true"
* abstract="true"
*/
boolean immediate;
-
+
/**
* The current value of this component. Is rendered as attribute "value" in the select element. First option item with matching value is selected.
*
@@ -134,31 +130,31 @@
* abstract="true"
*/
java.lang.Object value;
-
+
/**
- * Flag indicating that the user is required to provide a submitted value for this input component.
+ * Flag indicating that the user is required to provide a submitted value for this input component.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- boolean required;
-
+ boolean required;
+
/**
- * MethodBinding representing a validator method that will be called during Process Validations to perform correctness checks on the value of this component. The expression must evaluate to a public method that takes FacesContext, UIComponent, and Object parameters, with a return type of void.
+ * MethodBinding representing a validator method that will be called during Process Validations to perform correctness checks on the value of this component. The expression must evaluate to a public method that takes FacesContext, UIComponent, and Object parameters, with a return type of void.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String validator;
-
+ java.lang.String validator;
+
/**
- * MethodBinding representing a value change listener method that will be notified when a new value has been set for this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with a return type of void.
+ * MethodBinding representing a value change listener method that will be notified when a new value has been set for this input component. The expression must evaluate to a public method that takes a ValueChangeEvent parameter, with a return type of void.
*
* @wapfaces.attribute
* abstract="true"
* inherit="true"
*/
- java.lang.String valueChangeListener;
+ java.lang.String valueChangeListener;
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/Attributes.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/Attributes.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/Attributes.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/Attributes.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,11 +18,7 @@
/**
* Interface define attribute names for all JSF tags.
* @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
- *
+ * @version $Revision$ $Date$
*/
public interface Attributes {
/** common attributes */
@@ -34,7 +30,7 @@
final public static String FOOTER = "footer";
final public static String RENDERED = "rendered";
final public static String VALUE = "value";
-
+
final public static String ALIGN = "align";
final public static String ALT = "alt";
final public static String CLASS = "class";
@@ -61,7 +57,7 @@
final public static String VSPACE = "vspace";
final public static String WIDTH = "width";
final public static String XML_LANG = "xml:lang";
-
+
/** tag names */
final public static String A = "a";
final public static String ANCHOR = "anchor";
@@ -79,11 +75,11 @@
final public static String TABLE = "table";
final public static String TD = "td";
final public static String TR = "tr";
-
+
/** hidden fields */
final public static String POSTFIX_SUBMITED = "_submited";
final public static String POSTFIX_ACTIVATED = "_activated";
-
+
/** constants */
final public static String SELECT_MANY_SEPARATOR = ";";
final public static String POST = "post";
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/RendererUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/RendererUtils.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/RendererUtils.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,18 +39,14 @@
import org.apache.commons.logging.LogFactory;
/**
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class RendererUtils {
private static Log log = LogFactory.getLog(RendererUtils.class);
-
+
public static String getCurrentUrl(FacesContext context){
ViewHandler viewHandler = context.getApplication().getViewHandler();
String viewId = context.getViewRoot().getViewId();
@@ -58,11 +54,11 @@
String urlLink = context.getExternalContext().encodeActionURL(actionUrl);
return(urlLink);
}
-
+
/** write attribute */
public static void writeAttribute(String attribute, Object value, ResponseWriter writer){
log.debug("attribute " + attribute + ": " + value);
-
+
try {
if (value != null)
writer.writeAttribute(attribute, value, null);
@@ -70,32 +66,32 @@
log.error("Error write attribute '" + attribute + " value: '" + value + "'", ex.getCause());
}
}
-
+
/** Converts submitted value to Object (local component value) */
public static Object convertToObject(FacesContext context, UIComponent component){
if (!(component instanceof EditableValueHolder))
throw new IllegalArgumentException("Expected component of type EditableValueHolder. Cannot convert submitted value.");
-
+
EditableValueHolder holder = (EditableValueHolder)component;
-
+
if (!(holder.getSubmittedValue() instanceof String))
throw new ClassCastException("Submitted value must be a String value.");
-
+
String submittedValue = (String)holder.getSubmittedValue();
Converter conv = holder.getConverter();
-
+
// no conversion needed
if (conv == null) return(submittedValue);
-
+
return(conv.getAsObject(context, component, submittedValue));
}
-
+
/** Converts value of compoent to String */
public static String convertToString(FacesContext facesContext, UIComponent component) {
if (!(component instanceof ValueHolder)) {
throw new IllegalArgumentException("Component is not a ValueHolder");
}
-
+
if (component instanceof EditableValueHolder) {
Object submittedValue = ((EditableValueHolder)component).getSubmittedValue();
if (submittedValue != null) {
@@ -107,15 +103,15 @@
}
}
}
-
+
Object value = ((ValueHolder)component).getValue();
-
+
Converter converter = ((ValueHolder)component).getConverter();
if (converter == null && value != null) {
if (value instanceof String) {
return (String) value;
}
-
+
try {
converter = facesContext.getApplication().createConverter(value.getClass());
}
@@ -124,7 +120,7 @@
// converter stays null
}
}
-
+
if (converter == null) {
if (value == null) {
return "";
@@ -137,13 +133,13 @@
return converter.getAsString(facesContext, component, value);
}
}
-
+
public static Object convertUISelectManyToObject(FacesContext context, UISelectMany component, Object value) {
if (!(value instanceof String[]))
throw new ClassCastException("Selected value must be a String[] type.");
-
+
String[] submittedValue = (String[])value;
-
+
ValueBinding vb = component.getValueBinding("value");
Class valueType = null;
Class arrayComponentType = null;
@@ -153,7 +149,7 @@
arrayComponentType = valueType.getComponentType();
}
}
-
+
Converter converter = component.getConverter();
if (converter == null) {
if (valueType == null) {
@@ -161,7 +157,7 @@
// --> return the submitted String array
return submittedValue;
}
-
+
if (List.class.isAssignableFrom(valueType)) {
// expected type is a List
// --> according to javadoc of UISelectMany we assume that the element type
@@ -173,14 +169,14 @@
}
return lst;
}
-
+
if (arrayComponentType == null) {
throw new IllegalArgumentException("ValueBinding for UISelectMany must be of type List or Array");
}
-
+
if (String.class.equals(arrayComponentType)) return submittedValue; //No conversion needed for String type
if (Object.class.equals(arrayComponentType)) return submittedValue; //No conversion for Object class
-
+
try {
converter = context.getApplication().createConverter(arrayComponentType);
}
@@ -189,7 +185,7 @@
return submittedValue;
}
}
-
+
// Now, we have a converter...
if (valueType == null) {
// ...but have no idea of expected type
@@ -201,7 +197,7 @@
}
return convertedValues;
}
-
+
if (List.class.isAssignableFrom(valueType)) {
// Curious case: According to specs we should assume, that the element type
// of this List is java.lang.String. But there is a Converter set for this
@@ -213,11 +209,11 @@
}
return lst;
}
-
+
if (arrayComponentType == null) {
throw new IllegalArgumentException("ValueBinding for UISelectMany must be of type List or Array");
}
-
+
if (arrayComponentType.isPrimitive()) {
//primitive array
int len = submittedValue.length;
@@ -237,7 +233,7 @@
return convertedValues;
}
}
-
+
public static void renderChildren(FacesContext context, UIComponent component) throws java.io.IOException {
if (component != null && component.isRendered()){
Iterator iter = component.getChildren().iterator();
@@ -247,10 +243,10 @@
}
}
}
-
+
public static void renderChild(FacesContext context, UIComponent child) throws java.io.IOException {
if (child == null || !child.isRendered()) return;
-
+
child.encodeBegin(context);
if (child.getRendersChildren()) {
child.encodeChildren(context);
@@ -259,69 +255,69 @@
renderChildren(context, child);
}
child.encodeEnd(context);
-
+
if (!child.isRendered())
{
return;
}
}
-
+
/** Insert parameter and its value to href. Insert correct separator '?' or '&' */
public static String insertGetParam(String href, String param, String value, String encoding) throws java.io.IOException {
href += (href.indexOf('?') == -1) ? "?" : "&";
-
+
href += URLEncoder.encode(param, encoding);
href += '=';
href += URLEncoder.encode(value, encoding);
-
+
return (href);
}
-
+
/** Returns all input components(input, select, option...) from the list of components(type UICommponents).
* @param components the list of components.
* @return Set of UIComponent - all input components from the list. If no input tag was found, return empty set.
*/
public static Set getInputTags(List components){
Set inputTags = new HashSet();
-
+
Iterator iter = components.iterator();
-
+
while (iter.hasNext()){
UIComponent comp = (UIComponent)iter.next();
String family = comp.getFamily();
log.debug("processing component family:" + family);
-
+
if (isInputComponent(family)){
inputTags.add(comp);
}
}
return(inputTags);
}
-
-
+
+
private static boolean isInputComponent(String name){
String INPUT_COMPONENTS_FAMILY[] = {"UIInput", "UISelectItems", "UISelectBoolean", "UISelectOne", "UISelectMany"};
-
+
for (int i = 0; i < INPUT_COMPONENTS_FAMILY.length; i++){
if (name != null && name.equals(INPUT_COMPONENTS_FAMILY[i]))
return (true);
}
return (false);
}
-
+
public static String getAttribute(UIComponent comp, String attribute){
Map attrs = comp.getAttributes();
-
- Iterator iter = attrs.keySet().iterator();
+
+ Iterator iter = attrs.keySet().iterator();
while (iter.hasNext())
log.debug("attr:" + iter.next());
-
+
String value = (String)attrs.get(attribute);
if (value != null){
log.debug("Contains name:" + value);
return(value);
}
-
+
return(null);
}
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderKitImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderKitImpl.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderKitImpl.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderKitImpl.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,30 +27,26 @@
/**
* @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
- *
+ * @version $Revision$ $Date$
*/
public class WmlRenderKitImpl extends RenderKit {
private static Log log = LogFactory.getLog(WmlRenderKitImpl.class);
-
+
private Map renderers;
private ResponseStateManager rsm;
-
+
/** Creates a new instance of RenderKitImpl */
public WmlRenderKitImpl() {
log.debug("created object " + this.getClass().getName());
renderers = new HashMap();
rsm = new WmlResponseStateManagerImpl();
- //rsm = new com.sun.faces.renderkit.ResponseStateManagerImpl();
+ //rsm = new com.sun.faces.renderkit.ResponseStateManagerImpl();
}
-
+
public void addRenderer(String family, String rendererType, javax.faces.render.Renderer renderer) {
renderers.put(family + "." + rendererType, renderer);
}
-
+
public Renderer getRenderer(String family, String rendererType) {
log.debug("getRenderer() family:" + family + " renderType:" + rendererType);
Renderer renderer = (Renderer)renderers.get(family + "." + rendererType);
@@ -59,29 +55,29 @@
}
return(renderer);
}
-
+
public ResponseStateManager getResponseStateManager() {
return(rsm);
}
-
+
public javax.faces.context.ResponseStream createResponseStream(java.io.OutputStream outputStream) {
throw new UnsupportedOperationException(this.getClass().getName() + " UnsupportedOperationException");
}
-
+
public javax.faces.context.ResponseWriter createResponseWriter(java.io.Writer writer, String contentTypeList, String characterEncoding) {
log.debug("createResponseWriter()");
if (contentTypeList == null) {
log.info("No content type list given, creating WmlResponseWriterImpl with default content type.");
return new WmlResponseWriterImpl(writer, null, characterEncoding);
}
-
+
StringTokenizer st = new StringTokenizer(contentTypeList, ",");
while (st.hasMoreTokens()) {
String contentType = st.nextToken().trim();
return new WmlResponseWriterImpl(writer, contentType, characterEncoding);
}
-
+
throw new IllegalArgumentException("ContentTypeList does not contain a supported content type: " + contentTypeList);
}
-
+
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderUtils.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderUtils.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderUtils.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,54 +29,50 @@
/**
* @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
- *
+ * @version $Revision$ $Date$
*/
public class WmlRenderUtils {
private static Log log = LogFactory.getLog(RendererUtils.class);
-
- /** Writes options for the select element.
- * @param items is an instance of SelectItem or SelectItemGroup object. Alternatively array, collection or map of SelectItem objects.
+
+ /** Writes options for the select element.
+ * @param items is an instance of SelectItem or SelectItemGroup object. Alternatively array, collection or map of SelectItem objects.
*/
public static void writeOptions(Object items, UIComponent component, ResponseWriter writer) throws java.io.IOException {
log.debug("method writeOptions");
-
+
if (items instanceof SelectItemGroup){
log.debug("item is an instanceof SelectItemGroup");
SelectItemGroup group = (SelectItemGroup)items;
-
+
writer.startElement(Attributes.OPTGROUP,component);
RendererUtils.writeAttribute(Attributes.TITLE, group.getLabel(), writer);
-
+
SelectItem[] array = group.getSelectItems();
for (int i = 0; i < array.length; i++)
writeOption(array[i],component, writer);
-
+
writer.endElement(Attributes.OPTGROUP);
- }
+ }
else {
if (items instanceof SelectItem){
log.debug("item is an instance of SelectItem");
writeOption((SelectItem)items,component, writer);
}
-
+
if (items instanceof SelectItem[]){
log.debug("item is an instance of SelectItem[]");
SelectItem[] array = (SelectItem[])items;
for (int i = 0; i < array.length; i++)
writeOption(array[i],component, writer);
}
-
+
if (items instanceof Collection){
log.debug("item is an instance of Collection");
Iterator iter = ((Collection)items).iterator();
while(iter.hasNext())
writeOptions(iter.next(),component, writer);
}
-
+
if (items instanceof Map){
log.debug("item is an instance of Map");
Iterator iter = ((Map)items).entrySet().iterator();
@@ -85,7 +81,7 @@
}
}
}
-
+
/** Writes one option element for the select tag. */
public static void writeOption(SelectItem item, UIComponent component, ResponseWriter writer) throws java.io.IOException {
writer.startElement(Attributes.OPTION,component);
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderer.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderer.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlRenderer.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,13 @@
import javax.faces.component.NamingContainer;
import javax.faces.render.Renderer;
/**
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class WmlRenderer extends Renderer {
-
- /** Converts the standard char separator (':') to underscore ('_').
+
+ /** Converts the standard char separator (':') to underscore ('_').
* The names of WML variables can consist of any combination of letters, digits, and underscores.
*/
public String convertClientId(javax.faces.context.FacesContext context, String clientId) {
@@ -37,5 +33,5 @@
retValue = retValue.replace(NamingContainer.SEPARATOR_CHAR, '_');
return (retValue);
- }
+ }
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseStateManagerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseStateManagerImpl.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseStateManagerImpl.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseStateManagerImpl.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,31 +32,27 @@
import org.apache.commons.logging.LogFactory;
/**
* @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
- *
+ * @version $Revision$ $Date$
*/
public class WmlResponseStateManagerImpl extends ResponseStateManager {
private static Log log = LogFactory.getLog(WmlResponseStateManagerImpl.class);
-
+
private static final String TREE_PARAM = "jsf_tree";
private static final String STATE_PARAM = "jsf_state";
private static final String VIEWID_PARAM = "jsf_viewid";
private static final String BASE64_TREE_PARAM = "jsf_tree_64";
private static final String BASE64_STATE_PARAM = "jsf_state_64";
private static final String ZIP_CHARSET = "UTF-8";
-
+
private static final String WML_POSTFIELD = "postfield";
private static final String WML_POSTFIELD_NAME = "name";
private static final String WML_POSTFIELD_VALUE = "value";
-
+
public void writeState(FacesContext facescontext, StateManager.SerializedView serializedview) throws IOException {
ResponseWriter responseWriter = facescontext.getResponseWriter();
Object treeStruct = serializedview.getStructure();
Object compStates = serializedview.getState();
-
+
if (treeStruct != null) {
if (treeStruct instanceof String) {
responseWriter.startElement(WML_POSTFIELD, null);
@@ -74,7 +70,7 @@
else {
log.error("No tree structure to be saved in client response!");
}
-
+
if (compStates != null) {
if (compStates instanceof String) {
responseWriter.startElement(WML_POSTFIELD, null);
@@ -92,13 +88,13 @@
else {
log.error("No component states to be saved in client response!");
}
-
+
responseWriter.startElement(WML_POSTFIELD, null);
responseWriter.writeAttribute(WML_POSTFIELD_NAME, VIEWID_PARAM, null);
responseWriter.writeAttribute(WML_POSTFIELD_VALUE, facescontext.getViewRoot().getViewId(), null);
responseWriter.endElement(WML_POSTFIELD);
- }
-
+ }
+
private String encode64(Object obj) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -116,8 +112,8 @@
throw new FacesException(e);
}
}
-
-
+
+
public Object getTreeStructureToRestore(FacesContext facescontext, String viewId) {
Map reqParamMap = facescontext.getExternalContext().getRequestParameterMap();
Object param = reqParamMap.get(VIEWID_PARAM);
@@ -125,35 +121,35 @@
//no saved state or state of different viewId
return null;
}
-
+
param = reqParamMap.get(TREE_PARAM);
if (param != null) {
return param;
}
-
+
param = reqParamMap.get(BASE64_TREE_PARAM);
if (param != null) {
return decode64((String)param);
}
-
+
return null;
}
-
+
public Object getComponentStateToRestore(FacesContext facescontext) {
Map reqParamMap = facescontext.getExternalContext().getRequestParameterMap();
Object param = reqParamMap.get(STATE_PARAM);
if (param != null) {
return param;
}
-
+
param = reqParamMap.get(BASE64_STATE_PARAM);
if (param != null) {
return decode64((String)param);
}
-
+
return null;
}
-
+
private Object decode64(String s) {
try {
Base64 base64Codec = new Base64();
@@ -175,9 +171,9 @@
throw new FacesException(e);
}
}
-
-
-
+
+
+
private void writeStateParam(ResponseWriter writer, String name, String value) throws IOException {
writer.write(name);
writer.write('=');
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseWriterImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseWriterImpl.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseWriterImpl.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/WmlResponseWriterImpl.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,79 +25,75 @@
import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
/**
- *
- * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:27 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
*
+ * @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class WmlResponseWriterImpl extends ResponseWriter {
private static Log log = LogFactory.getLog(WmlResponseWriterImpl.class);
-
+
private static final String DEFAUL_CONTENT_TYPE = "text/vnd.wap.wml";
private static final String DEFAULT_CHARACTER_ENCODING = "UTF-8";
-
+
private Writer writer;
private String contentType;
private String characterEncoding;
private String startElementName;
private boolean startTagOpen;
-
+
private static final Set s_emptyHtmlElements = new HashSet();
static {
s_emptyHtmlElements.add("img");
s_emptyHtmlElements.add("postfield");
}
-
+
/** Creates a new instance of WmlResponseWriter */
public WmlResponseWriterImpl(Writer writer, String contentType, String characterEncoding) {
log.debug("created object " + this.getClass().getName());
this.writer = writer;
this.contentType = contentType;
this.characterEncoding = characterEncoding;
-
+
if (contentType == null) {
log.info("Content type is null, using default value: " + DEFAUL_CONTENT_TYPE);
this.contentType = DEFAUL_CONTENT_TYPE;
}
-
+
if (characterEncoding == null) {
log.info("Character encoding is null, using default value: " + DEFAULT_CHARACTER_ENCODING);
this.characterEncoding = DEFAULT_CHARACTER_ENCODING;
}
}
-
+
public ResponseWriter cloneWithWriter(Writer writer) {
WmlResponseWriterImpl newWriter = new WmlResponseWriterImpl(writer, getContentType(), getCharacterEncoding());
return(newWriter);
}
-
+
public void startElement(String name, javax.faces.component.UIComponent uIComponent) throws java.io.IOException {
if (name == null) {
throw new NullPointerException("elementName name must not be null");
}
-
+
closeStartTagIfNecessary();
writer.write('<');
writer.write(name);
startElementName = name;
startTagOpen = true;
}
-
+
public void endElement(String name) throws java.io.IOException {
if (name == null) {
throw new NullPointerException("elementName name must not be null");
}
-
+
if (log.isWarnEnabled()) {
if (startElementName != null && !name.equals(startElementName)) {
log.warn("WML nesting warning on closing " + name + ": element " + startElementName + " not explicitly closed");
}
}
-
+
if(startTagOpen) {
// we will get here only if no text or attribute was written after the start element was opened
writer.write(" />");
@@ -108,23 +104,23 @@
writer.write(name);
writer.write('>');
}
-
+
startElementName = null;
}
-
+
public void writeText(Object value, String componentPropertyName) throws java.io.IOException {
if (value == null) {
throw new NullPointerException("text name must not be null");
}
-
+
closeStartTagIfNecessary();
if(value == null)
return;
-
+
String strValue = value.toString(); //TODO: Use converter for value?
writer.write(strValue);
}
-
+
public void writeText(char cbuf[], int off, int len) throws java.io.IOException {
if (cbuf == null) {
throw new NullPointerException("cbuf name must not be null");
@@ -132,23 +128,23 @@
if (cbuf.length < off + len) {
throw new IndexOutOfBoundsException((off + len) + " > " + cbuf.length);
}
-
+
closeStartTagIfNecessary();
-
+
writer.write(cbuf, off, len);
}
-
+
public void writeComment(Object value) throws java.io.IOException {
if (value == null) {
throw new NullPointerException("comment name must not be null");
}
-
+
closeStartTagIfNecessary();
writer.write("<!--");
writer.write(value.toString()); //TODO: Escaping: must not have "-->" inside!
writer.write("-->");
}
-
+
public void writeAttribute(String name, Object value, String componentPropertyName) throws java.io.IOException {
if (name == null) {
throw new NullPointerException("attributeName name must not be null");
@@ -156,7 +152,7 @@
if (!startTagOpen) {
throw new IllegalStateException("Must be called before the start element is closed (attribute '" + name + "')");
}
-
+
if (value instanceof Boolean) {
if (((Boolean)value).booleanValue()) {
// name as value for XHTML compatibility
@@ -176,24 +172,24 @@
writer.write('"');
}
}
-
+
public String getContentType() {
return contentType;
}
-
+
public String getCharacterEncoding() {
return characterEncoding;
}
-
+
public void startDocument() throws java.io.IOException {
// do nothing
}
-
+
public void endDocument() throws java.io.IOException {
flush();
writer.flush();
}
-
+
public void writeURIAttribute(String name, Object value, String componentPropertyName) throws java.io.IOException {
if (name == null) {
throw new NullPointerException("attributeName name must not be null");
@@ -201,13 +197,13 @@
if (!startTagOpen) {
throw new IllegalStateException("Must be called before the start element is closed (attribute '" + name + "')");
}
-
+
String strValue = value.toString(); //TODO: Use converter for value?
writer.write(' ');
writer.write(name);
writer.write("=\"" + strValue + "\"");
}
-
+
private void closeStartTagIfNecessary() throws java.io.IOException {
if (startTagOpen) {
if (s_emptyHtmlElements.contains(startElementName.toLowerCase())) {
@@ -222,29 +218,29 @@
startTagOpen = false;
}
}
-
+
public void flush() throws java.io.IOException {
// API doc says we should not flush the underlying writer
//_writer.flush();
// but rather clear any values buffered by this ResponseWriter:
closeStartTagIfNecessary();
}
-
+
public void write(char cbuf[], int off, int len) throws java.io.IOException {
closeStartTagIfNecessary();
writer.write(cbuf, off, len);
}
-
+
public void write(int c) throws java.io.IOException {
closeStartTagIfNecessary();
writer.write(c);
}
-
+
public void write(char cbuf[]) throws java.io.IOException {
closeStartTagIfNecessary();
writer.write(cbuf);
}
-
+
public void close() throws java.io.IOException {
if (startTagOpen) {
// we will get here only if no text was written after the start element was opened
@@ -252,5 +248,5 @@
}
writer.close();
}
-
+
}
Modified: myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/wml/ColumnRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/wml/ColumnRenderer.java?rev=169655&r1=169654&r2=169655&view=diff
==============================================================================
--- myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/wml/ColumnRenderer.java (original)
+++ myfaces/trunk/src/wml/org/apache/myfaces/wap/renderkit/wml/ColumnRenderer.java Wed May 11 09:45:06 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,19 +21,15 @@
/**
* @author <a href="mailto:Jiri.Zaloudek@ivancice.cz">Jiri Zaloudek</a> (latest modification by $Author$)
- * @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2004/12/30 09:37:26 matzew
- * added a new RenderKit for WML. Thanks to Jirí aloudek
- *
+ * @version $Revision$ $Date$
*/
public class ColumnRenderer extends GroupRenderer {
private static Log log = LogFactory.getLog(ColumnRenderer.class);
-
+
/** Creates a new instance of ColumnRenderer */
public ColumnRenderer() {
super();
log.debug("created object " + this.getClass().getName());
- }
+ }
}