svn commit: r577970 - in /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link: ExternalLink.java ExternalLink.jwc PageLink.jwc

[an...@apache.org]

Author: andyhot
Date: Thu Sep 20 20:15:22 2007
New Revision: 577970

URL: http://svn.apache.org/viewvc?rev=577970&view=rev
Log:
TAPESTRY-1763: support namespace param in ExternalLink

Modified:
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.jwc
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.jwc

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java?rev=577970&r1=577969&r2=577970&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java Thu Sep 20 20:15:22 2007
@@ -14,6 +14,7 @@
 
 package org.apache.tapestry.link;
 
+import org.apache.tapestry.INamespace;
 import org.apache.tapestry.IRequestCycle;
 import org.apache.tapestry.engine.ExternalServiceParameter;
 import org.apache.tapestry.engine.IEngineService;
@@ -39,9 +40,14 @@
     {
         Object[] serviceParameters = DirectLink
                 .constructServiceParameters(getParameters());
+        
+        INamespace namespace = getTargetNamespace();
+        
+        String targetPage = (namespace==null) ?
+            getTargetPage() : namespace.constructQualifiedName(getTargetPage());
 
         ExternalServiceParameter esp = new ExternalServiceParameter(
-                getTargetPage(), serviceParameters);
+                targetPage, serviceParameters);
 
         return getExternalService().getLink(false, esp);
     }
@@ -49,4 +55,7 @@
     public abstract Object getParameters();
 
     public abstract String getTargetPage();
+    
+    /** @since 4.1.4 **/
+    public abstract INamespace getTargetNamespace();
 }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.jwc?rev=577970&r1=577969&r2=577970&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.jwc Thu Sep 20 20:15:22 2007
@@ -27,6 +27,9 @@
   	required="yes" 
   	property="targetPage"/>
 
+  <parameter name="namespace"  
+  	property="targetNamespace"/>        
+        
   <parameter name="parameters">
     <description>
     An object, or list of objects, encoded into the URL

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.jwc?rev=577970&r1=577969&r2=577970&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.jwc Thu Sep 20 20:15:22 2007
@@ -30,7 +30,6 @@
   	property="targetPage"/>
   
   <parameter name="namespace"  
-  	required="no" 
   	property="targetNamespace"/>
   	  	
   <parameter name="disabled"/>