Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 84347 invoked from network); 16 Oct 2008 20:09:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Oct 2008 20:09:30 -0000 Received: (qmail 81835 invoked by uid 500); 16 Oct 2008 20:09:25 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 81743 invoked by uid 500); 16 Oct 2008 20:09:24 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 81727 invoked by uid 99); 16 Oct 2008 20:09:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2008 13:09:24 -0700 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; Thu, 16 Oct 2008 20:08:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DEA37238898B; Thu, 16 Oct 2008 13:09:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r705345 - in /commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2: AbstractConfiguration.java Configuration.java Date: Thu, 16 Oct 2008 20:09:00 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081016200900.DEA37238898B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oheger Date: Thu Oct 16 13:08:59 2008 New Revision: 705345 URL: http://svn.apache.org/viewvc?rev=705345&view=rev Log: Minor changes in the generified signature of the getList() method Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/Configuration.java Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java?rev=705345&r1=705344&r2=705345&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java Thu Oct 16 13:08:59 2008 @@ -179,6 +179,7 @@ * @deprecated Use AbstractConfiguration.setDefaultListDelimiter(char) * instead */ + @Deprecated public static void setDelimiter(char delimiter) { setDefaultListDelimiter(delimiter); @@ -200,6 +201,7 @@ * @return the default list delimiter * @deprecated Use AbstractConfiguration.getDefaultListDelimiter() instead */ + @Deprecated public static char getDelimiter() { return getDefaultListDelimiter(); @@ -331,6 +333,7 @@ ConfigurationInterpolator interpol = new ConfigurationInterpolator(); interpol.setDefaultLookup(new StrLookup() { + @Override public String lookup(String var) { Object prop = resolveContainerStore(var); @@ -493,6 +496,7 @@ * {@link PropertyConverter}; this method will no longer be * called */ + @Deprecated protected String interpolateHelper(String base, List priorVariables) { return base; // just a dummy implementation @@ -1119,9 +1123,9 @@ * {@inheritDoc} * @see #getStringArray(String) */ - public List getList(String key) + public List getList(String key) { - return getList(key, new ArrayList()); + return getList(key, new ArrayList()); } @SuppressWarnings("unchecked") Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/Configuration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/Configuration.java?rev=705345&r1=705344&r2=705345&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/Configuration.java (original) +++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/Configuration.java Thu Oct 16 13:08:59 2008 @@ -567,12 +567,13 @@ * If the key doesn't map to an existing object an empty List is returned. * * @param key The configuration key. + * @param the type of the elements in the list * @return The associated List. * * @throws ConversionException is thrown if the key maps to an * object that is not a List. */ - List getList(String key); + List getList(String key); /** * Get a List of strings associated with the given configuration key. @@ -581,10 +582,11 @@ * * @param key The configuration key. * @param defaultValue The default value. + * @param the type of the elements in the list * @return The associated List of strings. * * @throws ConversionException is thrown if the key maps to an * object that is not a List. */ - List getList(String key, List defaultValue); + List getList(String key, List defaultValue); }