# HG changeset patch # User anazarov # Date 1427387944 -3600 # Node ID 872a728c807537400cdd2d89e563d7187b4e1100 # Parent 95a89a2efd896b793e3a358d09577d24ad0344b8 8075610: java.desktop module dependency can be eliminated in tools/javac/generics/inference/5073060/GenericsAndPackages.java Reviewed-by: jjg diff -r 95a89a2efd89 -r 872a728c8075 langtools/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java --- a/langtools/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java Mon Mar 23 09:48:37 2015 +0530 +++ b/langtools/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java Thu Mar 26 17:39:04 2015 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2015, Oracle and/or its affiliates. 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 @@ -23,7 +23,7 @@ /** * @test - * @bug 5073060 + * @bug 5073060 8075610 * @summary Package private members not found for intersection types * @author Bruce Eckel * see http://www.artima.com/forums/flat.jsp?forum=106&thread=136204 @@ -33,7 +33,7 @@ package code; interface HasColor { - java.awt.Color getColor(); + String getColor(); } class Dimension { @@ -44,6 +44,6 @@ T item; ColoredDimension(T item) { this.item = item; } T getItem() { return item; } - java.awt.Color f() { return item.getColor(); } + String f() { return item.getColor(); } int getX() { return item.x; } }