Author: rich
Date: Fri Sep 9 15:57:08 2005
New Revision: 279904
URL: http://svn.apache.org/viewcvs?rev=279904&view=rev
Log:
Some doc corrections from Krista Baker (thanks Krista!)
tests: build.release in docs/forrest (WinXP)
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowInheritance.xml
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml?rev=279904&r1=279903&r2=279904&view=diff
==============================================================================
---
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
(original)
+++
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
Fri Sep 9 15:57:08 2005
@@ -9,9 +9,9 @@
<section id="intro">
<title>Introduction</title>
<p>
- Declarative exception handling is a powerful feature offered
by NetUI Page Flow. It allows you to
- define handling for expected and unexpected exceptions
<em>without</em> cluttering your controller
- logic. Consider the following action method:
+ Declarative exception handling is a powerful feature offered
by NetUI. It allows you to define handling
+ for expected and unexpected exceptions <em>without</em>
cluttering your controller logic. Consider the
+ following action method:
</p>
<source xml:space="preserve">
@Jpf.Action(
@@ -194,7 +194,7 @@
<code>method</code>
</a>
attribute on <code>@Jpf.Catch</code>, you are signalling that
you want an exception to be handled with
- an <em>exception-handler</em> method. To make such an method,
you use the
+ an <em>exception-handler</em> method. To make such a method,
you use the
<a
href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">
<code>@Jpf.ExceptionHandler</code>
</a>
@@ -240,7 +240,7 @@
<section id="sharingExceptionHandling">
<title>Sharing Exception Handling</title>
<p>
- Exception handling works well with the <a
href="site:pageflow_inheritance">Page Flow Inheritance</a>
+ Exception handling works well with the <a
href="site:pageflow_inheritance">Page Flow inheritance</a>
and <a href="site:pageflow_sharedFlow">Shared Flow</a>
features, both of which allow you to share
exception handling across multiple page flows. The
documentation gives guidelines on when to use each
one.
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml?rev=279904&r1=279903&r2=279904&view=diff
==============================================================================
---
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
(original)
+++
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
Fri Sep 9 15:57:08 2005
@@ -17,7 +17,7 @@
When you hit the URL for a page flow (or any of its
actions, or any of its pages) for the first
time, an instance of the controller class is created
and stored in the user session. By default,
it stays in the session as the <em>current page
flow</em> until you hit another page flow.
- This means that while you continue to hit URLs in the
page flow's URL space, the same instance
+ This means that while you continue to hit URLs in the
page flow's URL space, it
remains the current page flow. When you do hit
another page flow, the original controller
instance is destroyed. In other words, by default
there is only a <em>single page flow
controller</em> stored in the session at one time.
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowInheritance.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowInheritance.xml?rev=279904&r1=279903&r2=279904&view=diff
==============================================================================
---
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowInheritance.xml
(original)
+++
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowInheritance.xml
Fri Sep 9 15:57:08 2005
@@ -24,6 +24,7 @@
</section>
<section id="basic">
<title>Basic Inheritance</title>
+ <p/>
<section id="inheritingMembers">
<title>Inheriting Plain Members</title>
<p>
@@ -186,7 +187,8 @@
) </source>
<p>
The basic rule is that attributes (e.g,
<code>nested=true</code>) are inherited, while arrays
- (e.g., <code>simpleActions={...}</code> are inherited and
merged.
+ (e.g., <code>simpleActions={...}</code>) are inherited and
merged. When there are conflicts, values
+ from the derived controller <em>override</em> values from
the base controller, as you would expect.
</p>
</section>
</section>
