Author: craigmcc
Date: Thu Oct 12 15:16:35 2006
New Revision: 463465
URL: http://svn.apache.org/viewvc?view=rev&rev=463465
Log:
Adapt to refactorings of the shale dialog support.
SHALE-300
Modified:
shale/framework/trunk/shale-apps/pom.xml
shale/framework/trunk/shale-apps/shale-blank/pom.xml
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
Modified: shale/framework/trunk/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/pom.xml?view=diff&rev=463465&r1=463464&r2=463465
==============================================================================
--- shale/framework/trunk/shale-apps/pom.xml (original)
+++ shale/framework/trunk/shale-apps/pom.xml Thu Oct 12 15:16:35 2006
@@ -333,6 +333,8 @@
<module>shale-mailreader</module>
<module>shale-usecases</module>
<module>shale-clay-usecases</module>
+ <module>shale-test-dialog-basic</module>
+ <module>shale-test-dialog-scxml</module>
<module>shale-test-view</module>
</modules>
Modified: shale/framework/trunk/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/pom.xml?view=diff&rev=463465&r1=463464&r2=463465
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/pom.xml Thu Oct 12 15:16:35
2006
@@ -89,6 +89,18 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-dialog</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-dialog-basic</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
<version>${version}</version>
<scope>test</scope>
Modified:
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java?view=diff&rev=463465&r1=463464&r2=463465
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
(original)
+++
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
Thu Oct 12 15:16:35 2006
@@ -88,11 +88,11 @@
// Copy relevant values back to our parent dialog's data
ValueBinding vb = null;
- vb =
context.getApplication().createValueBinding("#{dialog2.parent.data.city}");
+ vb =
context.getApplication().createValueBinding("#{dialog.parent.data.city}");
vb.setValue(context, city.getCity());
- vb =
context.getApplication().createValueBinding("#{dialog2.parent.data.state}");
+ vb =
context.getApplication().createValueBinding("#{dialog.parent.data.state}");
vb.setValue(context, city.getState());
- vb =
context.getApplication().createValueBinding("#{dialog2.parent.data.zipCode}");
+ vb =
context.getApplication().createValueBinding("#{dialog.parent.data.zipCode}");
vb.setValue(context, city.getZipCode());
// Exit the dialog now that we have copied back the relevant values
