dion 2004/09/16 21:20:52
Modified: jelly/jelly-tags/swt/xdocs changes.xml
jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt
WidgetTag.java
jelly/jelly-tags/swt project.xml
Log:
Applied Jelly-141.
Revision Changes Path
1.8 +3 -0 jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 12 Sep 2004 14:12:08 -0000 1.7
+++ changes.xml 17 Sep 2004 04:20:51 -0000 1.8
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.1-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="fix" issue="JELLY-141" due-to="Hans Gilde">WidgetTag
should null-out its bean after running</action>
+ </release>
<release version="1.0" date="2004-09-13">
<action dev="dion" type="fix" issue="JELLY-123" due-to="Marcus Crafter">var
and resource support for images</action>
<action dev="dion" type="fix" issue="JELLY-42" due-to="Christiaan ten
Klooster">add cTabFolder + cTabItem widgets</action>
1.15 +10 -0
jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
Index: WidgetTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WidgetTag.java 8 Sep 2004 04:51:31 -0000 1.14
+++ WidgetTag.java 17 Sep 2004 04:20:52 -0000 1.15
@@ -109,6 +109,7 @@
}
}
super.doTag(output);
+ clearBean();
}
// Implementation methods
@@ -277,5 +278,14 @@
return SwtHelper.parseStyle(SWT.class, text);
}
return style;
+ }
+
+ /** Sets the bean to null, to prevent it from
+ * sticking around in the event that this tag instance is
+ * cached. This method is called at the end of doTag.
+ *
+ */
+ protected void clearBean() {
+ setBean(null);
}
}
1.16 +1 -1 jakarta-commons/jelly/jelly-tags/swt/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 12 Sep 2004 14:12:45 -0000 1.15
+++ project.xml 17 Sep 2004 04:20:52 -0000 1.16
@@ -20,7 +20,7 @@
<extend>${basedir}/../tag-project.xml</extend>
<id>commons-jelly-tags-swt</id>
<name>commons-jelly-tags-swt</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<package>org.apache.commons.jelly.tags.swt</package>
<description>This is a Jelly interface for SWT.</description>
<shortDescription>Commons Jelly SWT Tag Library</shortDescription>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]