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/09/09 00:59:11 UTC
svn commit: r812719 - in
/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building:
DefaultModelBuilder.java DefaultModelProblemCollector.java
Author: bentmann
Date: Tue Sep 8 22:59:11 2009
New Revision: 812719
URL: http://svn.apache.org/viewvc?rev=812719&view=rev
Log:
o Fixed error reporting
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=812719&r1=812718&r2=812719&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Tue Sep 8 22:59:11 2009
@@ -518,6 +518,8 @@
DefaultModelProblemCollector problems )
throws ModelBuildingException
{
+ problems.setSourceHint( childModel );
+
Parent parent = childModel.getParent();
String groupId = parent.getGroupId();
@@ -648,11 +650,11 @@
}
catch ( ModelBuildingException e )
{
- problems.getProblems().addAll( e.getProblems() );
+ problems.addAll( e.getProblems() );
continue;
}
- problems.getProblems().addAll( importResult.getProblems() );
+ problems.addAll( importResult.getProblems() );
Model importModel = importResult.getEffectiveModel();
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java?rev=812719&r1=812718&r2=812719&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java Tue Sep 8 22:59:11 2009
@@ -96,6 +96,11 @@
problems.add( problem );
}
+ public void addAll( List<ModelProblem> problems )
+ {
+ problems.addAll( problems );
+ }
+
public void addFatalError( String message )
{
problems.add( new DefaultModelProblem( message, ModelProblem.Severity.FATAL, getSourceHint() ) );