From e910d5184a5b6dc049bd830acbd60f5d6cfd3dd0 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 20 Jan 2003 12:44:24 +0000
Subject: [PATCH] Properly support containsKey in LazyHashtable.

Fix the wrong semantics of AntTaskTable#contains.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273834 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/Project.java        |  6 +++---
 .../org/apache/tools/ant/util/LazyHashtable.java  | 15 ++++++++++++---
 .../org/apache/tools/ant/ProjectTest.java         | 10 +++++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index bd0b25d6c..b989ee7ae 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2105,8 +2105,8 @@ public class Project {
             return taskClass;
         }
 
-        public boolean contains( Object key ) {
-            return get( key ) != null;
+        public boolean containsKey(Object key) {
+            return get(key) != null;
         }
 
     }
diff --git a/src/main/org/apache/tools/ant/util/LazyHashtable.java b/src/main/org/apache/tools/ant/util/LazyHashtable.java
index 54300b6cb..03cb982ab 100644
--- a/src/main/org/apache/tools/ant/util/LazyHashtable.java
+++ b/src/main/org/apache/tools/ant/util/LazyHashtable.java
@@ -61,6 +61,8 @@ import java.util.Enumeration;
  *
  * All operations that need access to the full list of objects
  * will call initAll() first. Get and put are cheap.
+ *
+ * @since Ant 1.6
  */
 public class LazyHashtable extends Hashtable {
     protected boolean initAllDone=false;
@@ -96,12 +98,19 @@ public class LazyHashtable extends Hashtable {
 
     public boolean contains( Object value ) {
         initAll();
-        return super.contains(value );
+        return super.contains(value);
     }
 
-    public boolean containsValue( Object value ) {
+    public boolean containsKey(Object value) {
         initAll();
-        return super.contains( value );
+        return super.containsKey(value);
+    }
+
+    /**
+     * Delegates to {@link #contains contains}.
+     */
+    public boolean containsValue( Object value ) {
+        return contains(value);
     }
 
     public Enumeration keys() {
diff --git a/src/testcases/org/apache/tools/ant/ProjectTest.java b/src/testcases/org/apache/tools/ant/ProjectTest.java
index 47afe6c18..f2bb776b8 100644
--- a/src/testcases/org/apache/tools/ant/ProjectTest.java
+++ b/src/testcases/org/apache/tools/ant/ProjectTest.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -232,6 +232,14 @@ public class ProjectTest extends TestCase {
         assertSame(pfih, p.getInputHandler());
     }
 
+    public void testTaskDefinitionContainsKey() {
+        assertTrue(p.getTaskDefinitions().containsKey("echo"));
+    }
+
+    public void testTaskDefinitionContains() {
+        assertTrue(p.getTaskDefinitions().contains(org.apache.tools.ant.taskdefs.Echo.class));
+    }
+
     private class DummyTaskPrivate extends Task {
         public DummyTaskPrivate() {}
         public void execute() {}