Return-Path: Delivered-To: apmail-jakarta-struts-dev-archive@www.apache.org Received: (qmail 94034 invoked from network); 24 Jan 2004 18:48:24 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Jan 2004 18:48:24 -0000 Received: (qmail 31624 invoked by uid 500); 24 Jan 2004 18:48:10 -0000 Delivered-To: apmail-jakarta-struts-dev-archive@jakarta.apache.org Received: (qmail 31446 invoked by uid 500); 24 Jan 2004 18:48:09 -0000 Mailing-List: contact struts-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Struts Developers List" Reply-To: "Struts Developers List" Delivered-To: mailing list struts-dev@jakarta.apache.org Received: (qmail 31426 invoked by uid 500); 24 Jan 2004 18:48:09 -0000 Received: (qmail 31421 invoked from network); 24 Jan 2004 18:48:09 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Jan 2004 18:48:09 -0000 Received: (qmail 94008 invoked by uid 1574); 24 Jan 2004 18:48:17 -0000 Date: 24 Jan 2004 18:48:17 -0000 Message-ID: <20040124184817.94007.qmail@minotaur.apache.org> From: dmkarr@apache.org To: jakarta-struts-cvs@apache.org Subject: cvs commit: jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html ELImgTag.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dmkarr 2004/01/24 10:48:17 Modified: contrib/struts-el/src/share/org/apache/strutsel/taglib/html ELImgTag.java Log: Removed old "accessKey" attribute. I don't know when or if that was ever in the base tag. Added new "action" attribute. Added new "contextRelative" attribute. Revision Changes Path 1.12 +33 -13 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java Index: ELImgTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ELImgTag.java 18 Jan 2004 13:43:11 -0000 1.11 +++ ELImgTag.java 24 Jan 2004 18:48:17 -0000 1.12 @@ -88,10 +88,10 @@ public class ELImgTag extends ImgTag { /** - * Instance variable mapped to "accessKey" tag attribute. + * Instance variable mapped to "action" tag attribute. * (Mapping set in associated BeanInfo class.) */ - private String accessKeyExpr; + private String actionExpr; /** * Instance variable mapped to "align" tag attribute. * (Mapping set in associated BeanInfo class.) @@ -118,6 +118,11 @@ */ private String bundleExpr; /** + * Instance variable mapped to "contextRelative" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String contextRelativeExpr; + /** * Instance variable mapped to "height" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -299,10 +304,10 @@ private String widthExpr; /** - * Getter method for "accessKey" tag attribute. + * Getter method for "action" tag attribute. * (Mapping set in associated BeanInfo class.) */ - public String getAccesskeyExpr() { return (accessKeyExpr); } + public String getActionExpr() { return (actionExpr); } /** * Getter method for "align" tag attribute. * (Mapping set in associated BeanInfo class.) @@ -329,6 +334,11 @@ */ public String getBundleExpr() { return (bundleExpr); } /** + * Getter method for "contextRelative" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getContextRelativeExpr() { return (contextRelativeExpr); } + /** * Getter method for "height" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -510,10 +520,10 @@ public String getWidthExpr() { return (widthExpr); } /** - * Setter method for "accessKey" tag attribute. + * Setter method for "action" tag attribute. * (Mapping set in associated BeanInfo class.) */ - public void setAccesskeyExpr(String accessKeyExpr) { this.accessKeyExpr = accessKeyExpr; } + public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; } /** * Setter method for "align" tag attribute. * (Mapping set in associated BeanInfo class.) @@ -540,6 +550,11 @@ */ public void setBundleExpr(String bundleExpr) { this.bundleExpr = bundleExpr; } /** + * Setter method for "contextRelative" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setContextRelativeExpr(String contextRelativeExpr) { this.contextRelativeExpr = contextRelativeExpr; } + /** * Setter method for "height" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -726,12 +741,13 @@ public void release() { super.release(); - setAccesskeyExpr(null); + setActionExpr(null); setAlignExpr(null); setAltExpr(null); setAltKeyExpr(null); setBorderExpr(null); setBundleExpr(null); + setContextRelativeExpr(null); setHeightExpr(null); setHspaceExpr(null); setImageNameExpr(null); @@ -790,9 +806,9 @@ String string = null; Boolean bool = null; - if ((string = EvalHelper.evalString("accessKey", getAccesskeyExpr(), + if ((string = EvalHelper.evalString("action", getActionExpr(), this, pageContext)) != null) - setAccesskey(string); + setAction(string); if ((string = EvalHelper.evalString("align", getAlignExpr(), this, pageContext)) != null) @@ -813,6 +829,10 @@ if ((string = EvalHelper.evalString("bundle", getBundleExpr(), this, pageContext)) != null) setBundle(string); + + if ((string = EvalHelper.evalString("contextRelative", getContextRelativeExpr(), + this, pageContext)) != null) + setContextRelative(string); if ((string = EvalHelper.evalString("height", getHeightExpr(), this, pageContext)) != null) --------------------------------------------------------------------- To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: struts-dev-help@jakarta.apache.org