cmlenz 01/11/12 06:42:53
Modified: src/taglib/common/org/apache/slide/taglib/bean Tag:
SLIDE_1_0 PropertyBean.java
src/taglib/struts/org/apache/slide/taglib/tag/struts Tag:
SLIDE_1_0 StrutsTagUtils.java
Log:
Port taglib-fixes back to 1.0 branch
Revision Changes Path
No revision
No revision
1.3.2.1 +5 -5
jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java
Index: PropertyBean.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- PropertyBean.java 2001/09/20 13:31:08 1.3
+++ PropertyBean.java 2001/11/12 14:42:53 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java,v
1.3 2001/09/20 13:31:08 dirkv Exp $
- * $Revision: 1.3 $
- * $Date: 2001/09/20 13:31:08 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/bean/PropertyBean.java,v
1.3.2.1 2001/11/12 14:42:53 cmlenz Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2001/11/12 14:42:53 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* layer technologies such as JSP or Velocity.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class PropertyBean
extends AbstractBean {
@@ -148,7 +148,7 @@
*/
public String getValue() {
- return (String)property.getValue();
+ return property.getValue().toString();
}
No revision
No revision
1.5.2.1 +8 -6
jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java
Index: StrutsTagUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- StrutsTagUtils.java 2001/09/24 08:15:35 1.5
+++ StrutsTagUtils.java 2001/11/12 14:42:53 1.5.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
1.5 2001/09/24 08:15:35 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2001/09/24 08:15:35 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
1.5.2.1 2001/11/12 14:42:53 cmlenz Exp $
+ * $Revision: 1.5.2.1 $
+ * $Date: 2001/11/12 14:42:53 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* Struts tag library, especially the <code><logic:iterate></code> tag.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.5.2.1 $
*/
public class StrutsTagUtils {
@@ -237,13 +237,15 @@
} else if (tag instanceof NodeTagSupport) {
bean = ((NodeTagSupport)tag).getNode().getLatestRevision();
} else if (tag instanceof IterateTag) {
- // check whether we're actually iterating over NamespaceBean
- // objects
+ // check whether we're actually iterating over RevisionBean
+ // or NodeBean objects
String id = ((IterateTag)tag).getId();
if ((id != null) && (id.length() > 0)) {
Object object = context.getAttribute(id);
if (object instanceof RevisionBean) {
bean = (RevisionBean)object;
+ } else if (object instanceof NodeBean) {
+ bean = ((NodeBean)object).getLatestRevision();
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
