weaver 2003/03/23 17:17:41
Modified: src/java/org/apache/jetspeed/portal/portlets/viewprocessor
VelocityViewProcessor.java
Log:
- Fixed ClassCastExceptions caused by portlets that do not provide a customizer.
Thanks to Mark Orciuch for noticing this out.
- Fixed the issue where the cusomizers buttons where appearing below the
portlets as opposed to above. Thanks again to Mark Orciuch for pointing this out.
Revision Changes Path
1.2 +28 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/viewprocessor/VelocityViewProcessor.java
Index: VelocityViewProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/viewprocessor/VelocityViewProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityViewProcessor.java 20 Mar 2003 18:09:39 -0000 1.1
+++ VelocityViewProcessor.java 24 Mar 2003 01:17:41 -0000 1.2
@@ -120,10 +120,35 @@
template);
// need to add cache support
- String s = TurbineVelocity.handleRequest(context, templatePath);
+ Portlet portlet = (Portlet) context.get("portlet");
+ RunData rundata = (RunData) context.get("data");
+ long cachePeriod = -1;
+ AbstractPortlet abstractPortlet = null;
+ // STW: Safety net ;)
+ if(portlet instanceof AbstractPortlet)
+ {
+ abstractPortlet =(AbstractPortlet) portlet;
+ if(abstractPortlet.getExpirationMillis() != null)
+ {
+ cachePeriod =
abstractPortlet.getExpirationMillis().longValue();
+ }
+ }
+
+ if (cachePeriod > 0 && abstractPortlet != null)
+ {
+ String s = TurbineVelocity.handleRequest(context,
templatePath);
+ abstractPortlet.setExpirationMillis(
+ cachePeriod + System.currentTimeMillis());
+ element = new JetspeedClearElement(s);
- //setExpirationMillis(cachePeriod + System.currentTimeMillis());
- element = new JetspeedClearElement(s);
+ }
+ else
+ {
+ TurbineVelocity.handleRequest(
+ context, templatePath, rundata.getOut());
+ }
+
+
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
