Author: jkuhnert
Date: Sun Jan 14 14:50:08 2007
New Revision: 496175
URL: http://svn.apache.org/viewvc?view=rev&rev=496175
Log:
Enabled script template expresssion compilation after fixing super/interface
class casting issues in ognl.
Modified:
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/TimeTracker/src/context/Home.html
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleList.html
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/css/workbench.css
tapestry/tapestry4/branches/ognl-integration/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
Modified:
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/TimeTracker/src/context/Home.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/ognl-integration/tapestry-examples/TimeTracker/src/context/Home.html?view=diff&rev=496175&r1=496174&r2=496175
==============================================================================
---
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/TimeTracker/src/context/Home.html
(original)
+++
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/TimeTracker/src/context/Home.html
Sun Jan 14 14:50:08 2007
@@ -64,7 +64,7 @@
<div jwcid="[EMAIL PROTECTED]" >
<h2 jwcid="@If" condition="ognl:selectedProject" style="clear:left" >
- <span jwcid="[EMAIL PROTECTED]"
value="ognl:selectedProject.name" />
+ <span jwcid="[EMAIL PROTECTED]" minWidth="250"
value="ognl:selectedProject.name" />
</h2>
</div>
Modified:
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleList.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleList.html?view=diff&rev=496175&r1=496174&r2=496175
==============================================================================
---
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleList.html
(original)
+++
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleList.html
Sun Jan 14 14:50:08 2007
@@ -23,8 +23,8 @@
<table jwcid="tableView" width="100%" class="list">
<tr>
- <td colspan="7">
- <span jwcid="[EMAIL PROTECTED]:TableFormPages"/>
+ <td class="tablePages" colspan="7">
+ <span class="tablePagesLinks" jwcid="[EMAIL
PROTECTED]:TableFormPages"/>
</td>
</tr>
Modified:
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc?view=diff&rev=496175&r1=496174&r2=496175
==============================================================================
---
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc
(original)
+++
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc
Sun Jan 14 14:50:08 2007
@@ -74,7 +74,7 @@
<component id="verbosity" type="Any">
<binding name="element" value="literal:td"/>
<binding name="style">ognl:
- "background-color:blue; width:"
+ "background-color:#A2E283;border:1px solid #88BD6D; width:"
+ (currentLocaleVerbosity / 2) + "px"
</binding>
</component>
Modified:
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/css/workbench.css
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/css/workbench.css?view=diff&rev=496175&r1=496174&r2=496175
==============================================================================
---
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/css/workbench.css
(original)
+++
tapestry/tapestry4/branches/ognl-integration/tapestry-examples/Workbench/src/context/css/workbench.css
Sun Jan 14 14:50:08 2007
@@ -292,3 +292,32 @@
list-style:none;
font-style:italic;
}
+/*
+.tablePages {
+ background-color: #5298D9;
+ padding-top: 0.1em;
+ padding-bottom: 0.1em;
+ padding-left: 0.1em;
+ margin: 0;
+ padding-bottom: 0;
+ -moz-border-radius-topleft: 0.3em;
+ -moz-border-radius-topright: 0.3em;
+}
+
+.tablePagesLinks {
+ background-color: #E0F3F7;
+ display:block;
+ padding-top: 0.4em;
+ padding-bottom: 0.1em;
+ padding-left: 0.4em;
+ margin:0;
+ -moz-border-radius-topleft: 0.3em;
+ -moz-border-radius-topright: 0.3em;
+}
+*/
+/*
+.tablePagesLinks span a, .tablePagesLinks a, .tablePagesLinks {
+ color: #7E7E7E;
+ font-size: 1.1em;
+}
+*/
\ No newline at end of file
Modified:
tapestry/tapestry4/branches/ognl-integration/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/ognl-integration/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java?view=diff&rev=496175&r1=496174&r2=496175
==============================================================================
---
tapestry/tapestry4/branches/ognl-integration/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
(original)
+++
tapestry/tapestry4/branches/ognl-integration/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
Sun Jan 14 14:50:08 2007
@@ -19,6 +19,7 @@
import java.util.Map;
import ognl.ClassResolver;
+import ognl.Node;
import ognl.Ognl;
import ognl.OgnlContext;
import ognl.OgnlRuntime;
@@ -96,7 +97,14 @@
public Object read(Object target, String expression)
{
- return readCompiled(target,
_expressionCache.getCompiledExpression(expression));
+ Node node = (Node)_expressionCache.getCompiledExpression(target,
expression);
+
+ if (node.getAccessor() != null)
+ return read(target, node.getAccessor());
+
+ return readCompiled(target, node);
+
+ //return read(target,
_expressionCache.getCompiledExpression(expression));
}
public Object readCompiled(Object target, Object expression)
