You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by mi...@apache.org on 2005/07/06 12:25:44 UTC
cvs commit: jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector ShowDescription.jwc ShowSpecification.html ShowProperties.jwc Inspector.java ShowTemplate.java ShowTemplate.jwc ShowEngine.jwc
mindbridge 2005/07/06 03:25:44
Modified: contrib/src/java/org/apache/tapestry/contrib/inspector
ShowDescription.jwc ShowSpecification.html
ShowProperties.jwc Inspector.java ShowTemplate.java
ShowTemplate.jwc ShowEngine.jwc
Log:
Fixing some issues of the Inspector caused by the new version
Revision Changes Path
1.4 +1 -1 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowDescription.jwc
Index: ShowDescription.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowDescription.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ShowDescription.jwc 6 Jan 2005 02:17:25 -0000 1.3
+++ ShowDescription.jwc 6 Jul 2005 10:25:44 -0000 1.4
@@ -25,7 +25,7 @@
<parameter name="description" required="yes"/>
- <component id="ifDescription" type="Conditional">
+ <component id="ifDescription" type="If">
<inherited-binding name="condition" parameter-name="description"/>
</component>
1.3 +7 -7 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowSpecification.html
Index: ShowSpecification.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowSpecification.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ShowSpecification.html 25 Aug 2004 19:43:15 -0000 1.2
+++ ShowSpecification.html 6 Jul 2005 10:25:44 -0000 1.3
@@ -32,7 +32,7 @@
<td><span jwcid="@Insert" value="ognl:inspectedComponent.getClass().getName()"/></td>
</tr>
-<span jwcid="@Conditional" condition="ognl:! inspectedSpecification.pageSpecification">
+<span jwcid="@If" condition="ognl:! inspectedSpecification.pageSpecification">
<tr class="even">
<th>Allow informal parameters</th>
@@ -48,7 +48,7 @@
</table>
-<span jwcid="@Conditional" condition="ognl:formalParameterNames">
+<span jwcid="@If" condition="ognl:formalParameterNames">
<table class="inspector-data" width="100%">
<tr class="heading">
@@ -70,7 +70,7 @@
</table>
</span>
-<span jwcid="@Conditional" condition="ognl:informalParameterNames">
+<span jwcid="@If" condition="ognl:informalParameterNames">
<table class="inspector-data" width="100%">
<tr class="heading">
@@ -88,7 +88,7 @@
</table>
</span>
-<span jwcid="@Conditional" condition="ognl:assetNames">
+<span jwcid="@If" condition="ognl:assetNames">
<table class="inspector-data" width="100%">
<tr class="heading">
@@ -107,7 +107,7 @@
</table>
</span>
-<span jwcid="@Conditional" condition="ognl:sortedPropertyNames">
+<span jwcid="@If" condition="ognl:sortedPropertyNames">
<table class="inspector-data" width="100%">
<tr class="heading">
@@ -125,7 +125,7 @@
</table>
</span>
-<span jwcid="@Conditional" condition="ognl:beanNames">
+<span jwcid="@If" condition="ognl:beanNames">
<table class="inspector-data" width="100%">
<tr class="heading">
@@ -148,7 +148,7 @@
</td>
<td>
-<span jwcid="@Conditional" condition="ognl:sortedComponents">
+<span jwcid="@If" condition="ognl:sortedComponents">
<table border="0" class="inspector-data">
1.4 +2 -2 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowProperties.jwc
Index: ShowProperties.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowProperties.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ShowProperties.jwc 6 Jan 2005 02:17:25 -0000 1.3
+++ ShowProperties.jwc 6 Jul 2005 10:25:44 -0000 1.4
@@ -24,11 +24,11 @@
<bean name="persistPropertyClass" class="org.apache.tapestry.bean.EvenOdd"/>
<bean name="propertyClass" class="org.apache.tapestry.bean.EvenOdd"/>
- <component id="ifNoProperties" type="Conditional">
+ <component id="ifNoProperties" type="If">
<binding name="condition" expression="!properties"/>
</component>
- <component id="ifHasProperties" type="Conditional">
+ <component id="ifHasProperties" type="If">
<binding name="condition" expression="properties"/>
</component>
1.7 +1 -1 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.java
Index: Inspector.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Inspector.java 9 Jun 2005 18:39:18 -0000 1.6
+++ Inspector.java 6 Jul 2005 10:25:44 -0000 1.7
@@ -97,7 +97,7 @@
// The up button may generate a null context.
- if (parameters == null)
+ if (parameters == null || parameters.length == 0)
newIdPath = null;
else
newIdPath = (String) parameters[0];
1.11 +2 -1 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowTemplate.java
Index: ShowTemplate.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowTemplate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ShowTemplate.java 18 Apr 2005 17:08:19 -0000 1.10
+++ ShowTemplate.java 6 Jul 2005 10:25:44 -0000 1.11
@@ -292,10 +292,11 @@
* Invoked when a component id is clicked.
*/
- public void trigger(IRequestCycle cycle, String componentId)
+ public void trigger(IRequestCycle cycle)
{
Inspector inspector = (Inspector) getPage();
+ String componentId = (String) cycle.getListenerParameters()[0];
inspector.selectComponent(componentId);
IComponent newComponent = inspector.getInspectedComponent();
1.7 +2 -2 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowTemplate.jwc
Index: ShowTemplate.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowTemplate.jwc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ShowTemplate.jwc 18 Apr 2005 17:08:19 -0000 1.6
+++ ShowTemplate.jwc 6 Jul 2005 10:25:44 -0000 1.7
@@ -20,11 +20,11 @@
"http://jakarta.apache.org/tapestry/dtd/Tapestry_4_0.dtd">
<component-specification class="org.apache.tapestry.contrib.inspector.ShowTemplate">
- <component id="ifNoTemplate" type="Conditional">
+ <component id="ifNoTemplate" type="If">
<binding name="condition" value="ognl:! hasTemplate"/>
</component>
- <component id="ifTemplate" type="Conditional">
+ <component id="ifTemplate" type="If">
<binding name="condition" value="ognl:hasTemplate"/>
</component>
1.4 +2 -2 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowEngine.jwc
Index: ShowEngine.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/inspector/ShowEngine.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ShowEngine.jwc 6 Jan 2005 02:17:25 -0000 1.3
+++ ShowEngine.jwc 6 Jul 2005 10:25:44 -0000 1.4
@@ -45,7 +45,7 @@
<binding name="value" expression="page.engine.locale.displayName"/>
</component>
- <component id="ifNoVisit" type="Conditional">
+ <component id="ifNoVisit" type="If">
<binding name="condition" expression="! page.engine.hasVisit"/>
</component>
@@ -53,7 +53,7 @@
<binding name="value" expression="page.engine.visit"/>
</component>
- <component id="ifVisit" type="Conditional">
+ <component id="ifVisit" type="If">
<binding name="condition" expression="page.engine.hasVisit"/>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org