paulsp 02/04/21 20:22:06
Modified: src/java/org/apache/jetspeed/util/template JetspeedLink.java
BaseJetspeedLink.java
src/java/org/apache/jetspeed/portal/controls
VelocityPortletControl.java
Log:
o Implement setAction(action, portlet) in VelocityPortletControl.
o Add setAction() methods to JetspeedLink interface
Revision Changes Path
1.6 +24 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedLink.java
Index: JetspeedLink.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedLink.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JetspeedLink.java 22 Apr 2002 02:54:42 -0000 1.5
+++ JetspeedLink.java 22 Apr 2002 03:22:06 -0000 1.6
@@ -56,6 +56,7 @@
// Jetspeed
import org.apache.jetspeed.portal.Portlet;
+import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.Portlets;
// Turbine
@@ -72,7 +73,7 @@
* rendering code. This is done currently in VelocityPortlet.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
- * @version $Id: JetspeedLink.java,v 1.5 2002/04/22 02:54:42 paulsp Exp $
+ * @version $Id: JetspeedLink.java,v 1.6 2002/04/22 03:22:06 paulsp Exp $
*/
public interface JetspeedLink
{
@@ -190,10 +191,31 @@
public DynamicURI setAction(String action);
/**
- * Return a link that includes an action to a specific portlet
+ * Return a link that includes an action to a specific portlet, as defined
+ * by an entry
+ *
+ * @param action Desired action
+ * @param entry to receive the action
+ * @return DynamicURI that includes the desire action
+ */
+ public DynamicURI setAction(String action, Entry entry);
+
+ /**
+ * Return a link that includes an action to a specific portlet, as defined
+ * by a portlet
*
* @param action Desired action
* @param portlet to receive the action
+ * @return DynamicURI that includes the desire action
+ */
+ public DynamicURI setAction(String action, Portlet portlet);
+
+ /**
+ * Return a link that includes an action to a specific portlet, as defined
+ * by a portlets
+ *
+ * @param action Desired action
+ * @param portlets to receive the action
* @return DynamicURI that includes the desire action
*/
public DynamicURI setAction(String action, Portlets portlet);
1.7 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
Index: BaseJetspeedLink.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseJetspeedLink.java 22 Apr 2002 02:54:42 -0000 1.6
+++ BaseJetspeedLink.java 22 Apr 2002 03:22:06 -0000 1.7
@@ -86,7 +86,7 @@
* rendering code. This is done currently in VelocityPortlet.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
- * @version $Id: BaseJetspeedLink.java,v 1.6 2002/04/22 02:54:42 paulsp Exp $
+ * @version $Id: BaseJetspeedLink.java,v 1.7 2002/04/22 03:22:06 paulsp Exp $
*/
public class BaseJetspeedLink implements ApplicationTool, JetspeedLink
{
@@ -330,7 +330,7 @@
* by an entry
*
* @param action Desired action
- * @param portlet to receive the action
+ * @param entry to receive the action
* @return DynamicURI that includes the desire action
*/
public DynamicURI setAction(String action, Entry entry)
1.16 +5 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java
Index: VelocityPortletControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VelocityPortletControl.java 14 Apr 2002 16:49:09 -0000 1.15
+++ VelocityPortletControl.java 22 Apr 2002 03:22:06 -0000 1.16
@@ -106,7 +106,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Roberto Carrasco</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
*
- * @version $Id: VelocityPortletControl.java,v 1.15 2002/04/14 16:49:09 paulsp Exp $
+ * @version $Id: VelocityPortletControl.java,v 1.16 2002/04/22 03:22:06 paulsp Exp $
*
*/
public class VelocityPortletControl extends AbstractPortletControl
@@ -272,9 +272,10 @@
{
Log.error( e );
}
- action.setLink( jsLink.setPortletById(portlet.getID())
- .addQueryData("action", getAction(
action.getName()))
- .toString());
+// action.setLink( jsLink.setPortletById(portlet.getID())
+// .addQueryData("action", getAction(
action.getName()))
+// .toString());
+ action.setLink( jsLink.setAction( getAction( action.getName()),
portlet).toString());
JetspeedLinkFactory.putInstance(jsLink);
jsLink=null;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
