You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2006/08/25 13:36:35 UTC
svn commit: r436762 -
/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
Author: apetrelli
Date: Fri Aug 25 04:36:32 2006
New Revision: 436762
URL: http://svn.apache.org/viewvc?rev=436762&view=rev
Log:
SB-27
A modified version of the patch has been applied: I used "template" instead of "page" as suggested by Greg Reddin.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java?rev=436762&r1=436761&r2=436762&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTag.java Fri Aug 25 04:36:32 2006
@@ -590,8 +590,22 @@
String type = value.getType();
if (type == null) {
- // FIXME
- return null;
+ Object valueContent = value.getValue();
+ if (valueContent instanceof String) {
+ String valueString = (String) valueContent;
+ if (valueString.startsWith("/")) {
+ type = "template";
+ } else {
+ type = "string";
+ }
+ } else if (valueContent instanceof ComponentDefinition) {
+ type = "definition";
+ }
+ }
+
+ if (type == null) {
+ throw new JspException("Unrecognized type for attribute value "
+ + value.getValue());
}
if (type.equalsIgnoreCase("string")) {