svn commit: r807144 - in /maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelBuilder.java io/DefaultModelReader.java io/ModelReader.java

[be...@apache.org]

Author: bentmann
Date: Mon Aug 24 10:45:58 2009
New Revision: 807144

URL: http://svn.apache.org/viewvc?rev=807144&view=rev
Log:
o Fixed generics

Modified:
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java

Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=807144&r1=807143&r2=807144&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Mon Aug 24 10:45:58 2009
@@ -269,8 +269,7 @@
         {
             boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
 
-            Map<String, Object> options =
-                Collections.<String, Object> singletonMap( ModelReader.IS_STRICT, Boolean.valueOf( strict ) );
+            Map<String, ?> options = Collections.singletonMap( ModelReader.IS_STRICT, Boolean.valueOf( strict ) );
 
             model = modelReader.read( modelSource.getInputStream(), options );
         }

Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java?rev=807144&r1=807143&r2=807144&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java Mon Aug 24 10:45:58 2009
@@ -42,7 +42,7 @@
     implements ModelReader
 {
 
-    public Model read( File input, Map<String, Object> options )
+    public Model read( File input, Map<String, ?> options )
         throws IOException
     {
         if ( input == null )
@@ -57,7 +57,7 @@
         return model;
     }
 
-    public Model read( Reader input, Map<String, Object> options )
+    public Model read( Reader input, Map<String, ?> options )
         throws IOException
     {
         if ( input == null )
@@ -80,7 +80,7 @@
         }
     }
 
-    public Model read( InputStream input, Map<String, Object> options )
+    public Model read( InputStream input, Map<String, ?> options )
         throws IOException
     {
         if ( input == null )
@@ -103,7 +103,7 @@
         }
     }
 
-    private boolean isStrict( Map<String, Object> options )
+    private boolean isStrict( Map<String, ?> options )
     {
         Object value = ( options != null ) ? options.get( IS_STRICT ) : null;
         return value == null || Boolean.parseBoolean( value.toString() );

Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java?rev=807144&r1=807143&r2=807144&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java Mon Aug 24 10:45:58 2009
@@ -50,7 +50,7 @@
      * @throws IOException If the model could not be deserialized.
      * @throws ModelParseException If the input format could not be parsed.
      */
-    Model read( File input, Map<String, Object> options )
+    Model read( File input, Map<String, ?> options )
         throws IOException, ModelParseException;
 
     /**
@@ -63,7 +63,7 @@
      * @throws IOException If the model could not be deserialized.
      * @throws ModelParseException If the input format could not be parsed.
      */
-    Model read( Reader input, Map<String, Object> options )
+    Model read( Reader input, Map<String, ?> options )
         throws IOException, ModelParseException;
 
     /**
@@ -76,7 +76,7 @@
      * @throws IOException If the model could not be deserialized.
      * @throws ModelParseException If the input format could not be parsed.
      */
-    Model read( InputStream input, Map<String, Object> options )
+    Model read( InputStream input, Map<String, ?> options )
         throws IOException, ModelParseException;
 
 }