Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 35165D15C for ; Tue, 17 Jul 2012 09:21:54 +0000 (UTC) Received: (qmail 66779 invoked by uid 500); 17 Jul 2012 09:21:53 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 66674 invoked by uid 500); 17 Jul 2012 09:21:51 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 66647 invoked by uid 99); 17 Jul 2012 09:21:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 09:21:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 09:21:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A914F238889B; Tue, 17 Jul 2012 09:21:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1362423 - /sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java Date: Tue, 17 Jul 2012 09:21:30 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120717092130.A914F238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Jul 17 09:21:30 2012 New Revision: 1362423 URL: http://svn.apache.org/viewvc?rev=1362423&view=rev Log: Code cleanup Modified: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java Modified: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java?rev=1362423&r1=1362422&r2=1362423&view=diff ============================================================================== --- sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java (original) +++ sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java Tue Jul 17 09:21:30 2012 @@ -27,6 +27,7 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; +import org.apache.pluto.container.om.portlet.PortletDefinition; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.api.servlets.SlingSafeMethodsServlet; @@ -75,7 +76,12 @@ public class UIServlet extends SlingSafe w.key("value"); w.value(entity.getPortletEntityId().getKey()); w.key("text"); - w.value(entity.getPortletConfig().getPortletDefinition().getPortletName()); + final PortletDefinition def = entity.getPortletConfig().getPortletDefinition(); + if ( def.getPortletInfo() != null && def.getPortletInfo().getTitle() != null ) { + w.value(def.getPortletInfo().getTitle()); + } else { + w.value(def.getPortletName()); + } w.endObject(); } w.endArray();