Author: rahul
Date: Mon Oct 30 19:28:36 2006
New Revision: 469357
URL: http://svn.apache.org/viewvc?view=rev&rev=469357
Log:
The "popup" dialog was broken in the test apps; there were some sandbox
remnants that spoke of dialog2.
SHALE-300
Modified:
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/java/org/apache/shale/examples/test/dialog/scxml/Popup.java
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/wizardpage2.jsp
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=469357&r1=469356&r2=469357
==============================================================================
---
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
Mon Oct 30 19:28:36 2006
@@ -60,7 +60,7 @@
// Import the currently selected state from our parent dialog
FacesContext context = FacesContext.getCurrentInstance();
- ValueBinding vb =
context.getApplication().createValueBinding("#{dialog2.parent.data.state}");
+ ValueBinding vb =
context.getApplication().createValueBinding("#{dialog.parent.data.state}");
String state = (String) vb.getValue(context);
// Set the currently selected state into our dialog data
Modified:
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp?view=diff&rev=469357&r1=469356&r2=469357
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp
(original)
+++
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp
Mon Oct 30 19:28:36 2006
@@ -77,7 +77,7 @@
value="#{dialog.data.zipCode}"/>
<h:outputLink id="zipCodePopup"
value="#"
-
onclick="javascript:window.open('popuppage1.faces?org.apache.shale.dialog2.PARENT_ID=#{dialog2.id}&org.apache.shale.dialog2.DIALOG_NAME=popup','popup','height=600,width=800')">
+
onclick="javascript:window.open('popuppage1.faces?org.apache.shale.dialog.PARENT_ID=#{dialog.id}&org.apache.shale.dialog.DIALOG_NAME=popup','popup','height=600,width=800')">
<h:outputText
value="Pop Up"/>
</h:outputLink>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml?view=diff&rev=469357&r1=469356&r2=469357
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml Mon Oct 30
19:28:36 2006
@@ -31,7 +31,7 @@
<artifactId>shale-test-dialog-scxml</artifactId>
<packaging>war</packaging>
<name>Shale Test App (Dialog SCXML Implementation)</name>
- <description>A sample application for Shale dialog features when using the
Commons SCXML dialog2 implementation.</description>
+ <description>A sample application for Shale dialog features when using the
Commons SCXML dialog implementation.</description>
<dependencies>
Modified:
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/java/org/apache/shale/examples/test/dialog/scxml/Popup.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/java/org/apache/shale/examples/test/dialog/scxml/Popup.java?view=diff&rev=469357&r1=469356&r2=469357
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/java/org/apache/shale/examples/test/dialog/scxml/Popup.java
(original)
+++
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/java/org/apache/shale/examples/test/dialog/scxml/Popup.java
Mon Oct 30 19:28:36 2006
@@ -60,7 +60,7 @@
// Import the currently selected state from our parent dialog
FacesContext context = FacesContext.getCurrentInstance();
- ValueBinding vb =
context.getApplication().createValueBinding("#{dialog2.parent.data.state}");
+ ValueBinding vb =
context.getApplication().createValueBinding("#{dialog.parent.data.state}");
String state = (String) vb.getValue(context);
// Set the currently selected state into our dialog data
Modified:
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/wizardpage2.jsp
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/wizardpage2.jsp?view=diff&rev=469357&r1=469356&r2=469357
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/wizardpage2.jsp
(original)
+++
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/wizardpage2.jsp
Mon Oct 30 19:28:36 2006
@@ -77,7 +77,7 @@
value="#{dialog.data.zipCode}"/>
<h:outputLink id="zipCodePopup"
value="#"
-
onclick="javascript:window.open('popuppage1.faces?org.apache.shale.dialog2.PARENT_ID=#{dialog2.id}&org.apache.shale.dialog2.DIALOG_NAME=popup','popup','height=600,width=800')">
+
onclick="javascript:window.open('popuppage1.faces?org.apache.shale.dialog.PARENT_ID=#{dialog.id}&org.apache.shale.dialog.DIALOG_NAME=popup','popup','height=600,width=800')">
<h:outputText
value="Pop Up"/>
</h:outputLink>
