adammurdoch 02/05/27 06:39:34
Modified: container/src/java/org/apache/myrmidon/components/builder
DefaultModelBuilder.java Resources.properties
Log:
Tidy up project builder error messages.
Revision Changes Path
1.3 +7 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultModelBuilder.java
Index: DefaultModelBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultModelBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultModelBuilder.java 19 May 2002 10:46:10 -0000 1.2
+++ DefaultModelBuilder.java 27 May 2002 13:39:34 -0000 1.3
@@ -13,6 +13,8 @@
import org.apache.myrmidon.api.metadata.ModelException;
import org.apache.myrmidon.interfaces.builder.ModelBuilder;
import org.apache.myrmidon.interfaces.model.ModelElementSaxHandler;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.xml.sax.XMLReader;
/**
@@ -21,13 +23,16 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/05/19 10:46:10 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/27 13:39:34 $
*
* @ant.type type="model-builder" name="xml"
*/
public class DefaultModelBuilder
implements ModelBuilder
{
+ private static final Resources REZ =
+ ResourceManager.getPackageResources( DefaultModelBuilder.class );
+
public ModelElement build( final String source )
throws ModelException
{
@@ -48,7 +53,7 @@
}
catch( final Exception e )
{
- final String message = e.getMessage();
+ final String message = REZ.getString( "ant.project-parse.error"
);
throw new ModelException( message, e );
}
}
1.11 +0 -5
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/Resources.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Resources.properties 17 May 2002 07:41:27 -0000 1.10
+++ Resources.properties 27 May 2002 13:39:34 -0000 1.11
@@ -8,8 +8,6 @@
ati.attribue-unquoted.error=Expecting the value of attribute {0} to be
enclosed in quotes.
ant.project-banner.notice=Project {0} base directory: {1}.
-ant.target-parse.notice=Parsing target: {0}.
-ant.target-dependency.notice=Target dependency: {0}
ant.project-unexpected.error=Unexpected error building project.
ant.project-parse.error=Could not parse project file.
ant.project-build.error=Could not load project from "{0}".
@@ -20,9 +18,6 @@
ant.projectref-no-name.error=Malformed projectref without a name attribute
at {0}.
ant.projectref-bad-name.error=Projectref with an invalid name attribute at
{0}.
ant.projectref-no-location.error=Malformed projectref without a location
attribute at {0}.
-ant.target-noname.error=Discovered un-named target at {0}.
-ant.target-bad-name.error=Target with an invalid name at {0}.
-ant.target-bad-dependency.error=Discovered empty dependency in target {0} at
{1}.
ant.malformed.version=Project has an invalid version "{0}".
ant.version-missing.error=Project has no version attribute.
ant.bad-version.error=Incompatible build file version detected. Expected
version {0} but found version {1}.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
