diff -r 000000000000 -r 9a66ca7c79fa test/tools/javac/generics/inference/6365166/NewTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/inference/6365166/NewTest.java Sat Dec 01 00:00:00 2007 +0000 @@ -0,0 +1,76 @@ +/* + * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * @test + * @bug 6365166 + * @summary javac (generic) unable to resolve methods + * @ignore waiting for 6365166 + * @compile NewTest.java + */ + +import java.util.*; + +public class NewTest { + private List toAdd; + + public NewTest(List toAdd) { + this.toAdd = toAdd; + } + + private List getRelated(B b) { + //some application logic + //for demo + return toAdd; + } + + @SuppressWarnings("unchecked") + public ,LF extends Factory> L addOrCreate4(B b,L l,LF lf) { + if (l == null) { + l = lf.create(); + } + ((List)l).addAll(getRelated(b)); //to get round the compiler bug + return l; + } + + public static class ListFactory implements Factory>{ + public List create() { + return new ArrayList(); + } + } + public static interface Factory { + public T create(); + } + + public static void main(String ... args) { + ListFactory lf = new ListFactory(); + List longs = new ArrayList(); + longs.add(new Long(1)); + NewTest test = new NewTest(longs); + + List ret4 = null; + + ret4 = test.addOrCreate4(1, ret4,lf); + + } +}