You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/04/19 20:03:51 UTC
svn commit: r1588686 - in /commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined: CombinedBuilderParametersImpl.java CombinedBuilderProperties.java

Author: oheger
Date: Sat Apr 19 18:03:51 2014
New Revision: 1588686

URL: http://svn.apache.org/r1588686
Log:
Fixed raw type warnings in CombinedBuilderParametersImpl.

The definition builder can now produce a hierarchical configuration of an
arbitrary node type.

Modified:
    commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java
    commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderProperties.java

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java?rev=1588686&r1=1588685&r2=1588686&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java Sat Apr 19 18:03:51 2014
@@ -58,7 +58,7 @@ public class CombinedBuilderParametersIm
             + CombinedBuilderParametersImpl.class.getName();
 
     /** The definition configuration builder. */
-    private ConfigurationBuilder<? extends HierarchicalConfiguration> definitionBuilder;
+    private ConfigurationBuilder<? extends HierarchicalConfiguration<?>> definitionBuilder;
 
     /** A parameters object for the definition configuration builder. */
     private BuilderParameters definitionBuilderParameters;
@@ -86,7 +86,7 @@ public class CombinedBuilderParametersIm
 
     /**
      * Looks up an instance of this class in the specified parameters map. This
-     * is equivalent to {@code fromParameters(params, false};}
+     * is equivalent to {@code fromParameters(params, false);}
      *
      * @param params the map with parameters (must not be <b>null</b>
      * @return the instance obtained from the map or <b>null</b>
@@ -129,7 +129,7 @@ public class CombinedBuilderParametersIm
      *
      * @return the definition {@code ConfigurationBuilder}
      */
-    public ConfigurationBuilder<? extends HierarchicalConfiguration> getDefinitionBuilder()
+    public ConfigurationBuilder<? extends HierarchicalConfiguration<?>> getDefinitionBuilder()
     {
         return definitionBuilder;
     }
@@ -144,7 +144,7 @@ public class CombinedBuilderParametersIm
      */
     @Override
     public CombinedBuilderParametersImpl setDefinitionBuilder(
-            ConfigurationBuilder<? extends HierarchicalConfiguration> builder)
+            ConfigurationBuilder<? extends HierarchicalConfiguration<?>> builder)
     {
         definitionBuilder = builder;
         return this;

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderProperties.java?rev=1588686&r1=1588685&r2=1588686&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderProperties.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderProperties.java Sat Apr 19 18:03:51 2014
@@ -48,7 +48,7 @@ public interface CombinedBuilderProperti
      * @return a reference to this object for method chaining
      */
     T setDefinitionBuilder(
-            ConfigurationBuilder<? extends HierarchicalConfiguration> builder);
+            ConfigurationBuilder<? extends HierarchicalConfiguration<?>> builder);
 
     /**
      * Registers the given {@code ConfigurationBuilderProvider} for the