taylor 2004/10/28 18:17:36
Modified: portal/src/java/org/apache/jetspeed/velocity
JetspeedPowerTool.java
Log:
title was coming as an ugly velocity string when i chose a language with my client
device that wasn't supported
defaulted to the portlet name in this case, since it must always be defined
Revision Changes Path
1.34 +12 -10
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
Index: JetspeedPowerTool.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JetspeedPowerTool.java 26 Oct 2004 22:22:00 -0000 1.33
+++ JetspeedPowerTool.java 29 Oct 2004 01:17:36 -0000 1.34
@@ -1156,20 +1156,20 @@
*/
public String getTitle(PortletEntity entity, Fragment f)
{
- String title=null;
+ String title = null;
- if(f != null)
+ if (f != null)
{
title = f.getTitle();
}
- if(entity != null && title == null)
+ if (entity != null && title == null)
{
title =
Jetspeed.getCurrentRequestContext().getPreferedLanguage(entity.getPortletDefinition()).getTitle();
}
- else if(title == null)
+ if (title == null)
{
- title = "Portlet Unavailable";
+ title = entity.getPortletDefinition().getName();
}
return title;
@@ -1187,14 +1187,16 @@
*/
public String getTitle(PortletEntity entity)
{
- if(entity != null)
+ String title = null;
+ if (entity != null)
{
- return
Jetspeed.getCurrentRequestContext().getPreferedLanguage(entity.getPortletDefinition()).getTitle();
+ title =
Jetspeed.getCurrentRequestContext().getPreferedLanguage(entity.getPortletDefinition()).getTitle();
}
- else
+ if (title == null)
{
- return "Portlet Unavailable";
+ title = entity.getPortletDefinition().getName();
}
+ return title;
}
public Object getComponent(String name)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
