From e6706b6daeaa0a8f3b12152919021dca5c1f877f Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 23 Apr 2002 07:27:20 +0000 Subject: [PATCH] Make live easier for projects that subclass Project by setting the input handler to a default value. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272551 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/Project.java | 4 +++- src/testcases/org/apache/tools/ant/ProjectTest.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 109dda6b0..833eaf4db 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -69,6 +69,7 @@ import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.JavaEnvUtils; +import org.apache.tools.ant.input.DefaultInputHandler; import org.apache.tools.ant.input.InputHandler; /** @@ -209,6 +210,7 @@ public class Project { */ public Project() { fileUtils = FileUtils.newFileUtils(); + inputHandler = new DefaultInputHandler(); } /** @@ -1470,7 +1472,7 @@ public class Project { */ public void setFileLastModified(File file, long time) throws BuildException { - if (JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1) { + if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) { log("Cannot change the modification time of " + file + " in JDK 1.1", Project.MSG_WARN); return; diff --git a/src/testcases/org/apache/tools/ant/ProjectTest.java b/src/testcases/org/apache/tools/ant/ProjectTest.java index d99ce5f6c..31c092523 100644 --- a/src/testcases/org/apache/tools/ant/ProjectTest.java +++ b/src/testcases/org/apache/tools/ant/ProjectTest.java @@ -54,6 +54,9 @@ package org.apache.tools.ant; +import org.apache.tools.ant.input.DefaultInputHandler; +import org.apache.tools.ant.input.InputHandler; +import org.apache.tools.ant.input.PropertyFileInputHandler; import org.apache.tools.ant.types.*; import java.io.File; @@ -219,6 +222,15 @@ public class ProjectTest extends TestCase { assertEquals(DummyTaskWithNonVoidExecute.class, p.getTaskDefinitions().get("NonVoidExecute")); } + public void testInputHandler() { + InputHandler ih = p.getInputHandler(); + assertNotNull(ih); + assertTrue(ih instanceof DefaultInputHandler); + InputHandler pfih = new PropertyFileInputHandler(); + p.setInputHandler(pfih); + assertSame(pfih, p.getInputHandler()); + } + private class DummyTaskPrivate extends Task { public DummyTaskPrivate() {} public void execute() {}