Author: gvanmatre
Date: Sun Nov 27 10:28:21 2005
New Revision: 349273
URL: http://svn.apache.org/viewcvs?rev=349273&view=rev
Log:
Tweak for generic layout symbol replacement and rolodex back button for the jsp
example.
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml
struts/shale/trunk/use-cases/src/web/rolodex/rolodex.jsp
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java?rev=349273&r1=349272&r2=349273&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
Sun Nov 27 10:28:21 2005
@@ -319,9 +319,9 @@
Map symbolTable = new TreeMap();
symbolTable.putAll(getDisplayElementRoot().getSymbols());
- symbolTable.put(Globals.MANAGED_BEAN_MNEMONIC, getManagedBeanName());
symbolTable.putAll(getSymbols());
- clayContext.setSymbols(symbolTable);
+ clayContext.setSymbols(symbolTable);
+
clayContext.setRootElement(getDisplayElementRoot());
clayContext.setParent(this);
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java?rev=349273&r1=349272&r2=349273&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
Sun Nov 27 10:28:21 2005
@@ -24,6 +24,7 @@
import org.apache.commons.chain.Context;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.shale.clay.component.Clay;
import org.apache.shale.clay.config.beans.ComponentBean;
/**
@@ -121,6 +122,9 @@
new Object[] { id, displayElement.getJsfid(), new
Integer(clayContext.getChildIndex()) }));
}
+ if (child instanceof Clay)
+ ((Clay)
child).getSymbols().putAll(clayContext.getSymbols());
+
// reassign the child to the converter for the
// AssignPropertiesCommand
clayContext.setChild(child);
Modified: struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml?rev=349273&r1=349272&r2=349273&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml (original)
+++ struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml Sun Nov 27
10:28:21 2005
@@ -232,7 +232,14 @@
<from-action>#{rolodex.changeTab}</from-action>
<from-outcome>rolodex$test</from-outcome>
<to-view-id>/rolodex/rolodex.jsp</to-view-id>
- </navigation-case>
+ </navigation-case>
+ <navigation-case>
+ <from-action>home</from-action>
+ <from-outcome>home</from-outcome>
+ <to-view-id>/usecases.faces</to-view-id>
+ <redirect/>
+ </navigation-case>
+
</navigation-rule>
Modified: struts/shale/trunk/use-cases/src/web/rolodex/rolodex.jsp
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/rolodex/rolodex.jsp?rev=349273&r1=349272&r2=349273&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/web/rolodex/rolodex.jsp (original)
+++ struts/shale/trunk/use-cases/src/web/rolodex/rolodex.jsp Sun Nov 27
10:28:21 2005
@@ -120,9 +120,9 @@
<[EMAIL PROTECTED] file="../messages.jspf"%>
<body class="section-1">
- <h:commandLink action="home" value="Back"/>
-
<h:form>
+ <h:commandLink action="home" value="Back" immediate="true"/><br/><br/>
+
<!-- Example of the runtime option. The createTabs method
binding event builds the tab links
dynamically in the view controller -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
