Return-Path: Delivered-To: apmail-click-commits-archive@www.apache.org Received: (qmail 88229 invoked from network); 21 Jun 2010 23:29:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Jun 2010 23:29:19 -0000 Received: (qmail 91181 invoked by uid 500); 21 Jun 2010 23:29:19 -0000 Delivered-To: apmail-click-commits-archive@click.apache.org Received: (qmail 91153 invoked by uid 500); 21 Jun 2010 23:29:19 -0000 Mailing-List: contact commits-help@click.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: click-dev@click.apache.org Delivered-To: mailing list commits@click.apache.org Received: (qmail 91145 invoked by uid 99); 21 Jun 2010 23:29:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jun 2010 23:29:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 21 Jun 2010 23:29:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8CE942388906; Mon, 21 Jun 2010 23:28:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r956733 - /click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java Date: Mon, 21 Jun 2010 23:28:30 -0000 To: commits@click.apache.org From: sabob@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100621232830.8CE942388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sabob Date: Mon Jun 21 23:28:30 2010 New Revision: 956733 URL: http://svn.apache.org/viewvc?rev=956733&view=rev Log: kept source code service alphabetical order Modified: click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java Modified: click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java?rev=956733&r1=956732&r2=956733&view=diff ============================================================================== --- click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java (original) +++ click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java Mon Jun 21 23:28:30 2010 @@ -1576,6 +1576,39 @@ public class XmlConfigService implements getLogService().info(msg); } + private void loadMessagesMapService(Element rootElm) throws Exception { + Element messagesMapServiceElm = ClickUtils.getChild(rootElm, "messages-map-service"); + + if (messagesMapServiceElm != null) { + Class messagesMapServiceClass = DefaultMessagesMapService.class; + + String classname = messagesMapServiceElm.getAttribute("classname"); + + if (StringUtils.isNotBlank(classname)) { + messagesMapServiceClass = ClickUtils.classForName(classname); + } + + messagesMapService = (MessagesMapService) messagesMapServiceClass.newInstance(); + + Map propertyMap = loadPropertyMap(messagesMapServiceElm); + + for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();) { + String name = i.next().toString(); + String value = propertyMap.get(name).toString(); + + Ognl.setValue(name, messagesMapService, value); + } + } + + if (getLogService().isDebugEnabled()) { + String msg = "initializing MessagesMapService: " + + messagesMapService.getClass().getName(); + getLogService().debug(msg); + } + + messagesMapService.onInit(servletContext); + } + private void loadPageInterceptors(Element rootElm) throws Exception { List interceptorList = ClickUtils.getChildren(rootElm, "page-interceptor"); @@ -1678,39 +1711,6 @@ public class XmlConfigService implements templateService.onInit(servletContext); } - private void loadMessagesMapService(Element rootElm) throws Exception { - Element messagesMapServiceElm = ClickUtils.getChild(rootElm, "messages-map-service"); - - if (messagesMapServiceElm != null) { - Class messagesMapServiceClass = DefaultMessagesMapService.class; - - String classname = messagesMapServiceElm.getAttribute("classname"); - - if (StringUtils.isNotBlank(classname)) { - messagesMapServiceClass = ClickUtils.classForName(classname); - } - - messagesMapService = (MessagesMapService) messagesMapServiceClass.newInstance(); - - Map propertyMap = loadPropertyMap(messagesMapServiceElm); - - for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();) { - String name = i.next().toString(); - String value = propertyMap.get(name).toString(); - - Ognl.setValue(name, messagesMapService, value); - } - } - - if (getLogService().isDebugEnabled()) { - String msg = "initializing MessagesMapService: " - + messagesMapService.getClass().getName(); - getLogService().debug(msg); - } - - messagesMapService.onInit(servletContext); - } - private static Map loadPropertyMap(Element parentElm) { Map propertyMap = new HashMap();