Wed, 03 Jun 2015 20:30:08 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu May 28 20:54:40 2015 -0700 1.2 +++ b/.hgtags Wed Jun 03 20:30:08 2015 -0700 1.3 @@ -434,3 +434,4 @@ 1.4 248db113703a917fd38b637d384848a5e458ebcc jdk8u60-b15 1.5 ecb7e46b820f293bb644f92bc1af3ede53bceced jdk8u60-b16 1.6 87dcdc1fd75bf827c8a4596b183de7ea73cb75e1 jdk8u60-b17 1.7 +e7e42c79861ea1ab7495de5f238c01f98035a8a8 jdk8u60-b18
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Thu May 28 20:54:40 2015 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Wed Jun 03 20:30:08 2015 -0700 2.3 @@ -113,7 +113,7 @@ 2.4 Content captionSpan; 2.5 Content span; 2.6 if (type.isDefaultTab()) { 2.7 - captionSpan = HtmlTree.SPAN(new StringContent(type.text())); 2.8 + captionSpan = HtmlTree.SPAN(configuration.getResource(type.resourceKey())); 2.9 span = HtmlTree.SPAN(type.tabId(), 2.10 HtmlStyle.activeTableTab, captionSpan); 2.11 } else { 2.12 @@ -136,7 +136,7 @@ 2.13 */ 2.14 public Content getMethodTypeLinks(MethodTypes methodType) { 2.15 String jsShow = "javascript:show(" + methodType.value() +");"; 2.16 - HtmlTree link = HtmlTree.A(jsShow, new StringContent(methodType.text())); 2.17 + HtmlTree link = HtmlTree.A(jsShow, configuration.getResource(methodType.resourceKey())); 2.18 return link; 2.19 } 2.20
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Thu May 28 20:54:40 2015 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Jun 03 20:30:08 2015 -0700 3.3 @@ -471,10 +471,10 @@ 3.4 for (Map.Entry<String,Integer> entry : typeMap.entrySet()) { 3.5 vars.append(sep); 3.6 sep = ","; 3.7 - vars.append("\""); 3.8 - vars.append(entry.getKey()); 3.9 - vars.append("\":"); 3.10 - vars.append(entry.getValue()); 3.11 + vars.append("\"") 3.12 + .append(entry.getKey()) 3.13 + .append("\":") 3.14 + .append(entry.getValue()); 3.15 } 3.16 vars.append("};").append(DocletConstants.NL); 3.17 sep = ""; 3.18 @@ -482,11 +482,19 @@ 3.19 for (MethodTypes entry : methodTypes) { 3.20 vars.append(sep); 3.21 sep = ","; 3.22 - vars.append(entry.value()).append(":"); 3.23 - vars.append("[").append("\"").append(entry.tabId()); 3.24 - vars.append("\"").append(sep).append("\"").append(entry.text()).append("\"]"); 3.25 + vars.append(entry.value()) 3.26 + .append(":") 3.27 + .append("[") 3.28 + .append("\"") 3.29 + .append(entry.tabId()) 3.30 + .append("\"") 3.31 + .append(sep) 3.32 + .append("\"") 3.33 + .append(configuration.getText(entry.resourceKey())) 3.34 + .append("\"]"); 3.35 } 3.36 - vars.append("};").append(DocletConstants.NL); 3.37 + vars.append("};") 3.38 + .append(DocletConstants.NL); 3.39 addStyles(HtmlStyle.altColor, vars); 3.40 addStyles(HtmlStyle.rowColor, vars); 3.41 addStyles(HtmlStyle.tableTab, vars);
4.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Thu May 28 20:54:40 2015 -0700 4.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Wed Jun 03 20:30:08 2015 -0700 4.3 @@ -150,6 +150,13 @@ 4.4 doclet.Constructors=Constructors 4.5 doclet.methods=methods 4.6 doclet.Methods=Methods 4.7 +doclet.All_Methods=All Methods 4.8 +doclet.Static_Methods=Static Methods 4.9 +doclet.Instance_Methods=Instance Methods 4.10 +doclet.Abstract_Methods=Abstract Methods 4.11 +doclet.Concrete_Methods=Concrete Methods 4.12 +doclet.Default_Methods=Default Methods 4.13 +doclet.Deprecated_Methods=Deprecated Methods 4.14 doclet.annotation_type_optional_members=optional elements 4.15 doclet.Annotation_Type_Optional_Members=Optional Elements 4.16 doclet.annotation_type_required_members=required elements
5.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java Thu May 28 20:54:40 2015 -0700 5.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java Wed Jun 03 20:30:08 2015 -0700 5.3 @@ -1,5 +1,5 @@ 5.4 /* 5.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 5.6 + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. 5.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 * 5.9 * This code is free software; you can redistribute it and/or modify it 5.10 @@ -31,22 +31,22 @@ 5.11 * @author Bhavesh Patel 5.12 */ 5.13 public enum MethodTypes { 5.14 - ALL(0xffff, "All Methods", "t0", true), 5.15 - STATIC(0x1, "Static Methods", "t1", false), 5.16 - INSTANCE(0x2, "Instance Methods", "t2", false), 5.17 - ABSTRACT(0x4, "Abstract Methods", "t3", false), 5.18 - CONCRETE(0x8, "Concrete Methods", "t4", false), 5.19 - DEFAULT(0x10, "Default Methods", "t5", false), 5.20 - DEPRECATED(0x20, "Deprecated Methods", "t6", false); 5.21 + ALL(0xffff, "doclet.All_Methods", "t0", true), 5.22 + STATIC(0x1, "doclet.Static_Methods", "t1", false), 5.23 + INSTANCE(0x2, "doclet.Instance_Methods", "t2", false), 5.24 + ABSTRACT(0x4, "doclet.Abstract_Methods", "t3", false), 5.25 + CONCRETE(0x8, "doclet.Concrete_Methods", "t4", false), 5.26 + DEFAULT(0x10, "doclet.Default_Methods", "t5", false), 5.27 + DEPRECATED(0x20, "doclet.Deprecated_Methods", "t6", false); 5.28 5.29 private final int value; 5.30 - private final String text; 5.31 + private final String resourceKey; 5.32 private final String tabId; 5.33 private final boolean isDefaultTab; 5.34 5.35 - MethodTypes(int v, String t, String id, boolean dt) { 5.36 + MethodTypes(int v, String k, String id, boolean dt) { 5.37 this.value = v; 5.38 - this.text = t; 5.39 + this.resourceKey = k; 5.40 this.tabId = id; 5.41 this.isDefaultTab = dt; 5.42 } 5.43 @@ -55,8 +55,8 @@ 5.44 return value; 5.45 } 5.46 5.47 - public String text() { 5.48 - return text; 5.49 + public String resourceKey() { 5.50 + return resourceKey; 5.51 } 5.52 5.53 public String tabId() {
6.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java Thu May 28 20:54:40 2015 -0700 6.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java Wed Jun 03 20:30:08 2015 -0700 6.3 @@ -315,11 +315,9 @@ 6.4 for (Type aLowerBound : from.getBounds(InferenceBound.LOWER)) { 6.5 for (Type anotherLowerBound : from.getBounds(InferenceBound.LOWER)) { 6.6 if (aLowerBound != anotherLowerBound && 6.7 - commonSuperWithDiffParameterization(aLowerBound, anotherLowerBound)) { 6.8 - /* self comment check if any lower bound may be and undetVar, 6.9 - * in that case the result of this call may be a false positive. 6.10 - * Should this be restricted to non free types? 6.11 - */ 6.12 + !inferenceContext.free(aLowerBound) && 6.13 + !inferenceContext.free(anotherLowerBound) && 6.14 + commonSuperWithDiffParameterization(aLowerBound, anotherLowerBound)) { 6.15 return generateReferenceToTargetConstraint(tree, from, to, 6.16 resultInfo, inferenceContext); 6.17 }
7.1 --- a/src/share/classes/com/sun/tools/jdeps/Analyzer.java Thu May 28 20:54:40 2015 -0700 7.2 +++ b/src/share/classes/com/sun/tools/jdeps/Analyzer.java Wed Jun 03 20:30:08 2015 -0700 7.3 @@ -223,7 +223,7 @@ 7.4 Archive targetArchive = findArchive(t); 7.5 if (filter.accepts(o, archive, t, targetArchive)) { 7.6 addDep(o, t); 7.7 - if (!requires.contains(targetArchive)) { 7.8 + if (archive != targetArchive && !requires.contains(targetArchive)) { 7.9 requires.add(targetArchive); 7.10 } 7.11 }
8.1 --- a/src/share/classes/com/sun/tools/jdeps/JdepsTask.java Thu May 28 20:54:40 2015 -0700 8.2 +++ b/src/share/classes/com/sun/tools/jdeps/JdepsTask.java Wed Jun 03 20:30:08 2015 -0700 8.3 @@ -489,9 +489,11 @@ 8.4 8.5 List<Archive> archives = new ArrayList<>(); 8.6 Deque<String> roots = new LinkedList<>(); 8.7 + List<Path> paths = new ArrayList<>(); 8.8 for (String s : classes) { 8.9 Path p = Paths.get(s); 8.10 if (Files.exists(p)) { 8.11 + paths.add(p); 8.12 archives.add(Archive.getInstance(p)); 8.13 } else { 8.14 if (isValidClassName(s)) { 8.15 @@ -504,7 +506,7 @@ 8.16 sourceLocations.addAll(archives); 8.17 8.18 List<Archive> classpaths = new ArrayList<>(); // for class file lookup 8.19 - classpaths.addAll(getClassPathArchives(options.classpath)); 8.20 + classpaths.addAll(getClassPathArchives(options.classpath, paths)); 8.21 if (options.includePattern != null) { 8.22 archives.addAll(classpaths); 8.23 } 8.24 @@ -545,6 +547,9 @@ 8.25 deque.add(cn); 8.26 } 8.27 a.addClass(d.getOrigin(), d.getTarget()); 8.28 + } else { 8.29 + // ensure that the parsed class is added the archive 8.30 + a.addClass(d.getOrigin()); 8.31 } 8.32 } 8.33 for (String name : a.reader().skippedEntries()) { 8.34 @@ -592,6 +597,9 @@ 8.35 if (!doneClasses.contains(cn) && !deque.contains(cn)) { 8.36 deque.add(cn); 8.37 } 8.38 + } else { 8.39 + // ensure that the parsed class is added the archive 8.40 + a.addClass(d.getOrigin()); 8.41 } 8.42 } 8.43 } 8.44 @@ -743,36 +751,52 @@ 8.45 } 8.46 } 8.47 8.48 - private List<Archive> getClassPathArchives(String paths) throws IOException { 8.49 + /* 8.50 + * Returns the list of Archive specified in cpaths and not included 8.51 + * initialArchives 8.52 + */ 8.53 + private List<Archive> getClassPathArchives(String cpaths, List<Path> initialArchives) 8.54 + throws IOException 8.55 + { 8.56 List<Archive> result = new ArrayList<>(); 8.57 - if (paths.isEmpty()) { 8.58 + if (cpaths.isEmpty()) { 8.59 return result; 8.60 } 8.61 - for (String p : paths.split(File.pathSeparator)) { 8.62 + 8.63 + List<Path> paths = new ArrayList<>(); 8.64 + for (String p : cpaths.split(File.pathSeparator)) { 8.65 if (p.length() > 0) { 8.66 - List<Path> files = new ArrayList<>(); 8.67 // wildcard to parse all JAR files e.g. -classpath dir/* 8.68 int i = p.lastIndexOf(".*"); 8.69 if (i > 0) { 8.70 Path dir = Paths.get(p.substring(0, i)); 8.71 try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "*.jar")) { 8.72 for (Path entry : stream) { 8.73 - files.add(entry); 8.74 + paths.add(entry); 8.75 } 8.76 } 8.77 } else { 8.78 - files.add(Paths.get(p)); 8.79 - } 8.80 - for (Path f : files) { 8.81 - if (Files.exists(f)) { 8.82 - result.add(Archive.getInstance(f)); 8.83 - } 8.84 + paths.add(Paths.get(p)); 8.85 } 8.86 } 8.87 } 8.88 + for (Path p : paths) { 8.89 + if (Files.exists(p) && !hasSameFile(initialArchives, p)) { 8.90 + result.add(Archive.getInstance(p)); 8.91 + } 8.92 + } 8.93 return result; 8.94 } 8.95 8.96 + private boolean hasSameFile(List<Path> paths, Path p2) throws IOException { 8.97 + for (Path p1 : paths) { 8.98 + if (Files.isSameFile(p1, p2)) { 8.99 + return true; 8.100 + } 8.101 + } 8.102 + return false; 8.103 + } 8.104 + 8.105 class RawOutputFormatter implements Analyzer.Visitor { 8.106 private final PrintWriter writer; 8.107 private String pkg = "";
9.1 --- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Thu May 28 20:54:40 2015 -0700 9.2 +++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Wed Jun 03 20:30:08 2015 -0700 9.3 @@ -46,7 +46,7 @@ 9.4 */ 9.5 class PlatformClassPath { 9.6 private static final List<String> NON_PLATFORM_JARFILES = 9.7 - Arrays.asList("alt-rt.jar", "jfxrt.jar", "ant-javafx.jar", "javafx-mx.jar"); 9.8 + Arrays.asList("alt-rt.jar", "ant-javafx.jar", "javafx-mx.jar"); 9.9 private static final List<Archive> javaHomeArchives = init(); 9.10 9.11 static List<Archive> getArchives() { 9.12 @@ -124,6 +124,14 @@ 9.13 */ 9.14 static class JDKArchive extends Archive { 9.15 private static List<String> PROFILE_JARS = Arrays.asList("rt.jar", "jce.jar"); 9.16 + // Workaround: The following packages are not annotated as jdk.Exported 9.17 + private static List<String> EXPORTED_PACKAGES = Arrays.asList( 9.18 + "javax.jnlp", 9.19 + "org.w3c.dom.css", 9.20 + "org.w3c.dom.html", 9.21 + "org.w3c.dom.stylesheets", 9.22 + "org.w3c.dom.xpath" 9.23 + ); 9.24 public static boolean isProfileArchive(Archive archive) { 9.25 if (archive instanceof JDKArchive) { 9.26 return PROFILE_JARS.contains(archive.getName()); 9.27 @@ -155,7 +163,11 @@ 9.28 * Tests if a given package name is exported. 9.29 */ 9.30 public boolean isExportedPackage(String pn) { 9.31 - if (Profile.getProfile(pn) != null || "javax.jnlp".equals(pn)) { 9.32 + if (Profile.getProfile(pn) != null) { 9.33 + return true; 9.34 + } 9.35 + // special case for JavaFX and APIs that are not annotated with @jdk.Exported) 9.36 + if (EXPORTED_PACKAGES.contains(pn) || pn.startsWith("javafx.")) { 9.37 return true; 9.38 } 9.39 return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;
10.1 --- a/test/Makefile Thu May 28 20:54:40 2015 -0700 10.2 +++ b/test/Makefile Wed Jun 03 20:30:08 2015 -0700 10.3 @@ -21,7 +21,6 @@ 10.4 ifeq ($(OSNAME), SunOS) 10.5 SLASH_JAVA = /java 10.6 PLATFORM = solaris 10.7 - JT_PLATFORM = solaris 10.8 ARCH = $(shell uname -p) 10.9 ifeq ($(ARCH), i386) 10.10 ARCH=i586 10.11 @@ -30,7 +29,6 @@ 10.12 ifeq ($(OSNAME), Linux) 10.13 SLASH_JAVA = /java 10.14 PLATFORM = linux 10.15 - JT_PLATFORM = linux 10.16 ARCH = $(shell uname -m) 10.17 ifeq ($(ARCH), i386) 10.18 ARCH=i586 10.19 @@ -38,7 +36,6 @@ 10.20 endif 10.21 ifeq ($(OSNAME), Darwin) 10.22 PLATFORM = bsd 10.23 - JT_PLATFORM = linux 10.24 ARCH = $(shell uname -m) 10.25 ifeq ($(ARCH), i386) 10.26 ARCH=i586 10.27 @@ -55,7 +52,6 @@ 10.28 10.29 ifeq ($(PLATFORM), windows) 10.30 SLASH_JAVA = J: 10.31 - JT_PLATFORM = win32 10.32 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64) 10.33 ARCH=ia64 10.34 else 10.35 @@ -93,8 +89,8 @@ 10.36 else 10.37 JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg 10.38 endif 10.39 -JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg 10.40 -JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff 10.41 +JTREG = $(JTREG_HOME)/bin/jtreg 10.42 +JTDIFF = $(JTREG_HOME)/bin/jtdiff 10.43 10.44 # Default JCK to run 10.45 ifdef JPRT_JCK_HOME
11.1 --- a/test/tools/javac/MethodParameters/LambdaTest.java Thu May 28 20:54:40 2015 -0700 11.2 +++ b/test/tools/javac/MethodParameters/LambdaTest.java Wed Jun 03 20:30:08 2015 -0700 11.3 @@ -1,5 +1,5 @@ 11.4 /* 11.5 - * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. 11.6 + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. 11.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.8 * 11.9 * This code is free software; you can redistribute it and/or modify it
12.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java Thu May 28 20:54:40 2015 -0700 12.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java Wed Jun 03 20:30:08 2015 -0700 12.3 @@ -1,5 +1,5 @@ 12.4 /* 12.5 - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. 12.6 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 12.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.8 * 12.9 * This code is free software; you can redistribute it and/or modify it
13.1 --- a/test/tools/javac/diags/examples/MrefInferAndExplicitParams.java Thu May 28 20:54:40 2015 -0700 13.2 +++ b/test/tools/javac/diags/examples/MrefInferAndExplicitParams.java Wed Jun 03 20:30:08 2015 -0700 13.3 @@ -8,7 +8,7 @@ 13.4 * 13.5 * This code is distributed in the hope that it will be useful, but WITHOUT 13.6 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 13.7 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13.8 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13.9 * version 2 for more details (a copy is included in the LICENSE file that 13.10 * accompanied this code). 13.11 *
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/test/tools/javac/generics/inference/8055963/T8055963.java Wed Jun 03 20:30:08 2015 -0700 14.3 @@ -0,0 +1,41 @@ 14.4 +/* 14.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 14.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 14.7 + * 14.8 + * This code is free software; you can redistribute it and/or modify it 14.9 + * under the terms of the GNU General Public License version 2 only, as 14.10 + * published by the Free Software Foundation. Oracle designates this 14.11 + * particular file as subject to the "Classpath" exception as provided 14.12 + * by Oracle in the LICENSE file that accompanied this code. 14.13 + * 14.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 14.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 14.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 14.17 + * version 2 for more details (a copy is included in the LICENSE file that 14.18 + * accompanied this code). 14.19 + * 14.20 + * You should have received a copy of the GNU General Public License version 14.21 + * 2 along with this work; if not, write to the Free Software Foundation, 14.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 14.23 + * 14.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 14.25 + * or visit www.oracle.com if you need additional information or have any 14.26 + * questions. 14.27 + */ 14.28 + 14.29 +/** 14.30 + * @test 14.31 + * @bug 8055963 14.32 + * @summary Inference failure with nested invocation 14.33 + * @compile T8055963.java 14.34 + */ 14.35 +class T8055963 { 14.36 + 14.37 + static class C<T> {} 14.38 + 14.39 + <T> T choose(T first, T second) { return null; } 14.40 + 14.41 + void test() { 14.42 + C<String> cs = choose(new C<String>(), new C<>()); 14.43 + } 14.44 +}
15.1 --- a/test/tools/javac/lambda/8023389/T8023389.java Thu May 28 20:54:40 2015 -0700 15.2 +++ b/test/tools/javac/lambda/8023389/T8023389.java Wed Jun 03 20:30:08 2015 -0700 15.3 @@ -8,7 +8,7 @@ 15.4 * 15.5 * This code is distributed in the hope that it will be useful, but WITHOUT 15.6 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 15.7 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15.8 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15.9 * version 2 for more details (a copy is included in the LICENSE file that 15.10 * accompanied this code). 15.11 *
16.1 --- a/test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java Thu May 28 20:54:40 2015 -0700 16.2 +++ b/test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java Wed Jun 03 20:30:08 2015 -0700 16.3 @@ -1,5 +1,5 @@ 16.4 /* 16.5 - * Copyright (c) 2012, 2014 Oracle and/or its affiliates. All rights reserved. 16.6 + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. 16.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 16.8 * 16.9 * This code is free software; you can redistribute it and/or modify it
17.1 --- a/test/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java Thu May 28 20:54:40 2015 -0700 17.2 +++ b/test/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java Wed Jun 03 20:30:08 2015 -0700 17.3 @@ -1,5 +1,5 @@ 17.4 /* 17.5 - * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. 17.6 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 17.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 17.8 * 17.9 * This code is free software; you can redistribute it and/or modify it
18.1 --- a/test/tools/jdeps/APIDeps.java Thu May 28 20:54:40 2015 -0700 18.2 +++ b/test/tools/jdeps/APIDeps.java Wed Jun 03 20:30:08 2015 -0700 18.3 @@ -90,8 +90,9 @@ 18.4 new String[] {"-classpath", testDir.getPath(), "-verbose:class", "-filter:none", "-P"}); 18.5 test(new File(mDir, "Gee.class"), 18.6 new String[] {"g.G", "sun.misc.Lock", "com.sun.tools.classfile.ClassFile", 18.7 - "com.sun.management.ThreadMXBean", "com.sun.source.tree.BinaryTree"}, 18.8 - new String[] {testDirBasename, "JDK internal API", "compact3", ""}, 18.9 + "com.sun.management.ThreadMXBean", "com.sun.source.tree.BinaryTree", 18.10 + "org.w3c.dom.css.CSSValue"}, 18.11 + new String[] {testDirBasename, "JDK internal API", "compact2", "compact3", ""}, 18.12 new String[] {"-classpath", testDir.getPath(), "-verbose", "-P"}); 18.13 18.14 // -jdkinternals
19.1 --- a/test/tools/jdeps/Basic.java Thu May 28 20:54:40 2015 -0700 19.2 +++ b/test/tools/jdeps/Basic.java Wed Jun 03 20:30:08 2015 -0700 19.3 @@ -23,9 +23,9 @@ 19.4 19.5 /* 19.6 * @test 19.7 - * @bug 8003562 8005428 8015912 8027481 8048063 19.8 + * @bug 8003562 8005428 8015912 8027481 8048063 8068937 19.9 * @summary Basic tests for jdeps tool 19.10 - * @build Test p.Foo p.Bar javax.activity.NotCompactProfile 19.11 + * @build Test p.Foo p.Bar p.C p.SubClass q.Gee javax.activity.NotCompactProfile 19.12 * @run main Basic 19.13 */ 19.14 19.15 @@ -111,6 +111,19 @@ 19.16 new String[] {"compact1"}, 19.17 new String[] {"-verbose:package", "-e", "java\\.lang\\..*"}); 19.18 19.19 + // parse p.C, p.SubClass and q.* 19.20 + // p.SubClass have no dependency other than p.C 19.21 + // q.Gee depends on p.SubClass that should be found 19.22 + test(testDir, 19.23 + new String[] {"java.lang", "p"}, 19.24 + new String[] {"compact1", testDir.getName()}, 19.25 + new String[] {"-include", "p.C|p.SubClass|q\\..*"}); 19.26 + test(testDir, 19.27 + new String[] {"java.lang", "p"}, 19.28 + new String[] {"compact1", testDir.getName()}, 19.29 + new String[] {"-classpath", testDir.getPath(), "-include", "p.C|p.SubClass|q\\..*"}); 19.30 + 19.31 + 19.32 // test -classpath and -include options 19.33 test(null, 19.34 new String[] {"java.lang", "java.util", "java.lang.management",
20.1 --- a/test/tools/jdeps/m/Gee.java Thu May 28 20:54:40 2015 -0700 20.2 +++ b/test/tools/jdeps/m/Gee.java Wed Jun 03 20:30:08 2015 -0700 20.3 @@ -29,4 +29,5 @@ 20.4 public com.sun.tools.classfile.ClassFile cf; // @jdk.Exported(false) 20.5 public com.sun.source.tree.BinaryTree tree; // @jdk.Exported 20.6 public com.sun.management.ThreadMXBean mxbean; // @jdk.Exported on package-info 20.7 + public org.w3c.dom.css.CSSValue value; // special case 20.8 }
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/test/tools/jdeps/p/C.java Wed Jun 03 20:30:08 2015 -0700 21.3 @@ -0,0 +1,30 @@ 21.4 +/* 21.5 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. 21.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 21.7 + * 21.8 + * This code is free software; you can redistribute it and/or modify it 21.9 + * under the terms of the GNU General Public License version 2 only, as 21.10 + * published by the Free Software Foundation. 21.11 + * 21.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 21.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 21.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 21.15 + * version 2 for more details (a copy is included in the LICENSE file that 21.16 + * accompanied this code). 21.17 + * 21.18 + * You should have received a copy of the GNU General Public License version 21.19 + * 2 along with this work; if not, write to the Free Software Foundation, 21.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 21.21 + * 21.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21.23 + * or visit www.oracle.com if you need additional information or have any 21.24 + * questions. 21.25 + */ 21.26 + 21.27 +package p; 21.28 + 21.29 +public class C { 21.30 + public String name() { 21.31 + return "C"; 21.32 + } 21.33 +}
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/test/tools/jdeps/p/SubClass.java Wed Jun 03 20:30:08 2015 -0700 22.3 @@ -0,0 +1,28 @@ 22.4 +/* 22.5 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. 22.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 22.7 + * 22.8 + * This code is free software; you can redistribute it and/or modify it 22.9 + * under the terms of the GNU General Public License version 2 only, as 22.10 + * published by the Free Software Foundation. 22.11 + * 22.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 22.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 22.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 22.15 + * version 2 for more details (a copy is included in the LICENSE file that 22.16 + * accompanied this code). 22.17 + * 22.18 + * You should have received a copy of the GNU General Public License version 22.19 + * 2 along with this work; if not, write to the Free Software Foundation, 22.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 22.21 + * 22.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22.23 + * or visit www.oracle.com if you need additional information or have any 22.24 + * questions. 22.25 + */ 22.26 + 22.27 +package p; 22.28 + 22.29 +// SubClass only references types in package p 22.30 +public class SubClass extends C { 22.31 +}
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/test/tools/jdeps/q/Gee.java Wed Jun 03 20:30:08 2015 -0700 23.3 @@ -0,0 +1,27 @@ 23.4 +/* 23.5 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. 23.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 23.7 + * 23.8 + * This code is free software; you can redistribute it and/or modify it 23.9 + * under the terms of the GNU General Public License version 2 only, as 23.10 + * published by the Free Software Foundation. 23.11 + * 23.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 23.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 23.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 23.15 + * version 2 for more details (a copy is included in the LICENSE file that 23.16 + * accompanied this code). 23.17 + * 23.18 + * You should have received a copy of the GNU General Public License version 23.19 + * 2 along with this work; if not, write to the Free Software Foundation, 23.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 23.21 + * 23.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 23.23 + * or visit www.oracle.com if you need additional information or have any 23.24 + * questions. 23.25 + */ 23.26 + 23.27 +package q; 23.28 + 23.29 +public class Gee extends p.SubClass { 23.30 +}