From 114e8b961d76c52345fe98ddcf04230c497d5c97 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Tue, 8 Oct 2002 16:56:06 +0000 Subject: [PATCH] move WeakishReference1.2 to optional, fix copyright, fix string ref to classname git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273419 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/util/WeakishReference.java | 2 +- .../tools/ant/util/WeakishReference12.java | 38 -------- .../ant/util/optional/WeakishReference12.java | 86 +++++++++++++++++++ 3 files changed, 87 insertions(+), 39 deletions(-) delete mode 100644 src/main/org/apache/tools/ant/util/WeakishReference12.java create mode 100644 src/main/org/apache/tools/ant/util/optional/WeakishReference12.java diff --git a/src/main/org/apache/tools/ant/util/WeakishReference.java b/src/main/org/apache/tools/ant/util/WeakishReference.java index b86c6acfe..89203e934 100644 --- a/src/main/org/apache/tools/ant/util/WeakishReference.java +++ b/src/main/org/apache/tools/ant/util/WeakishReference.java @@ -69,7 +69,7 @@ public abstract class WeakishReference { private static Constructor referenceConstructor; - private final static String WEAK_REFERENCE_NAME= "org,apache.tools.ant.util.WeakishReference12"; + private final static String WEAK_REFERENCE_NAME= "org.apache.tools.ant.util.optional.WeakishReference12"; /** * create the appropriate type of reference for the java version diff --git a/src/main/org/apache/tools/ant/util/WeakishReference12.java b/src/main/org/apache/tools/ant/util/WeakishReference12.java deleted file mode 100644 index 50ae10b6f..000000000 --- a/src/main/org/apache/tools/ant/util/WeakishReference12.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * User: slo - * Date: Sep 10, 2002 - * Time: 11:02:16 PM - * Status: Experimental (Do Not Distribute) - * - * (c) Copyright 2002, Hewlett-Packard Company, all rights reserved. - */ - -package org.apache.tools.ant.util; - -import java.lang.ref.WeakReference; - -/** - * - */ -public class WeakishReference12 extends WeakishReference { - - private WeakReference weakref; - - /** - * create a new soft reference, which is bound to a - * Weak reference inside - * @param reference - * @see java.lang.ref.WeakReference - */ - public WeakishReference12(Object reference) { - this.weakref = new WeakReference(reference); - } - - /** - * Returns this reference object's referent. - */ - public Object get() { - return weakref.get(); - } - -} diff --git a/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java b/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java new file mode 100644 index 000000000..ae5722074 --- /dev/null +++ b/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java @@ -0,0 +1,86 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ + +package org.apache.tools.ant.util.optional; + +import org.apache.tools.ant.util.WeakishReference; + +import java.lang.ref.WeakReference; + +/** + * This is a reference that really is is Weak, as it uses the + * appropriate java.lang.ref class. + */ +public class WeakishReference12 extends WeakishReference { + + private WeakReference weakref; + + /** + * create a new soft reference, which is bound to a + * Weak reference inside + * @param reference + * @see java.lang.ref.WeakReference + */ + public WeakishReference12(Object reference) { + this.weakref = new WeakReference(reference); + } + + /** + * Returns this reference object's referent. + */ + public Object get() { + return weakref.get(); + } + +}