Author: craigmcc
Date: Sat Sep 2 14:36:49 2006
New Revision: 439660
URL: http://svn.apache.org/viewvc?rev=439660&view=rev
Log:
Clean up remaining implementation bugs -- the shale-dialog2-legacy
implementation now appears to function correctly, for both navigation-started
and programmatic-started dialogs.
Modified:
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/AbstractState.java
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/ConfigurationParser.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
shale/sandbox/shale-test-dialog2-legacy/src/main/webapp/wizardpage3.jsp
Modified:
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/AbstractState.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/AbstractState.java?rev=439660&r1=439659&r2=439660&view=diff
==============================================================================
---
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/AbstractState.java
(original)
+++
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/AbstractState.java
Sat Sep 2 14:36:49 2006
@@ -33,7 +33,7 @@
* @since 1.0.4
*/
-abstract class AbstractState implements State {
+public abstract class AbstractState implements State {
// ------------------------------------------------------ Instance
Variables
Modified:
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/ConfigurationParser.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/ConfigurationParser.java?rev=439660&r1=439659&r2=439660&view=diff
==============================================================================
---
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/ConfigurationParser.java
(original)
+++
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/config/ConfigurationParser.java
Sat Sep 2 14:36:49 2006
@@ -194,7 +194,7 @@
digester.addSetProperties("dialogs/dialog/action");
digester.addSetProperty("dialogs/dialog/action/property", "name",
"value");
digester.addSetNext("dialogs/dialog/action",
- "addState", "org.apache.shale.dialog.State");
+ "addState",
"org.apache.shale.dialog2.legacy.model.State");
// dialogs/dialog/action/transition
digester.addObjectCreate("dialogs/dialog/action/transition",
"className",
@@ -202,7 +202,7 @@
digester.addSetProperties("dialogs/dialog/action/transition");
digester.addSetProperty("dialogs/dialog/action/transition/property",
"name", "value");
digester.addSetNext("dialogs/dialog/action/transition",
- "addTransition",
"org.apache.shale.dialog.Transition");
+ "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
// dialogs/dialog/end
digester.addObjectCreate("dialogs/dialog/end", "className",
@@ -210,7 +210,7 @@
digester.addSetProperties("dialogs/dialog/end");
digester.addSetProperty("dialogs/dialog/end/property", "name",
"value");
digester.addSetNext("dialogs/dialog/end",
- "addState", "org.apache.shale.dialog.State");
+ "addState",
"org.apache.shale.dialog2.legacy.model.State");
// dialogs/dialog/end/transition
digester.addObjectCreate("dialogs/dialog/end/transition", "className",
@@ -218,7 +218,7 @@
digester.addSetProperties("dialogs/dialog/end/transition");
digester.addSetProperty("dialogs/dialog/end/transition/property",
"name", "value");
digester.addSetNext("dialogs/dialog/end/transition",
- "addTransition",
"org.apache.shale.dialog.Transition");
+ "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
// dialogs/dialog/subdialog
digester.addObjectCreate("dialogs/dialog/subdialog", "className",
@@ -226,7 +226,7 @@
digester.addSetProperties("dialogs/dialog/subdialog");
digester.addSetProperty("dialogs/dialog/subdialog/property", "name",
"value");
digester.addSetNext("dialogs/dialog/subdialog",
- "addState", "org.apache.shale.dialog.State");
+ "addState",
"org.apache.shale.dialog2.legacy.model.State");
// dialogs/dialog/subdialog/transition
digester.addObjectCreate("dialogs/dialog/subdialog/transition",
"className",
@@ -234,7 +234,7 @@
digester.addSetProperties("dialogs/dialog/subdialog/transition");
digester.addSetProperty("dialogs/dialog/subdialog/transition/property", "name",
"value");
digester.addSetNext("dialogs/dialog/subdialog/transition",
- "addTransition",
"org.apache.shale.dialog.Transition");
+ "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
// dialogs/dialog/transition
digester.addObjectCreate("dialogs/dialog/transition", "className",
@@ -242,7 +242,7 @@
digester.addSetProperties("dialogs/dialog/transition");
digester.addSetProperty("dialogs/dialog/transition/property", "name",
"value");
digester.addSetNext("dialogs/dialog/transition",
- "addTransition",
"org.apache.shale.dialog.Transition");
+ "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
// dialogs/dialog/view
digester.addObjectCreate("dialogs/dialog/view", "className",
@@ -250,7 +250,7 @@
digester.addSetProperties("dialogs/dialog/view");
digester.addSetProperty("dialogs/dialog/view/property", "name",
"value");
digester.addSetNext("dialogs/dialog/view",
- "addState", "org.apache.shale.dialog.State");
+ "addState",
"org.apache.shale.dialog2.legacy.model.State");
// dialogs/dialog/view/transition
digester.addObjectCreate("dialogs/dialog/view/transition", "className",
@@ -258,7 +258,7 @@
digester.addSetProperties("dialogs/dialog/view/transition");
digester.addSetProperty("dialogs/dialog/view/transition/property",
"name", "value");
digester.addSetNext("dialogs/dialog/view/transition",
- "addTransition",
"org.apache.shale.dialog.Transition");
+ "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
return digester;
Modified:
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java?rev=439660&r1=439659&r2=439660&view=diff
==============================================================================
---
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
(original)
+++
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
Sat Sep 2 14:36:49 2006
@@ -137,7 +137,7 @@
+ "' for FacesContext instance '"
+ context + "'");
}
- map.put(Constants.CONTEXT_ID_ATTR, dcontext);
+ map.put(Constants.CONTEXT_ID_ATTR, dcontext.getId());
} else {
if (log.isTraceEnabled()) {
log.trace("beforePhase() erasing dialog context id "
Modified:
shale/sandbox/shale-test-dialog2-legacy/src/main/webapp/wizardpage3.jsp
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-test-dialog2-legacy/src/main/webapp/wizardpage3.jsp?rev=439660&r1=439659&r2=439660&view=diff
==============================================================================
--- shale/sandbox/shale-test-dialog2-legacy/src/main/webapp/wizardpage3.jsp
(original)
+++ shale/sandbox/shale-test-dialog2-legacy/src/main/webapp/wizardpage3.jsp Sat
Sep 2 14:36:49 2006
@@ -36,14 +36,14 @@
<h:outputLabel for="administrator"
value="Administrator:"/>
- <h:selectOneCheckbox
+ <h:selectBooleanCheckbox
id="administrator"
value="#{dialog2.data.administrator}"/>
<h:message for="administrator"/>
<h:outputLabel for="enabled"
value="Enabled:"/>
- <h:selectOneCheckbox
+ <h:selectBooleanCheckbox
id="enabled"
value="#{dialog2.data.enabled}"/>
<h:message for="enabled"/>
