Author: thomas.heute(a)jboss.com
Date: 2007-09-22 08:23:05 -0400 (Sat, 22 Sep 2007)
New Revision: 8425
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
Log:
- Don't fail if no display name is defined
- Compare based on the localized value
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-22
01:17:46 UTC (rev 8424)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-22
12:23:05 UTC (rev 8425)
@@ -49,6 +49,7 @@
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
/**
@@ -419,12 +420,25 @@
/** A comparator for portlets. Order portlets in the alphabetical order of their
display name. */
final Comparator comparator = new Comparator()
{
+ FacesContext ctx = FacesContext.getCurrentInstance();
+ Locale locale = ctx.getExternalContext().getRequestLocale();
+
public int compare(Object o1, Object o2)
{
Portlet p1 = (Portlet)o1;
Portlet p2 = (Portlet)o2;
- return
p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString()
-
.compareToIgnoreCase(p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString());
+ String p1Name =
p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true);
+ System.out.println(locale);
+ if (p1Name == null)
+ {
+ p1Name = p1.getContext().getId();
+ }
+ String p2Name =
p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true);
+ if (p2Name == null)
+ {
+ p2Name = p2.getContext().getId();
+ }
+ return p1Name.compareToIgnoreCase(p2Name);
}
};
}
Show replies by date