You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hr...@apache.org on 2005/08/22 06:40:20 UTC

svn commit: r234433 - in /struts/el/trunk: doc/userGuide/struts-html-el.xml src/share/org/apache/strutsel/taglib/html/ELImgTag.java src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java

Author: hrabago
Date: Sun Aug 21 21:40:11 2005
New Revision: 234433

URL: http://svn.apache.org/viewcvs?rev=234433&view=rev
Log:
Remove html:img's deprecated lowsrc attribute and references to it.
Remove reference to html:html's locale attr in TestELHtmlTag (Thanks, Wendy).

Modified:
    struts/el/trunk/doc/userGuide/struts-html-el.xml
    struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
    struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java
    struts/el/trunk/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java

Modified: struts/el/trunk/doc/userGuide/struts-html-el.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/doc/userGuide/struts-html-el.xml?rev=234433&r1=234432&r2=234433&view=diff
==============================================================================
--- struts/el/trunk/doc/userGuide/struts-html-el.xml (original)
+++ struts/el/trunk/doc/userGuide/struts-html-el.xml Sun Aug 21 21:40:11 2005
@@ -3153,21 +3153,6 @@
                 </attribute>
 
                 <attribute>
-                  <name>lowsrc</name>
-                  <required>false</required>
-                  <rtexprvalue>true</rtexprvalue>
-                  <info>
-                  <p>
-                  An image for people with low resolution graphics cards.
-                  </p>
-                  </info>
-                  <deprecated>
-                      This attribute is not defined in the HTML 4.01 spec and 
-                      will be removed in a future version of Struts.
-                  </deprecated>
-                </attribute>
-
-                <attribute>
                   <name>name</name>
                   <required>false</required>
                   <rtexprvalue>true</rtexprvalue>

Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java?rev=234433&r1=234432&r2=234433&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java Sun Aug 21 21:40:11 2005
@@ -27,8 +27,8 @@
  * <p>
  * TODO:
  * <ul>
- *   <li>make the <strong>alt</strong>, <strong>src</strong>, and
- *       <strong>lowsrc</strong> settable from properties (for i18n)</li>
+ *   <li>make the <strong>alt</strong> and <strong>src</strong> settable from 
+ *      properties (for i18n)</li>
  *   <li>handle <strong>onLoad</strong>, <strong>onAbort</strong>, and
  *       <strong>onError</strong> events (my JavaScript book is very old,
  *       there may be more unsupported events in the past couple of IE
@@ -106,11 +106,6 @@
      */
     private String localeExpr;
     /**
-     * Instance variable mapped to "lowsrc" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
-     */
-    private String lowsrcExpr;
-    /**
      * Instance variable mapped to "name" tag attribute.
      * (Mapping set in associated BeanInfo class.)
      */
@@ -322,11 +317,6 @@
      */
     public String getLocaleExpr() { return (localeExpr); }
     /**
-     * Getter method for "lowsrc" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
-     */
-    public String getLowsrcExpr() { return (lowsrcExpr); }
-    /**
      * Getter method for "name" tag attribute.
      * (Mapping set in associated BeanInfo class.)
      */
@@ -538,11 +528,6 @@
      */
     public void setLocaleExpr(String localeExpr) { this.localeExpr = localeExpr; }
     /**
-     * Setter method for "lowsrc" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
-     */
-    public void setLowsrcExpr(String lowsrcExpr) { this.lowsrcExpr = lowsrcExpr; }
-    /**
      * Setter method for "name" tag attribute.
      * (Mapping set in associated BeanInfo class.)
      */
@@ -711,7 +696,6 @@
         setImageNameExpr(null);
         setIsmapExpr(null);
         setLocaleExpr(null);
-        setLowsrcExpr(null);
         setNameExpr(null);
         setOnclickExpr(null);
         setOndblclickExpr(null);
@@ -811,12 +795,6 @@
         if ((string = EvalHelper.evalString("locale", getLocaleExpr(),
                                             this, pageContext)) != null)
             setLocale(string);
-
-        //  The "lowsrc" attribute is deprecated.  This needs to be removed
-        //  when the "lowsrc" attribute is finally removed.
-        if ((string = EvalHelper.evalString("lowsrc", getLowsrcExpr(),
-                                            this, pageContext)) != null)
-            setLowsrc(string);
 
         if ((string = EvalHelper.evalString("name", getNameExpr(),
                                             this, pageContext)) != null)

Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java?rev=234433&r1=234432&r2=234433&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java Sun Aug 21 21:40:11 2005
@@ -84,10 +84,6 @@
                                                 null, "setLocaleExpr"));
         } catch (IntrospectionException ex) {}
         try {
-            proplist.add(new PropertyDescriptor("lowsrc", ELImgTag.class,
-                                                null, "setLowsrcExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
             proplist.add(new PropertyDescriptor("name", ELImgTag.class,
                                                 null, "setNameExpr"));
         } catch (IntrospectionException ex) {}

Modified: struts/el/trunk/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java?rev=234433&r1=234432&r2=234433&view=diff
==============================================================================
--- struts/el/trunk/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java (original)
+++ struts/el/trunk/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java Sun Aug 21 21:40:11 2005
@@ -59,8 +59,6 @@
 
         Boolean   bool  = new Boolean(true);
         pageContext.setAttribute("localeFlag", bool);
-//         elHtmlTag.setLocale("${localeFlag}");
-        elHtmlTag.setLocaleExpr("true");
         elHtmlTag.setXhtmlExpr("true");
 
         int startTagReturn  = elHtmlTag.doStartTag();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org