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 2009/08/30 20:34:46 UTC
svn commit: r809399 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/project/
maven-model-builder/src/main/java/org/apache/maven/model/building/
Author: bentmann
Date: Sun Aug 30 18:34:46 2009
New Revision: 809399
URL: http://svn.apache.org/viewvc?rev=809399&view=rev
Log:
o Simplified code (multi-cast can be realized by a delegating listener if required)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
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/building/DefaultModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=809399&r1=809398&r2=809399&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Sun Aug 30 18:34:46 2009
@@ -18,7 +18,6 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.maven.Maven;
@@ -102,7 +101,7 @@
ModelBuildingRequest request = getModelBuildingRequest( configuration, null );
DefaultModelBuildingListener listener = new DefaultModelBuildingListener( projectBuildingHelper, configuration );
- request.setModelBuildingListeners( Arrays.asList( listener ) );
+ request.setModelBuildingListener( listener );
if ( localProject )
{
@@ -266,7 +265,7 @@
ModelBuildingRequest request = getModelBuildingRequest( config, null );
DefaultModelBuildingListener listener = new DefaultModelBuildingListener( projectBuildingHelper, config );
- request.setModelBuildingListeners( Arrays.asList( listener ) );
+ request.setModelBuildingListener( listener );
request.setModelSource( new UrlModelSource( getClass().getResource( "standalone.xml" ) ) );
@@ -364,7 +363,7 @@
request.setModelCache( modelCache );
DefaultModelBuildingListener listener = new DefaultModelBuildingListener( projectBuildingHelper, config );
- request.setModelBuildingListeners( Arrays.asList( listener ) );
+ request.setModelBuildingListener( listener );
try
{
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=809399&r1=809398&r2=809399&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 Sun Aug 30 18:34:46 2009
@@ -666,16 +666,13 @@
ModelBuildingEventCatapult catapult )
throws ModelBuildingException
{
- List<ModelBuildingListener> listeners = request.getModelBuildingListeners();
+ ModelBuildingListener listener = request.getModelBuildingListener();
- if ( !listeners.isEmpty() )
+ if ( listener != null )
{
ModelBuildingEvent event = new DefaultModelBuildingEvent( model, request, problems );
- for ( ModelBuildingListener listener : listeners )
- {
- catapult.fire( listener, event );
- }
+ catapult.fire( listener, event );
}
}
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java?rev=809399&r1=809398&r2=809399&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java Sun Aug 30 18:34:46 2009
@@ -61,7 +61,7 @@
private ModelResolver modelResolver;
- private List<ModelBuildingListener> modelBuildingListeners;
+ private ModelBuildingListener modelBuildingListener;
private ModelCache modelCache;
@@ -271,26 +271,14 @@
return this;
}
- public List<ModelBuildingListener> getModelBuildingListeners()
+ public ModelBuildingListener getModelBuildingListener()
{
- if ( modelBuildingListeners == null )
- {
- modelBuildingListeners = new ArrayList<ModelBuildingListener>();
- }
-
- return modelBuildingListeners;
+ return modelBuildingListener;
}
- public ModelBuildingRequest setModelBuildingListeners( List<? extends ModelBuildingListener> modelBuildingListeners )
+ public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener modelBuildingListener )
{
- if ( modelBuildingListeners != null )
- {
- this.modelBuildingListeners = new ArrayList<ModelBuildingListener>( modelBuildingListeners );
- }
- else
- {
- this.modelBuildingListeners = null;
- }
+ this.modelBuildingListener = modelBuildingListener;
return this;
}
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java?rev=809399&r1=809398&r2=809399&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java Sun Aug 30 18:34:46 2009
@@ -269,19 +269,19 @@
ModelBuildingRequest setModelResolver( ModelResolver modelResolver );
/**
- * Gets the model building listeners to notify during the build process.
+ * Gets the model building listener to notify during the build process.
*
- * @return The model building listeners to notify, never {@code null}.
+ * @return The model building listener to notify or {@code null} if none.
*/
- List<ModelBuildingListener> getModelBuildingListeners();
+ ModelBuildingListener getModelBuildingListener();
/**
- * Sets the model building listeners to notify during the build process.
+ * Sets the model building listener to notify during the build process.
*
- * @param modelBuildingListeners The model building listeners to notify, may be {@code null}.
+ * @param modelBuildingListener The model building listener to notify, may be {@code null}.
* @return This request, never {@code null}.
*/
- ModelBuildingRequest setModelBuildingListeners( List<? extends ModelBuildingListener> modelBuildingListeners );
+ ModelBuildingRequest setModelBuildingListener( ModelBuildingListener modelBuildingListener );
/**
* Gets the model cache to use for reuse of previously built models.