svn commit: r551795 - in /struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html: ELOptionTag.java ELOptionTagBeanInfo.java

[pbenedict]

Author: pbenedict
Date: Thu Jun 28 22:22:34 2007
New Revision: 551795

URL: http://svn.apache.org/viewvc?view=rev&rev=551795
Log:
STR-2072: Fix ELOptionTag.release() and missing properties for TagBeanInfo
Modified:
    
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTag.java
    
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTagBeanInfo.java

Modified: 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTag.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTag.java?view=diff&rev=551795&r1=551794&r2=551795
==============================================================================
--- 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTag.java
 (original)
+++ 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTag.java
 Thu Jun 28 22:22:34 2007
@@ -338,8 +338,8 @@
         setStyleExpr(null);
         setStyleClassExpr(null);
         setStyleIdExpr(null);
-        setTitle(null);
-        setTitleKey(null);
+        setTitleExpr(null);
+        setTitleKeyExpr(null);
         setValueExpr(null);
     }
 

Modified: 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTagBeanInfo.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTagBeanInfo.java?view=diff&rev=551795&r1=551794&r2=551795
==============================================================================
--- 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTagBeanInfo.java
 (original)
+++ 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELOptionTagBeanInfo.java
 Thu Jun 28 22:22:34 2007
@@ -102,6 +102,18 @@
         }
 
         try {
+            proplist.add(new PropertyDescriptor("title", ELOptionTag.class,
+                    null, "setTitleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("titleKey", ELOptionTag.class,
+                    null, "setTitleKeyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
             proplist.add(new PropertyDescriptor("value", ELOptionTag.class,
                     null, "setValueExpr"));
         } catch (IntrospectionException ex) {