You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/14 17:16:58 UTC
cvs commit: maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator AbstractGenerator.java BeanGenerator.java
jvanzyl 2004/06/14 08:16:58
Modified: maven-plugin/src/main/java/org/apache/maven/plugin
InvalidParameterException.java
maven-plugin/src/main/java/org/apache/maven/plugin/generator
AbstractGenerator.java BeanGenerator.java
Log:
o tell the user which parameter is faulty
Revision Changes Path
1.2 +3 -3 maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/InvalidParameterException.java
Index: InvalidParameterException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/InvalidParameterException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvalidParameterException.java 14 Jun 2004 15:02:05 -0000 1.1
+++ InvalidParameterException.java 14 Jun 2004 15:16:58 -0000 1.2
@@ -11,9 +11,9 @@
{
}
- public InvalidParameterException( String element )
+ public InvalidParameterException( String element, int i )
{
- super( "The " + element + " element is invalid. It cannot be null." );
+ super( "The " + element + " element in parameter # " + i + " is invalid. It cannot be null." );
}
public InvalidParameterException( Throwable cause )
1.10 +6 -6 maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractGenerator.java 14 Jun 2004 15:02:05 -0000 1.9
+++ AbstractGenerator.java 14 Jun 2004 15:16:58 -0000 1.10
@@ -73,21 +73,21 @@
processPluginDescriptors( mojos, destinationDirectory, pomDom );
}
- protected void validateParameter( Parameter parameter )
+ protected void validateParameter( Parameter parameter, int i )
throws InvalidParameterException
{
String name = parameter.getName();
if ( name == null )
{
- throw new InvalidParameterException( "name" );
+ throw new InvalidParameterException( "name", i );
}
String type = parameter.getType();
if ( type == null )
{
- throw new InvalidParameterException( "type" );
+ throw new InvalidParameterException( "type", i );
}
boolean required = parameter.isRequired();
@@ -96,21 +96,21 @@
if ( validator == null )
{
- throw new InvalidParameterException( "validator" );
+ throw new InvalidParameterException( "validator", i );
}
String expression = parameter.getExpression();
if ( expression == null )
{
- throw new InvalidParameterException( "expression" );
+ throw new InvalidParameterException( "expression", i );
}
String description = parameter.getDescription();
if ( description == null )
{
- throw new InvalidParameterException( "description" );
+ throw new InvalidParameterException( "description", i );
}
}
1.7 +1 -1 maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java
Index: BeanGenerator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/generator/BeanGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BeanGenerator.java 14 Jun 2004 15:02:05 -0000 1.6
+++ BeanGenerator.java 14 Jun 2004 15:16:58 -0000 1.7
@@ -75,7 +75,7 @@
{
Parameter parameter = (Parameter) parameters.get( i );
- validateParameter( parameter );
+ validateParameter( parameter, i );
jClass.addMethod( createSetter( parameter, jClass ) );
}