You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by ra...@apache.org on 2007/06/13 18:08:46 UTC
svn commit: r546943 -
/shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
Author: rahul
Date: Wed Jun 13 09:08:46 2007
New Revision: 546943
URL: http://svn.apache.org/viewvc?view=rev&rev=546943
Log:
Subdialog not returning to calling dialog
SHALE-423
Have to execute action twice to return to calling dialog
SHALE-386
Porting r544613 from trunk.
Modified:
shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
Modified: shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java?view=diff&rev=546943&r1=546942&r2=546943
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java (original)
+++ shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java Wed Jun 13 09:08:46 2007
@@ -411,6 +411,10 @@
position = peek();
if (position == null) {
stop(context);
+ } else {
+ transition(position, outcome);
+ state = position.getState();
+ continue;
}
viewId = ((EndState) state).getViewId();
redirect = ((EndState) state).isRedirect();
Re: svn commit: r546943 - /shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
Posted by Rahul Akolkar <ra...@gmail.com>.
On 6/13/07, Craig McClanahan <cr...@apache.org> wrote:
> Rahul,
>
> Many many thanks for taking these on ... I work remotely so I can
> generally skim email during long meetings (don't tell my boss :-), but
> it's difficult to do substantitve stuff.
>
<snip/>
This one was hardly any work, you may be over-thanking me with those
many thanks :-)
-Rahul
> Craig
>
>
> On 6/13/07, rahul@apache.org <ra...@apache.org> wrote:
> > Author: rahul
> > Date: Wed Jun 13 09:08:46 2007
> > New Revision: 546943
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=546943
> > Log:
> > Subdialog not returning to calling dialog
> > SHALE-423
> >
> > Have to execute action twice to return to calling dialog
> > SHALE-386
> >
> > Porting r544613 from trunk.
> >
> > Modified:
> > shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
> >
> > Modified: shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
> > URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java?view=diff&rev=546943&r1=546942&r2=546943
> > ==============================================================================
> > --- shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java (original)
> > +++ shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java Wed Jun 13 09:08:46 2007
> > @@ -411,6 +411,10 @@
> > position = peek();
> > if (position == null) {
> > stop(context);
> > + } else {
> > + transition(position, outcome);
> > + state = position.getState();
> > + continue;
> > }
> > viewId = ((EndState) state).getViewId();
> > redirect = ((EndState) state).isRedirect();
> >
> >
> >
>
Re: svn commit: r546943 - /shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
Posted by Craig McClanahan <cr...@apache.org>.
Rahul,
Many many thanks for taking these on ... I work remotely so I can
generally skim email during long meetings (don't tell my boss :-), but
it's difficult to do substantitve stuff.
Craig
On 6/13/07, rahul@apache.org <ra...@apache.org> wrote:
> Author: rahul
> Date: Wed Jun 13 09:08:46 2007
> New Revision: 546943
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=546943
> Log:
> Subdialog not returning to calling dialog
> SHALE-423
>
> Have to execute action twice to return to calling dialog
> SHALE-386
>
> Porting r544613 from trunk.
>
> Modified:
> shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
>
> Modified: shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
> URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java?view=diff&rev=546943&r1=546942&r2=546943
> ==============================================================================
> --- shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java (original)
> +++ shale/framework/branches/SHALE_1_0_X/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java Wed Jun 13 09:08:46 2007
> @@ -411,6 +411,10 @@
> position = peek();
> if (position == null) {
> stop(context);
> + } else {
> + transition(position, outcome);
> + state = position.getState();
> + continue;
> }
> viewId = ((EndState) state).getViewId();
> redirect = ((EndState) state).isRedirect();
>
>
>