Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4EBB718C09 for ; Sun, 14 Feb 2016 19:02:16 +0000 (UTC) Received: (qmail 50739 invoked by uid 500); 14 Feb 2016 19:02:11 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 50646 invoked by uid 500); 14 Feb 2016 19:02:11 -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 50635 invoked by uid 99); 14 Feb 2016 19:02:11 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Feb 2016 19:02:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B31A4C0909 for ; Sun, 14 Feb 2016 19:02:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.471 X-Spam-Level: * X-Spam-Status: No, score=1.471 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Ng4bqcAAlTae for ; Sun, 14 Feb 2016 19:02:09 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 5A80125996 for ; Sun, 14 Feb 2016 19:02:08 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 5636BE019D for ; Sun, 14 Feb 2016 19:02:07 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 568913A0256 for ; Sun, 14 Feb 2016 19:02:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1730378 - in /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2: builder/FileBasedBuilderParametersImpl.java io/FileHandler.java io/FileLocatorUtils.java Date: Sun, 14 Feb 2016 19:02:07 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160214190207.568913A0256@svn01-us-west.apache.org> Author: oheger Date: Sun Feb 14 19:02:07 2016 New Revision: 1730378 URL: http://svn.apache.org/viewvc?rev=1730378&view=rev Log: [CONFIGURATION-619] Made some fromParameters() methods more generic. Rather than a Map, the more generic type Map can be used. Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java?rev=1730378&r1=1730377&r2=1730378&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java Sun Feb 14 19:02:07 2016 @@ -101,7 +101,7 @@ public class FileBasedBuilderParametersI * @throws IllegalArgumentException if the map is null */ public static FileBasedBuilderParametersImpl fromParameters( - Map params) + Map params) { return fromParameters(params, false); } @@ -120,7 +120,7 @@ public class FileBasedBuilderParametersI * @throws IllegalArgumentException if the map is null */ public static FileBasedBuilderParametersImpl fromParameters( - Map params, boolean createIfMissing) + Map params, boolean createIfMissing) { if (params == null) { @@ -150,7 +150,7 @@ public class FileBasedBuilderParametersI * @return the newly created instance * @throws ClassCastException if the map contains invalid data */ - public static FileBasedBuilderParametersImpl fromMap(Map map) + public static FileBasedBuilderParametersImpl fromMap(Map map) { FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl(FileHandler.fromMap(map)); Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java?rev=1730378&r1=1730377&r2=1730378&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java Sun Feb 14 19:02:07 2016 @@ -228,7 +228,7 @@ public class FileHandler * @return the newly created {@code FileHandler} * @see FileLocatorUtils#fromMap(Map) */ - public static FileHandler fromMap(Map map) + public static FileHandler fromMap(Map map) { return new FileHandler(null, FileLocatorUtils.fromMap(map)); } Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java?rev=1730378&r1=1730377&r2=1730378&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java Sun Feb 14 19:02:07 2016 @@ -179,7 +179,7 @@ public final class FileLocatorUtils * @return the new {@code FileLocator} * @throws ClassCastException if the map contains invalid data */ - public static FileLocator fromMap(Map map) + public static FileLocator fromMap(Map map) { FileLocator.FileLocatorBuilder builder = fileLocator(); if (map != null)