[Struts Wiki] Update of "StrutsDocComments" by MichaelJouravlev
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by MichaelJouravlev: http://wiki.apache.org/struts/StrutsDocComments -- * [http://www.niallp.pwp.blueyonder.co.uk/strutshighlight.html Highlighting error fields] * ... * [:StrutsTags:Using Struts tags, JSTL tags and JSP scriptlets] +* ["JSTLTags"] -- Use JSTL tags instead of Struts "logic" and "bean" tags when possible -* [:StrutsWidgets:Creating widgets with Struts JSP tag library] +* StrutsWidgets -- How to create HTML widgets with Struts JSP tag library * StrutsHtmlOptionsInternationalization * ServingPdfDocuments
[Struts Wiki] Update of "JSTLTags" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTags
New page:
This is a stub, feel free to expand.
= Bean tags =
== ==
is used to display a localized and possibly parameterised
message from a property file bundled with application.
=== Common features ===
Resource files should be names according to locale and country, like:
* Messages_en.properties -- English language
* Messages_fr.properties -- French language
* Messages_fr_CA.properties -- French language, Canadian dialect
=== Struts Taglib ===
struts-config.xml:
{{{
}}}
JSP file:
{{{
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<%-- No arguments --%>
<%-- Passing arguments to a message in a JSP2.0 container --%>
}}}
=== JSTL ===
web.xml:
{{{
javax.servlet.jsp.jstl.fmt.localizationContext
com.acme.webboard.Messages
}}}
JSP file:
{{{
<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt"; %>
<%-- No arguments --%>
<%-- Passing arguments to a message --%>
}}}
More information:
* [http://www-128.ibm.com/developerworks/java/library/j-jstl0415/ A JSTL
primer: Message Resources]
* [http://www.systemmobile.com/?p=200 Struts Message Resources]
[Struts Wiki] Update of "JSTLTags" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/JSTLTags -- More information: * [http://www-128.ibm.com/developerworks/java/library/j-jstl0415/ A JSTL primer: Message Resources] * [http://www.systemmobile.com/?p=200 Struts Message Resources] + * ["StrutsAndJSTL"]
[Struts Wiki] Update of "StrutsAndJSTL" by WendySmoak
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by WendySmoak:
http://wiki.apache.org/struts/StrutsAndJSTL
The comment on the change is:
Moved content from http://wiki.wsmoak.net/cgi-bin/wiki.pl?StrutsAndJSTL
New page:
== Which version of JSTL should I use with Struts? ==
=== What version of Struts am I using? ===
If there is no version number in the filename, (i.e., struts-1.2.9.jar,) then
look inside WEB-INF/lib/struts.jar (or possibly struts-core.jar) and examine
the contents of the MANIFEST.MF file.
=== What version of the Servlet spec am I using? ===
Look at the top of WEB-INF/web.xml and compare to the snippets in each section
below.
Your Servlet container may support versions other than the one your particular
application is using. For example, Tomcat 5.5 supports Servlet 2.4, but will
also run applications configured for Servlet 2.3 and (probably, haven't tried
it,) Servlet 2.2.
=== Servlet 2.2 ===
* web.xml
{{{
http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
}}}
* You will not be able to use JSTL unless you move to (at least) Servlet 2.3
=== Servlet 2.3 ===
* web.xml:
{{{
http://java.sun.com/dtd/web-app_2_3.dtd";>
}}}
* Struts-EL
{{{
<%@ taglib uri="http://struts.apache.org/tags-bean-el"; prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html-el"; prefix="html" %>
}}}
* JSTL 1.0
{{{
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
}}}
=== Servlet 2.4 ===
* web.xml:
{{{
http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
version="2.4">
}}}
* Struts ("original" taglib, not struts-el)
{{{
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
}}}
* JSTL 1.1
{{{
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
}}}
=== Notes ===
What we call
"JSTL" is really the !JavaServer Pages Standard Tag Library Specification.
There is a Reference Implementation available from Sun at the bottom of
http://jcp.org/aboutJava/communityprocess/final/jsr052/
-
Jakarta has an implementation of the specification, called "Jakarta Standard
Taglib". (One implementation for each version of the JSTL spec.) And that
(the 1.0 verson) is what Struts 1.x distributes with Struts EL.
* [http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html Jakarta
Standard Taglib 1.0]
* [http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html Jakarta
Standard Taglib 1.1]
-
[Struts Wiki] Update of "StrutsDocComments" by MichaelJouravlev
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by MichaelJouravlev: http://wiki.apache.org/struts/StrutsDocComments -- * [http://www.niallp.pwp.blueyonder.co.uk/strutshighlight.html Highlighting error fields] * ... * [:StrutsTags:Using Struts tags, JSTL tags and JSP scriptlets] +* ["StrutsAndJSTL"] -- how to use JSTL with Struts * ["JSTLTags"] -- Use JSTL tags instead of Struts "logic" and "bean" tags when possible * StrutsWidgets -- How to create HTML widgets with Struts JSP tag library * StrutsHtmlOptionsInternationalization
[Struts Wiki] Update of "JSTLTags" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTags
--
is used to display a localized and possibly parameterised
message from a property file bundled with application.
- === Common features ===
+ === Common Setup ===
Resource files should be names according to locale and country, like:
* Messages_en.properties -- English language
@@ -60, +60 @@
* [http://www.systemmobile.com/?p=200 Struts Message Resources]
* ["StrutsAndJSTL"]
+
+
+
+
+
+ = Nested tags =
+
+ == vs. ==
+
+ Struts tags are used for two purposes:
+ * to iterate through and display content of nested beans
+ * to generate proper names of input elements, so these name could be parsed
on input phase
+
+ JSTL helps to iterate and display content of nested beans only,
because JSTL is positioned as render-only technology. Therefore choosing JSTL
tag over Struts tags is not an obvious choice.
+
+ Code samples by Rick Reumann.
+
+ List of Department POJOs. Each Department has a List of Employees.
+ Department properties: List employees, String deptName
+ Employee properties: String empName, String email
+
+ === Struts tags ===
+
+ {{{
+
+
+
+ Employee:
+ E-mail:
+
+ }}}
+
+ === JSTL ===
+
+ {{{
+
+ Department:
+
+ Employee:
+ E-mail:
+
+ }}}
+
+ More information:
+ * [http://www.learntechnology.net/struts-nested.do Struts Nested] -- Rick
Reumann
+
[Struts Wiki] Update of "JSTLTags" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTags
--
This is a stub, feel free to expand.
= Bean tags =
+
+ == ==
+
+ Use implicit JSTL object {{{cookie}}} that contains a read-only collection of
Cookie objects.
+
+ == ==
+
+ == ==
+
+ Use implicit JSTL object {{{header}}} that contains a read-only collection of
request headers.
+
+ == ==
== ==
@@ -60, +72 @@
* [http://www.systemmobile.com/?p=200 Struts Message Resources]
* ["StrutsAndJSTL"]
+ == ==
+ Just refer to the bean name, and JSTL will automatically search for in in
page, request, session and application scopes for you.
+ == ==
+ Use implicit JSTL objects {{{param}}} and {{{paramValues}}}.
+ == ==
+
+ == ==
+
+ No matching object/tag.
+
+ == ==
+
+ No matching object/tag.
+
+ == ==
+
+ Use JSTL tag, or simply ${...} construct if you use JSP 2.0 container.
+
+ Additional information:
+ * [http://www.phptr.com/articles/printerfriendly.asp?p=30946&rl=1 JSTL
Expression Language] by David Geary
+ * [http://www.onjava.com/pub/a/onjava/2002/08/14/jstl1.html JSTL 1.0:
Standardizing JSP, Part 1] by Hans Bergsten
+ * [http://www.onjava.com/pub/a/onjava/2002/09/11/jstl2.html JSTL 1.0: What
JSP Applications Need, Part 2] by Hans Bergsten
+ * [http://www.onjava.com/pub/a/onjava/2002/10/30/jstl3.html JSTL 1.0: What
JSP Applications Need, Part 3] by Hans Bergsten
= Nested tags =
[Struts Wiki] Update of "JSTLTagsBeanMessage" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTagsBeanMessage
New page:
is used to display a localized and possibly parameterised
message from a property file bundled with application.
=== Common Setup ===
Resource files should be names according to locale and country, like:
* Messages_en.properties -- English language
* Messages_fr.properties -- French language
* Messages_fr_CA.properties -- French language, Canadian dialect
=== Struts Taglib ===
struts-config.xml:
{{{
}}}
JSP file:
{{{
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<%-- No arguments --%>
<%-- Passing arguments to a message in a JSP2.0 container --%>
}}}
=== JSTL ===
web.xml:
{{{
javax.servlet.jsp.jstl.fmt.localizationContext
com.acme.webboard.Messages
}}}
JSP file:
{{{
<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt"; %>
<%-- No arguments --%>
<%-- Passing arguments to a message --%>
}}}
More information:
* [http://www-128.ibm.com/developerworks/java/library/j-jstl0415/ A JSTL
primer: Message Resources]
* [http://www.systemmobile.com/?p=200 Struts Message Resources]
[Struts Wiki] Update of "StrutsDocComments" by MichaelJouravlev
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by MichaelJouravlev: http://wiki.apache.org/struts/StrutsDocComments -- * [:StrutsTags:Using Struts tags, JSTL tags and JSP scriptlets] * ["StrutsAndJSTL"] -- how to use JSTL with Struts * ["JSTLTags"] -- Use JSTL tags instead of Struts "logic" and "bean" tags when possible + * ["JSTLTagsBeanMessage"] -- Using instead of * StrutsWidgets -- How to create HTML widgets with Struts JSP tag library * StrutsHtmlOptionsInternationalization * ServingPdfDocuments
[Struts Wiki] Update of "JSTLTagsNested" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTagsNested
New page:
Struts tags are used for two purposes:
* to iterate through and display content of nested beans
* to generate proper names of input elements, so these name could be parsed on
input phase
JSTL helps to iterate and display content of nested beans only,
because JSTL is positioned as render-only technology. Therefore choosing JSTL
tag over Struts tags is not an obvious choice.
Code samples by Rick Reumann.
List of Department POJOs. Each Department has a List of Employees.
Department properties: List employees, String deptName
Employee properties: String empName, String email
=== Struts tags ===
{{{
Employee:
E-mail:
}}}
=== JSTL ===
{{{
Department:
Employee:
E-mail:
}}}
Additional information:
* [http://www.learntechnology.net/struts-nested.do Struts Nested] -- Rick
Reumann
[Struts Wiki] Update of "JSTLTags" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTags
--
= Bean tags =
+ || Struts tag || JSTL tag or implicit object ||
- == ==
-
- Use implicit JSTL object {{{cookie}}} that contains a read-only collection of
Cookie objects.
+ || || Use implicit object {{{cookie}}} that contains a a
read-only collection of Cookie objects ||
+ || || ||
-
- == ==
-
- == ==
-
- Use implicit JSTL object {{{header}}} that contains a read-only collection of
request headers.
+ || ||Use implicit object {{{header}}} that contains a read-only
collection of request headers ||
+ || || Use JSTL action ||
+ || || Use [:JSTLTagsBeanMessage:] JSTL action ||
-
- == ==
-
- == ==
-
- is used to display a localized and possibly parameterised
message from a property file bundled with application.
-
- === Common Setup ===
-
- Resource files should be names according to locale and country, like:
- * Messages_en.properties -- English language
- * Messages_fr.properties -- French language
- * Messages_fr_CA.properties -- French language, Canadian dialect
-
- === Struts Taglib ===
-
- struts-config.xml:
- {{{
-
- }}}
-
- JSP file:
- {{{
- <%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
-
- <%-- No arguments --%>
-
-
- <%-- Passing arguments to a message in a JSP2.0 container --%>
-
- }}}
-
- === JSTL ===
-
- web.xml:
- {{{
-
- javax.servlet.jsp.jstl.fmt.localizationContext
- com.acme.webboard.Messages
-
- }}}
-
- JSP file:
- {{{
- <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt"; %>
-
- <%-- No arguments --%>
-
-
- <%-- Passing arguments to a message --%>
-
-
- }}}
-
- More information:
- * [http://www-128.ibm.com/developerworks/java/library/j-jstl0415/ A JSTL
primer: Message Resources]
- * [http://www.systemmobile.com/?p=200 Struts Message Resources]
- * ["StrutsAndJSTL"]
-
- == ==
-
- Just refer to the bean name, and JSTL will automatically search for in in
page, request, session and application scopes for you.
+ || || Simply refer to the bean name, JSTL will automatically
search for it in page, request, session and application scopes ||
-
- == ==
-
- Use implicit JSTL objects {{{param}}} and {{{paramValues}}}.
+ || || Use implicit JSTL objects {{{param}}} and
{{{paramValues}}} ||
+ || || ||
+ || || No match ||
+ || || No match ||
+ || || Use JSTL tag. On JSP 2.0 container simply use
${...} construct ||
-
- == ==
-
- == ==
-
- No matching object/tag.
-
- == ==
-
- No matching object/tag.
-
- == ==
-
- Use JSTL tag, or simply ${...} construct if you use JSP 2.0 container.
-
- Additional information:
- * [http://www.phptr.com/articles/printerfriendly.asp?p=30946&rl=1 JSTL
Expression Language] by David Geary
- * [http://www.onjava.com/pub/a/onjava/2002/08/14/jstl1.html JSTL 1.0:
Standardizing JSP, Part 1] by Hans Bergsten
- * [http://www.onjava.com/pub/a/onjava/2002/09/11/jstl2.html JSTL 1.0: What
JSP Applications Need, Part 2] by Hans Bergsten
- * [http://www.onjava.com/pub/a/onjava/2002/10/30/jstl3.html JSTL 1.0: What
JSP Applications Need, Part 3] by Hans Bergsten
= Nested tags =
-
- == vs. ==
Struts tags are used for two purposes:
* to iterate through and display content of nested beans
@@ -110, +25 @@
JSTL helps to iterate and display content of nested beans only,
because JSTL is positioned as render-only technology. Therefore choosing JSTL
tag over Struts tags is not an obvious choice.
- Code samples by Rick Reumann.
+ See example here: ["JSTLTagsNested"]
+ = Additional Information =
- List of Department POJOs. Each Department has a List of Employees.
- Department properties: List employees, String deptName
- Employee properties: String empName, String email
+ * ["StrutsAndJSTL"]
+ * [http://www.phptr.com/articles/printerfriendly.asp?p=30946&rl=1 JSTL
Expression Language] by David Geary
+ * [http://www.onjava.com/pub/a/onjava/2002/08/14/jstl1.html JSTL 1.0:
Standardizing JSP, Part 1] by Hans Bergsten
+ * [http://www.onjava.com/pub/a/onjava/2002/09/11/jstl2.html JSTL 1.0: What
JSP Applications Need, Part 2] by Hans Bergsten
+ * [http://www.onjava.com/pub/a/onjava/2002/10/30/jstl3.html JSTL 1.0: What
JSP Applications Need, Part 3] by Hans Bergsten
- === Struts tags ===
-
- {{{
-
-
-
- Employee:
- E-mail:
-
- }}}
-
- === JSTL ===
-
- {{{
-
- Department:
-
- Employee:
- E-mail:
-
- }}}
-
- More information:
* [http://www.learntechnology.net/struts-nested.do Struts Nested] -- Rick
Reumann
[Struts Wiki] Update of "StrutsDocComments" by MichaelJouravlev
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by MichaelJouravlev: http://wiki.apache.org/struts/StrutsDocComments -- * ["StrutsAndJSTL"] -- how to use JSTL with Struts * ["JSTLTags"] -- Use JSTL tags instead of Struts "logic" and "bean" tags when possible * ["JSTLTagsBeanMessage"] -- Using instead of + * ["JSTLTagsNested"] == Using JSTL, plain HTML or Struts HTML tags instead Struts nested tags * StrutsWidgets -- How to create HTML widgets with Struts JSP tag library * StrutsHtmlOptionsInternationalization * ServingPdfDocuments
[Struts Wiki] Update of "StrutsDocComments" by MichaelJouravlev
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by MichaelJouravlev: http://wiki.apache.org/struts/StrutsDocComments -- * [http://www.niallp.pwp.blueyonder.co.uk/strutshighlight.html Highlighting error fields] * ... * [:StrutsTags:Using Struts tags, JSTL tags and JSP scriptlets] +* StrutsTags -- notes on using Struts tags * ["StrutsAndJSTL"] -- how to use JSTL with Struts * ["JSTLTags"] -- Use JSTL tags instead of Struts "logic" and "bean" tags when possible * ["JSTLTagsBeanMessage"] -- Using instead of
[Struts Wiki] Update of "JSTLTags" by MichaelJouravlev
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/JSTLTags
--
|| || No match ||
|| || No match ||
|| || Use JSTL tag. On JSP 2.0 container simply use
${...} construct ||
+
+ = Logic tags =
+
+ Two most notable tags that you will still be using are
, . Other tags can be replaced
with JSTL tags or with better practices, like performing redirect or forward
from an action class.
+
+ || Struts tag || JSTL tag or implicit object ||
+ || || ||
+ || || ||
+ || || No strict match. You can use with extracted
path ||
+ || || ||
+ || || ||
+ || || ||
+ || || ||
+ || || ||
+ || || ||
+ || || No match ||
+ || || No match ||
+ || || ||
+ || || ||
+ || || ||
+ || || ||
+ || || ||
+ || || No strict match. You can use with
extracted path ||
+
= Nested tags =
svn commit: r424524 - /struts/site/src/site/xdoc/volunteers.xml
Author: martinc Date: Fri Jul 21 21:57:22 2006 New Revision: 424524 URL: http://svn.apache.org/viewvc?rev=424524&view=rev Log: New PMC members and committers. Modified: struts/site/src/site/xdoc/volunteers.xml Modified: struts/site/src/site/xdoc/volunteers.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/volunteers.xml?rev=424524&r1=424523&r2=424524&view=diff == --- struts/site/src/site/xdoc/volunteers.xml (original) +++ struts/site/src/site/xdoc/volunteers.xml Fri Jul 21 21:57:22 2006 @@ -133,6 +133,18 @@ Greg Reddin (greddin at apache.org) + +Laurie Harper +(laurieh at apache.org) + + +Jason Carreira +(jcarreira at apache.org) + + +Patrick Lightbody +(plightbo at apache.org) + @@ -155,22 +167,10 @@ (dgeary at apache.org) -Laurie Harper -(laurieh at apache.org) - - Richard Feit (rich at apache.org) -Jason Carreira -(jcarreira at apache.org) - - -Patrick Lightbody -(plightbo at apache.org) - - Alexandru Popescu (apopescu at apache.org) @@ -193,6 +193,14 @@ Michael Jouravlev (mikus at apache.org) + + +Paul Benedict +(pbenedict at apache.org) + + +Antonio Petrelli +(apetrelli at apache.org)
[Struts Wiki] Update of "StrutsActionRelease135" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/StrutsActionRelease135 -- Everyone in the Struts community, users, developers, and committers, is encouraged to test a release, report any issues, and post to dev@ any comments on the overall quality of the release. + The Struts 1.3.5 Test Build is available here: http://people.apache.org/builds/struts/1.3.5 + - To help everyone get started with Struts Action 1.3.5 (when it is available), here are the simplest installation instructions that can possibly work: + To help everyone get started with Struts 1.3.5 (when it is available), here are the simplest installation instructions that can possibly work: * Download the Struts 1.3.5 snapshot from http://people.apache.org/builds/struts/1.3.x/assembly/ * Extract the snapshot to a likely location (/opt/struts-1.3.5-SNAPSHOT)
svn commit: r424526 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/ views/freemarker/tags/
Author: tmjee
Date: Fri Jul 21 22:33:27 2006
New Revision: 424526
URL: http://svn.apache.org/viewvc?rev=424526&view=rev
Log:
WW-1389
- Add If, Else and ElseIf to freemarker model
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java
(with props)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java
(with props)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java
(with props)
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java?rev=424526&r1=424525&r2=424526&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
Fri Jul 21 22:33:27 2006
@@ -75,17 +75,16 @@
//make the comparision
answer = (Boolean) findValue(test, Boolean.class);
-return answer != null && answer.booleanValue();
-}
-
-public boolean end(Writer writer, String body) {
if (answer == null) {
answer = Boolean.FALSE;
}
-
if (answer.booleanValue()) {
stack.getContext().put(If.ANSWER, answer);
}
+return answer != null && answer.booleanValue();
+}
+
+public boolean end(Writer writer, String body) {
return super.end(writer, "");
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java?rev=424526&r1=424525&r2=424526&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
Fri Jul 21 22:33:27 2006
@@ -84,12 +84,12 @@
if (answer == null) {
answer = Boolean.FALSE;
}
-
+
+stack.getContext().put(ANSWER, answer);
return answer.booleanValue();
}
public boolean end(Writer writer, String body) {
-stack.getContext().put(ANSWER, answer);
return super.end(writer, body);
}
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java?rev=424526&view=auto
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java
Fri Jul 21 22:33:27 2006
@@ -0,0 +1,41 @@
+/*
+ * $Id: I18nModel.java 420385 2006-07-10 00:57:05Z tmjee $
+ *
+ * Copyright 2006 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts2.views.freemarker.tags;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.ElseIf;
+
+import com.opensymphony.xwork2.util.OgnlValueStack;
+
+/**
+ * @version $Date$ $Id$
+ */
+public class ElseIfModel extends TagModel {
+
+ public ElseIfModel(OgnlValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
+ super(stack, req, res);
+ }
+
+ protected Component getBean() {
+ return new ElseIf(stack);
+ }
+
+}
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java
--
svn:eol-style = native
A
