craigmcc 01/11/17 17:40:37
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
Add generation of the "target" attribute for the icon as well, so that
clicks there are treated the same as the label.
For compatibility with XHTML, make the attribute name "target" instead of
"Target" (must be all lower case).
Avoid String concatenations by unfolding the generation of the attribute.
Revision Changes Path
1.3 +17 -9
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeControlTag.java 2001/11/17 21:20:54 1.2
+++ TreeControlTag.java 2001/11/18 01:40:37 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.2 2001/11/17 21:20:54 patrickl Exp $
- * $Revision: 1.2 $
- * $Date: 2001/11/17 21:20:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.3 2001/11/18 01:40:37 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/11/18 01:40:37 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
* <strong>FIXME</strong> - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/11/17 21:20:54 $
+ * @version $Revision: 1.3 $ $Date: 2001/11/18 01:40:37 $
*/
public class TreeControlTag extends TagSupport {
@@ -417,7 +417,14 @@
if (hyperlink != null) {
out.print("<a href=\"");
out.print(hyperlink);
- out.print("\">");
+ out.print("\"");
+ String target = node.getTarget();
+ if(target != null) {
+ out.print(" target=\"");
+ out.print(target);
+ out.print("\"");
+ }
+ out.print(">");
}
out.print("<img src=\"");
out.print(images);
@@ -440,11 +447,12 @@
out.print("<a href=\"");
out.print(hyperlink);
out.print("\"");
-
String target = node.getTarget();
- if(target != null)
- out.print(" Target=\"" + target + "\"");
-
+ if(target != null) {
+ out.print(" target=\"");
+ out.print(target);
+ out.print("\"");
+ }
if (labelStyle != null) {
out.print(" class=\"");
out.print(labelStyle);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
