From 9c69a11841db37c69ddb01cedebb970cd85cdaeb Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 10 Oct 2011 13:59:25 +0000 Subject: [PATCH] =?UTF-8?q?DispatcherHelper.getNegotiatedLocale()=20in=20G?= =?UTF-8?q?lobalizationHelper.getNegotiatedlocale()=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1155 8810af33-2d31-482b-a856-94f89814c4df --- ...ublicPersonalProfileNavigationAddForm.java | 6 +-- .../PublicPersonalProfileNavigationTable.java | 4 +- .../PublicPersonalProfilesServlet.java | 48 +++++++++++++------ 3 files changed, 39 insertions(+), 19 deletions(-) diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java index dff05ad0c..77e39c2cd 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java @@ -27,7 +27,7 @@ import com.arsdigita.cms.contenttypes.PublicPersonalProfileNavItemCollection; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.SimpleEditStep; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.mimetypes.MimeType; import com.arsdigita.util.UncheckedWrapperException; @@ -115,7 +115,7 @@ public class PublicPersonalProfileNavigationAddForm PublicPersonalProfileNavItemCollection navItems = new PublicPersonalProfileNavItemCollection(); - navItems.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + navItems.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); if (showGenerated()) { navItems.addFilter("generatorClass is not null"); @@ -166,7 +166,7 @@ public class PublicPersonalProfileNavigationAddForm PublicPersonalProfileNavItemCollection navItems = new PublicPersonalProfileNavItemCollection(); - navItems.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + navItems.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); navItems.addKeyFilter(navKey); navItems.next(); diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java index 79a4617c4..313dec005 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java @@ -25,7 +25,7 @@ import com.arsdigita.cms.contenttypes.PublicPersonalProfileNavItemCollection; import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.ui.authoring.SimpleEditStep; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.persistence.DataCollection; import com.arsdigita.util.LockableImpl; import java.math.BigDecimal; @@ -145,7 +145,7 @@ public class PublicPersonalProfileNavigationTable ContentItem targetItem = link.getTargetItem(); PublicPersonalProfileNavItem navItem; - navItem = navItems.getNavItem(key, DispatcherHelper. + navItem = navItems.getNavItem(key, GlobalizationHelper. getNegotiatedLocale(). getLanguage()); navItems.reset(); diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java index 6e4270d77..297880edd 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java @@ -22,11 +22,7 @@ import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.PublicPersonalProfile; import com.arsdigita.cms.contenttypes.PublicPersonalProfileNavItemCollection; -import com.arsdigita.cms.contenttypes.PublicPersonalProfileXmlUtil; -import com.arsdigita.cms.dispatcher.CMSDispatcher; -import com.arsdigita.cms.dispatcher.ItemResolver; -import com.arsdigita.cms.publicpersonalprofile.ui.PublicPersonalProfileNavItemsAddForm; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; @@ -294,16 +290,40 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { final ContentGenerator generator = (ContentGenerator) generatorObj; - generator.generateContent(profileElem, - owner, - state); + Element navHome = + navList.newChildElement("nav:category", + "http://ccm.redhat.com/london/navigation"); + navHome.addAttribute("AbstractTree", "AbstractTree"); + navHome.addAttribute("description", ""); + navHome.addAttribute("id", profile.getID().toString()); + if (navPath == null) { + navHome.addAttribute("isSelected", "true"); + } else { + navHome.addAttribute("isSelected", "false"); + } + navHome.addAttribute("sortKey", ""); + String homeLabel = homeLabels.get(GlobalizationHelper.getNegotiatedLocale(). + getLanguage()); + if (homeLabel == null) { + navHome.addAttribute("title", "Home"); + } else { + navHome.addAttribute("title", homeLabel); + } + navHome.addAttribute("url", String.format("/ccm/%s", + profile.getProfileUrl())); - } else { - throw new ServletException(String.format( - "Class '%s' is not a ContentGenerator.", - navItems.getNavItem(). - getGeneratorClass())); - } + //Get the available Navigation items + PublicPersonalProfileNavItemCollection navItems = + new PublicPersonalProfileNavItemCollection(); + navItems.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). + getLanguage()); + final Map navItemMap = + new HashMap(); + PublicPersonalProfileNavItem navItem; + while (navItems.next()) { + navItem = navItems.getNavItem(); + navItemMap.put(navItem.getKey(), navItem); + } } catch (InstantiationException ex) { throw new ServletException(