Author: jkuhnert
Date: Wed Feb 14 21:05:56 2007
New Revision: 507820
URL: http://svn.apache.org/viewvc?view=rev&rev=507820
Log:
Removed redundant renderTag from Any as all components have it now. Started
looking at a fix for meta injected properties
with no existing explcit definition but backed off when I saw how much
refactoring it'd need. (for now)
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/Home.page
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectEnhancementWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectMetaWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/Home.page
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/Home.page?view=diff&rev=507820&r1=507819&r2=507820
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/Home.page
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/Home.page
Wed Feb 14 21:05:56 2007
@@ -20,8 +20,12 @@
"http://tapestry.apache.org/dtd/Tapestry_4_0.dtd";>
<page-specification class="org.apache.tapestry.timetracker.page.TaskEntryPage">
-
- <property name="dlHidden" initial-value="true" />
+
+ <meta key="dlHiddenMeta" value="true" />
+ <inject property="dlHidden" object="dlHiddenMeta" type="meta"/>
+ <!--
+ <property name="dlHidden" initial-value="true" />
+ -->
</page-specification>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.jwc?view=diff&rev=507820&r1=507819&r2=507820
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.jwc
Wed Feb 14 21:05:56 2007
@@ -25,15 +25,9 @@
informal parameters).
</description>
- <parameter name="element" default-value="ognl:templateTag">
+ <parameter name="element" default-value="ognl:templateTagName" >
<description>
The element to emulate.
- </description>
- </parameter>
-
- <parameter name="templateTag">
- <description>
- The tag used to add this component in a template.
</description>
</parameter>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectEnhancementWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectEnhancementWorker.java?view=diff&rev=507820&r1=507819&r2=507820
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectEnhancementWorker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectEnhancementWorker.java
Wed Feb 14 21:05:56 2007
@@ -36,7 +36,6 @@
* exceptions are caught and reported by the invoker.
*/
- void performEnhancement(EnhancementOperation op,
- InjectSpecification spec);
+ void performEnhancement(EnhancementOperation op, InjectSpecification spec);
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectMetaWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectMetaWorker.java?view=diff&rev=507820&r1=507819&r2=507820
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectMetaWorker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/InjectMetaWorker.java
Wed Feb 14 21:05:56 2007
@@ -68,14 +68,15 @@
Defense.notNull(metaKey, "metaKey");
Class propertyType = op.getPropertyType(propertyName);
-
+ if (propertyType == null) {
+
+ }
+
op.claimReadonlyProperty(propertyName);
- String sourceName = op
- .addInjectedField(SOURCE_NAME, ComponentPropertySource.class,
_source);
+ String sourceName = op.addInjectedField(SOURCE_NAME,
ComponentPropertySource.class, _source);
- MethodSignature sig = new MethodSignature(propertyType, op
- .getAccessorMethodName(propertyName), null, null);
+ MethodSignature sig = new MethodSignature(propertyType,
op.getAccessorMethodName(propertyName), null, null);
String parser = (String) _primitiveParser.get(propertyType);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js?view=diff&rev=507820&r1=507819&r2=507820
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js Wed Feb
14 21:05:56 2007
@@ -242,8 +242,8 @@
dojo.log.debug("loadScriptContent(): scriptInFlight is
true, sleeping");
setTimeout(function() {
tapestry.loadScriptContent(element, async);}, 5);
return;
- }
-
+ }
+
var text=tapestry.html.getContentAsString(element);
var match = new RegExp(tapestry.ScriptFragment, 'img');
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java?view=diff&rev=507820&r1=507819&r2=507820
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
Wed Feb 14 21:05:56 2007
@@ -214,5 +214,44 @@
verify();
}
+
+ @Test(enabled = false)
+ public void test_Unimplemented_Property()
+ {
+ Location l = newLocation();
+ InjectSpecification spec = newSpec("fooBar", "foo.bar", l);
+
+ ComponentPropertySource source = newSource();
+
+ EnhancementOperation op = newMock(EnhancementOperation.class);
+ expect(op.getPropertyType("fooBar")).andReturn(null);
+
+ op.claimReadonlyProperty("fooBar");
+
+ MethodSignature sig = new MethodSignature(boolean.class, "getFooBar",
null, null);
+
+ expect(op.addInjectedField(InjectMetaWorker.SOURCE_NAME,
ComponentPropertySource.class, source)).andReturn("_source");
+
+ expect(op.getAccessorMethodName("fooBar")).andReturn("getFooBar");
+
+ BodyBuilder builder = new BodyBuilder();
+ builder.begin();
+ builder.addln("java.lang.String meta =
_source.getComponentProperty(this, \"foo.bar\");");
+ builder.addln("return
java.lang.Boolean.valueOf(meta).booleanValue();");
+ builder.end();
+
+ op.addMethod(Modifier.PUBLIC, sig, builder.toString(), l);
+
+ replay();
+
+ InjectMetaWorker worker = new InjectMetaWorker();
+
+ worker.setSource(source);
+
+ worker.performEnhancement(op, spec);
+
+ verify();
+ }
+
}
