You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/29 21:50:20 UTC
svn commit: r721715 - in
/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model:
ModelDataSource.java ModelEventListener.java ModelTransformer.java
ModelTransformerContext.java impl/DefaultModelDataSource.java
Author: bentmann
Date: Sat Nov 29 12:50:20 2008
New Revision: 721715
URL: http://svn.apache.org/viewvc?rev=721715&view=rev
Log:
o Added wildcards to collections of non-final classes to allow sub types
Modified:
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelEventListener.java
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java?rev=721715&r1=721714&r2=721715&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java Sat Nov 29 12:50:20 2008
@@ -69,7 +69,7 @@
*
* @param modelProperties the model properties that back the data source
*/
- void init( List<ModelProperty> modelProperties, Collection<ModelContainerFactory> modelContainerFactories );
+ void init( List<ModelProperty> modelProperties, Collection<? extends ModelContainerFactory> modelContainerFactories );
/**
* Return history of all joins and deletes
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelEventListener.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelEventListener.java?rev=721715&r1=721714&r2=721715&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelEventListener.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelEventListener.java Sat Nov 29 12:50:20 2008
@@ -5,7 +5,7 @@
public interface ModelEventListener {
- public void fire(List<ModelContainer> modelContainers) throws DataSourceException ;
+ public void fire(List<? extends ModelContainer> modelContainers) throws DataSourceException ;
List<String> getUris();
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java?rev=721715&r1=721714&r2=721715&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java Sat Nov 29 12:50:20 2008
@@ -41,7 +41,7 @@
* @param properties list of model properties to transform into domain model. List may not be null.
* @return domain model
*/
- DomainModel transformToDomainModel( List<ModelProperty> properties, List<ModelEventListener> eventListeners)
+ DomainModel transformToDomainModel( List<ModelProperty> properties, List<? extends ModelEventListener> eventListeners )
throws IOException;
/**
@@ -51,7 +51,7 @@
* @param domainModels list of domain models to transform to a list of model properties. List may not be null.
* @return list of model properties
*/
- List<ModelProperty> transformToModelProperties(List<DomainModel> domainModels )
+ List<ModelProperty> transformToModelProperties( List<? extends DomainModel> domainModels )
throws IOException;
/**
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=721715&r1=721714&r2=721715&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java Sat Nov 29 12:50:20 2008
@@ -33,7 +33,7 @@
/**
* Factories to use for construction of model containers
*/
- private final Collection<ModelContainerFactory> factories;
+ private final Collection<? extends ModelContainerFactory> factories;
/**
* List of system and environmental properties to use during interpolation
@@ -63,7 +63,7 @@
*
* @param factories model container factories. Value may be null.
*/
- public ModelTransformerContext( Collection<ModelContainerFactory> factories )
+ public ModelTransformerContext( Collection<? extends ModelContainerFactory> factories )
{
if ( factories == null )
{
@@ -180,7 +180,7 @@
* @return transformed model properties
*/
public static List<ModelProperty> transformModelProperties(List<ModelProperty> modelProperties,
- List<ModelPropertyTransformer> modelPropertyTransformers)
+ List<? extends ModelPropertyTransformer> modelPropertyTransformers)
{
if(modelProperties == null) {
throw new IllegalArgumentException("modelProperties: null");
@@ -213,12 +213,12 @@
* @param interpolatorProperties properties to use during interpolation. @return processed domain model
* @throws IOException if there was a problem with the transform
*/
- public DomainModel transform(List<DomainModel> domainModels,
+ public DomainModel transform(List<? extends DomainModel> domainModels,
ModelTransformer fromModelTransformer,
ModelTransformer toModelTransformer,
- Collection<ImportModel> importModels,
+ Collection<? extends ImportModel> importModels,
List<InterpolatorProperty> interpolatorProperties,
- List<ModelEventListener> eventListeners)
+ List<? extends ModelEventListener> eventListeners)
throws IOException
{
@@ -331,14 +331,14 @@
* @return processed domain model
* @throws IOException if there was a problem with the transform
*/
- public DomainModel transform( List<DomainModel> domainModels, ModelTransformer fromModelTransformer,
+ public DomainModel transform( List<? extends DomainModel> domainModels, ModelTransformer fromModelTransformer,
ModelTransformer toModelTransformer )
throws IOException
{
return this.transform( domainModels, fromModelTransformer, toModelTransformer, null, systemInterpolatorProperties, null );
}
- private static List<ModelProperty> importModelProperties(Collection<ImportModel> importModels,
+ private static List<ModelProperty> importModelProperties(Collection<? extends ImportModel> importModels,
List<ModelProperty> modelProperties) {
List<ModelProperty> properties = new ArrayList<ModelProperty>();
for(ModelProperty mp: modelProperties) {
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=721715&r1=721714&r2=721715&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Sat Nov 29 12:50:20 2008
@@ -278,7 +278,7 @@
/**
* @see ModelDataSource#init(java.util.List, java.util.Collection)
*/
- public void init( List<ModelProperty> modelProperties, Collection<ModelContainerFactory> modelContainerFactories )
+ public void init( List<ModelProperty> modelProperties, Collection<? extends ModelContainerFactory> modelContainerFactories )
{
if ( modelProperties == null )
{