Return-Path: Delivered-To: apmail-click-commits-archive@www.apache.org Received: (qmail 1795 invoked from network); 30 Mar 2010 14:15:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Mar 2010 14:15:33 -0000 Received: (qmail 68193 invoked by uid 500); 30 Mar 2010 14:15:33 -0000 Delivered-To: apmail-click-commits-archive@click.apache.org Received: (qmail 68176 invoked by uid 500); 30 Mar 2010 14:15:33 -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 68168 invoked by uid 99); 30 Mar 2010 14:15:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 14:15:33 +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; Tue, 30 Mar 2010 14:15:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 944A52388903; Tue, 30 Mar 2010 14:15:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r929149 - in /click/trunk/click: documentation/docs/ framework/src/org/apache/click/ framework/src/org/apache/click/control/ framework/test/org/apache/click/ framework/test/org/apache/click/control/ Date: Tue, 30 Mar 2010 14:15:08 -0000 To: commits@click.apache.org From: sabob@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100330141508.944A52388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sabob Date: Tue Mar 30 14:15:08 2010 New Revision: 929149 URL: http://svn.apache.org/viewvc?rev=929149&view=rev Log: replaced page and control getmessage methods with varargs. CLK-604 Modified: click/trunk/click/documentation/docs/roadmap-changes.html click/trunk/click/framework/src/org/apache/click/Page.java click/trunk/click/framework/src/org/apache/click/control/AbstractControl.java click/trunk/click/framework/test/org/apache/click/PageTest.java click/trunk/click/framework/test/org/apache/click/control/ControlTest.java Modified: click/trunk/click/documentation/docs/roadmap-changes.html URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/roadmap-changes.html?rev=929149&r1=929148&r2=929149&view=diff ============================================================================== --- click/trunk/click/documentation/docs/roadmap-changes.html (original) +++ click/trunk/click/documentation/docs/roadmap-changes.html Tue Mar 30 14:15:08 2010 @@ -192,6 +192,10 @@ includes improved Ajax support and @Bind [CLK-585].
  • + Replaced Page and Control getMessage methods with varargs equivalents + [CLK-604]. +
    • +
  • Removed Click core's dependency on Velocity. This issue was raised by by Andrey Rybin [CLK-606].
    • Modified: click/trunk/click/framework/src/org/apache/click/Page.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/Page.java?rev=929149&r1=929148&r2=929149&view=diff ============================================================================== --- click/trunk/click/framework/src/org/apache/click/Page.java (original) +++ click/trunk/click/framework/src/org/apache/click/Page.java Tue Mar 30 14:15:08 2010 @@ -826,24 +826,6 @@ public class Page implements Serializabl } /** - * Return the formatted page message for the given resource name - * and message format argument or null if no message was found. The resource - * message returned will use the Locale obtained from the Context. - *

    - * {@link #getMessage(java.lang.String, java.lang.Object[])} is invoked to - * retrieve the message for the specified name. - * - * @param name resource name of the message - * @param arg the message argument to format - * @return the named localized message for the page or null if no message - * was found - */ - public String getMessage(String name, Object arg) { - Object[] args = new Object[] { arg }; - return getMessage(name, args); - } - - /** * Return the formatted page message for the given resource name and * message format arguments or null if no message was found. The resource * message returned will use the Locale obtained from the Context. @@ -856,7 +838,7 @@ public class Page implements Serializabl * @return the named localized message for the page or null if no message * was found */ - public String getMessage(String name, Object[] args) { + public String getMessage(String name, Object... args) { String value = getMessage(name); return MessageFormat.format(value, args); Modified: click/trunk/click/framework/src/org/apache/click/control/AbstractControl.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/control/AbstractControl.java?rev=929149&r1=929148&r2=929149&view=diff ============================================================================== --- click/trunk/click/framework/src/org/apache/click/control/AbstractControl.java (original) +++ click/trunk/click/framework/src/org/apache/click/control/AbstractControl.java Tue Mar 30 14:15:08 2010 @@ -403,24 +403,6 @@ public abstract class AbstractControl im /** * Return the formatted message for the given resource name and message - * format argument or null if no message was found. The resource message - * returned will use the Locale obtained from the Context. - *

    - * {@link #getMessage(java.lang.String, java.lang.Object[])} is invoked to - * retrieve the message for the specified name. - * - * @param name resource name of the message - * @param arg the message argument to format - * @return the named localized message for the control or null if no message - * was found - */ - public String getMessage(String name, Object arg) { - Object[] args = new Object[] { arg }; - return getMessage(name, args); - } - - /** - * Return the formatted message for the given resource name and message * format arguments or null if no message was found. The resource * message returned will use the Locale obtained from the Context. *

    @@ -432,7 +414,7 @@ public abstract class AbstractControl im * @return the named localized message for the control or null if no message * was found */ - public String getMessage(String name, Object[] args) { + public String getMessage(String name, Object... args) { String value = getMessage(name); if (value == null) { return null; Modified: click/trunk/click/framework/test/org/apache/click/PageTest.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/test/org/apache/click/PageTest.java?rev=929149&r1=929148&r2=929149&view=diff ============================================================================== --- click/trunk/click/framework/test/org/apache/click/PageTest.java (original) +++ click/trunk/click/framework/test/org/apache/click/PageTest.java Tue Mar 30 14:15:08 2010 @@ -139,4 +139,31 @@ public class PageTest extends TestCase { container.stop(); } + + /** + * Test getMessage variations. + */ + public void testGetMessage() { + MockContext.initContext(); + + String expected = "Version 0.21"; + + Page page = new Page(); + String version = page.getMessage("version"); + assertEquals(expected, version); + + version = page.getMessage("version", "arg"); + assertEquals(expected, version); + + version = page.getMessage("version", "arg1", "arg2"); + assertEquals(expected, version); + + version = page.getMessage("version", (String) null); + assertEquals(expected, version); + + Object args[] = new Object[1]; + args[0] = null; + version = page.getMessage("version", args); + assertEquals(expected, version); + } } Modified: click/trunk/click/framework/test/org/apache/click/control/ControlTest.java URL: http://svn.apache.org/viewvc/click/trunk/click/framework/test/org/apache/click/control/ControlTest.java?rev=929149&r1=929148&r2=929149&view=diff ============================================================================== --- click/trunk/click/framework/test/org/apache/click/control/ControlTest.java (original) +++ click/trunk/click/framework/test/org/apache/click/control/ControlTest.java Tue Mar 30 14:15:08 2010 @@ -18,9 +18,11 @@ */ package org.apache.click.control; +import com.sun.java_cup.internal.version; import junit.framework.Assert; import junit.framework.TestCase; import org.apache.click.MockContext; +import org.apache.click.Page; /** * Miscellaneous Control tests. @@ -107,4 +109,35 @@ public class ControlTest extends TestCas Assert.assertTrue(true); } } + + /** + * Test getMessage variations. + */ + public void testGetMessage() { + MockContext.initContext(); + + String expected = "Version 0.21"; + + Page page = new Page(); + Field field = new TextField("field"); + page.addControl(field); + + String version = field.getMessage("version"); + System.out.println("V " + version); + assertEquals(expected, version); + + version = field.getMessage("version", "arg"); + assertEquals(expected, version); + + version = field.getMessage("version", "arg1", "arg2"); + assertEquals(expected, version); + + version = field.getMessage("version", (String) null); + assertEquals(expected, version); + + Object args[] = new Object[1]; + args[0] = null; + version = field.getMessage("version", args); + assertEquals(expected, version); + } } \ No newline at end of file