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/05/11 22:53:26 UTC
svn commit: r773688 -
/maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Author: bentmann
Date: Mon May 11 20:53:25 2009
New Revision: 773688
URL: http://svn.apache.org/viewvc?rev=773688&view=rev
Log:
o Extended model merger
Modified:
maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Modified: maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=773688&r1=773687&r2=773688&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java (original)
+++ maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java Mon May 11 20:53:25 2009
@@ -1966,7 +1966,10 @@
mergeNotifier_Type( target, source, sourceDominant, context );
mergeNotifier_Address( target, source, sourceDominant, context );
mergeNotifier_Configuration( target, source, sourceDominant, context );
- // TODO
+ mergeNotifier_SendOnError( target, source, sourceDominant, context );
+ mergeNotifier_SendOnFailure( target, source, sourceDominant, context );
+ mergeNotifier_SendOnSuccess( target, source, sourceDominant, context );
+ mergeNotifier_SendOnWarning( target, source, sourceDominant, context );
}
protected void mergeNotifier_Type( Notifier target, Notifier source, boolean sourceDominant,
@@ -2012,6 +2015,42 @@
target.setConfiguration( merged );
}
+ protected void mergeNotifier_SendOnError( Notifier target, Notifier source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ if ( sourceDominant )
+ {
+ target.setSendOnError( source.isSendOnError() );
+ }
+ }
+
+ protected void mergeNotifier_SendOnFailure( Notifier target, Notifier source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ if ( sourceDominant )
+ {
+ target.setSendOnFailure( source.isSendOnFailure() );
+ }
+ }
+
+ protected void mergeNotifier_SendOnSuccess( Notifier target, Notifier source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ if ( sourceDominant )
+ {
+ target.setSendOnSuccess( source.isSendOnSuccess() );
+ }
+ }
+
+ protected void mergeNotifier_SendOnWarning( Notifier target, Notifier source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ if ( sourceDominant )
+ {
+ target.setSendOnWarning( source.isSendOnWarning() );
+ }
+ }
+
protected void mergePrerequisites( Prerequisites target, Prerequisites source, boolean sourceDominant,
Map<Object, Object> context )
{