A bit of refactoring
git-svn-id: https://svn.apache.org/repos/asf/ant/easyant/core/trunk@1519248 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/easyant/core/EasyAntEngine.java b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
index a9fb3d6..99799a7 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntEngine.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
@@ -582,7 +582,7 @@
}
- public void doBuild(final Project project) throws Error {
+ public void doBuild(final Project project) {
project.fireBuildStarted();
Throwable error = null;
@@ -610,10 +610,8 @@
System.setErr(new PrintStream(new DemuxOutputStream(project, true)));
// make sure that we have a target to execute
- if (configuration.getTargets().size() == 0) {
- if (project.getDefaultTarget() != null) {
- configuration.getTargets().add(project.getDefaultTarget());
- }
+ if (configuration.getTargets().size() == 0 && project.getDefaultTarget() != null) {
+ configuration.getTargets().add(project.getDefaultTarget());
}
project.executeTargets(new Vector(configuration.getTargets()));
} finally {
@@ -731,7 +729,7 @@
msg.append(props.getProperty("DATE"));
easyantVersion = msg.toString();
} catch (IOException ioe) {
- throw new BuildException("Could not load the version information:" + ioe.getMessage());
+ throw new BuildException("Could not load the version information", ioe);
} finally {
if (in != null) {
try {
diff --git a/src/main/java/org/apache/easyant/core/EasyAntMain.java b/src/main/java/org/apache/easyant/core/EasyAntMain.java
index 8a7cc15..8c05e1d 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntMain.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntMain.java
@@ -750,7 +750,7 @@
msg.append(props.getProperty("DATE"));
antVersion = msg.toString();
} catch (IOException ioe) {
- throw new BuildException("Could not load the version information:" + ioe.getMessage());
+ throw new BuildException("Could not load the version information", ioe);
} finally {
if (in != null) {
try {
