[portal-commits] JBoss Portal SVN: r9158 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/main/org/jboss/portal/core/admin/ui/actions and 1 other directory.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2007-11-28 04:04:28 -0500 (Wed, 28 Nov 2007)
New Revision: 9158

Modified:
   branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
   branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
Log:
JBPORTAL-1805  Let a user define multiple display-name for a portal object in the admin portlet

Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2007-11-28 08:53:11 UTC (rev 9157)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2007-11-28 09:04:28 UTC (rev 9158)
@@ -159,10 +159,7 @@
          throw new IllegalArgumentException("No null display name accepted");
       }
 
-      if (displayNames == null)
-      {
-         displayNames = new HashMap();
-      }
+      displayNames = new HashMap();
       
       Map map = displayName.getValues();
       Iterator it = map.values().iterator();

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java	2007-11-28 08:53:11 UTC (rev 9157)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java	2007-11-28 09:04:28 UTC (rev 9158)
@@ -60,14 +60,25 @@
 
       if (newText != null)
       {
-         getSelectedObject();
+         PortalObject portalObject = getSelectedObject();
          Locale locale = LocaleFormat.DEFAULT.getLocale(newLocale);
-         Map map = new HashMap();
-         LocalizedString.Value lsv = new LocalizedString.Value(locale, newText);
-         map.put(locale, lsv.getString());
+         LocalizedString displayName = portalObject.getDisplayName();
+         Map<Locale, String> map = new HashMap<Locale, String>();
+         if (displayName != null)
+         {
+            Map<Locale, LocalizedString.Value> oldMap = displayName.getValues();
+            Collection<LocalizedString.Value> values = oldMap.values();
+            for (LocalizedString.Value value : values)
+            {
+               map.put(value.getLocale(), value.getString());
+            }
+         }
+         map.put(locale, newText);
          LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH);
          selectedObject.setDisplayName(newLocalizedString);
-      }else{
+      }
+      else
+      {
          FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "You must enter a name", "You must enter a name");
          FacesContext.getCurrentInstance().addMessage("status", message);
       }