You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by pf...@apache.org on 2005/01/30 23:47:06 UTC
cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/components ILinkComponent.java
pferraro 2005/01/30 14:47:05
Modified: framework/src/java/org/apache/tapestry/link DirectLink.jwc
DefaultLinkRenderer.java PageLink.jwc
ActionLink.jwc ExternalLink.jwc ServiceLink.jwc
GenericLink.jwc
framework/src/java/org/apache/tapestry/components
ILinkComponent.java
Log:
Added optional target parameter to link components.
The target is relevant to the link's renderer.
Revision Changes Path
1.4 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/DirectLink.jwc
Index: DirectLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/DirectLink.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectLink.jwc 5 Jan 2005 23:17:24 -0000 1.3
+++ DirectLink.jwc 30 Jan 2005 22:47:05 -0000 1.4
@@ -41,6 +41,8 @@
<parameter name="anchor"/>
+ <parameter name="target"/>
+
<parameter name="renderer"/>
<reserved-parameter name="href"/>
1.4 +12 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java
Index: DefaultLinkRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/DefaultLinkRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLinkRenderer.java 5 Jan 2005 23:17:24 -0000 1.3
+++ DefaultLinkRenderer.java 30 Jan 2005 22:47:05 -0000 1.4
@@ -68,6 +68,13 @@
writer.attribute(getUrlAttribute(), constructURL(l, linkComponent.getAnchor(), cycle));
+ String target = linkComponent.getTarget();
+
+ if (target == null)
+ {
+ writer.attribute(getTargetAttribute(), target);
+ }
+
beforeBodyRender(writer, cycle, linkComponent);
// Allow the wrapped components a chance to render.
@@ -154,6 +161,11 @@
return "href";
}
+ protected String getTargetAttribute()
+ {
+ return "target";
+ }
+
protected boolean getHasBody()
{
return true;
1.5 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/PageLink.jwc
Index: PageLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/PageLink.jwc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageLink.jwc 29 Jan 2005 17:09:18 -0000 1.4
+++ PageLink.jwc 30 Jan 2005 22:47:05 -0000 1.5
@@ -37,6 +37,8 @@
<parameter name="anchor"/>
+ <parameter name="target"/>
+
<parameter name="renderer"/>
<reserved-parameter name="href"/>
1.4 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ActionLink.jwc
Index: ActionLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ActionLink.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionLink.jwc 5 Jan 2005 23:17:24 -0000 1.3
+++ ActionLink.jwc 30 Jan 2005 22:47:05 -0000 1.4
@@ -31,6 +31,8 @@
<parameter name="disabled"/>
<parameter name="anchor"/>
+
+ <parameter name="target"/>
<parameter name="renderer"/>
1.5 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ExternalLink.jwc
Index: ExternalLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ExternalLink.jwc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExternalLink.jwc 29 Jan 2005 17:09:18 -0000 1.4
+++ ExternalLink.jwc 30 Jan 2005 22:47:05 -0000 1.5
@@ -38,6 +38,8 @@
<parameter name="anchor"/>
+ <parameter name="target"/>
+
<parameter name="renderer"/>
<reserved-parameter name="href"/>
1.4 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc
Index: ServiceLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ServiceLink.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceLink.jwc 27 Jan 2005 05:45:55 -0000 1.3
+++ ServiceLink.jwc 30 Jan 2005 22:47:05 -0000 1.4
@@ -38,6 +38,8 @@
<parameter name="anchor"/>
+ <parameter name="target"/>
+
<parameter name="renderer"/>
<reserved-parameter name="href"/>
1.4 +2 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/GenericLink.jwc
Index: GenericLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/GenericLink.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GenericLink.jwc 27 Jan 2005 05:45:55 -0000 1.3
+++ GenericLink.jwc 30 Jan 2005 22:47:05 -0000 1.4
@@ -31,6 +31,8 @@
<parameter name="anchor"/>
+ <parameter name="target"/>
+
<parameter name="renderer"/>
</component-specification>
1.4 +8 -0 jakarta-tapestry/framework/src/java/org/apache/tapestry/components/ILinkComponent.java
Index: ILinkComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/components/ILinkComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ILinkComponent.java 6 Jan 2005 02:17:21 -0000 1.3
+++ ILinkComponent.java 30 Jan 2005 22:47:05 -0000 1.4
@@ -50,6 +50,14 @@
public String getAnchor();
/**
+ * Returns the name of the target window or frame for this link,
+ * or null if current window or frame is to be used.
+ *
+ * @since 3.1
+ */
+ public String getTarget();
+
+ /**
* Adds a new event handler. When the event occurs, the JavaScript function
* specified is executed. Multiple functions can be specified, in which case
* all of them are executed.
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org