infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-28 11:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

8216404: Elements.getPackageOf should handle modules

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Joe Darcy 2019-01-10 10:34:30 -08:00
parent bd20c24872
commit f68fd6a1c2
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java.compiler/share/classes/javax/lang/model/util/Elements.java
View File

@ -451,6 +451,7 @@ public interface Elements {
/**
* Returns the package of an element. The package of a package is
* itself.
* The package of a module is {@code null}.
*
* @param type the element being examined
* @return the package of an element

7
src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2019, 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
@ -436,7 +436,10 @@ public class JavacElements implements Elements {
@DefinedBy(Api.LANGUAGE_MODEL)
public PackageElement getPackageOf(Element e) {
return cast(Symbol.class, e).packge();
if (e.getKind() == ElementKind.MODULE)
return null;
else
return cast(Symbol.class, e).packge();
}
@DefinedBy(Api.LANGUAGE_MODEL)

9
test/langtools/tools/javac/processing/model/util/elements/TestGetPackageOf.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2019, 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 6453386
* @bug 6453386 8216404
* @summary Test Elements.getPackageOf
* @author Joseph D. Darcy
* @library /tools/javac/lib
@ -56,6 +56,7 @@ public class TestGetPackageOf extends JavacTestingAbstractProcessor {
TypeElement stringElt = eltUtils.getTypeElement("java.lang.String");
PackageElement javaLangPkg = eltUtils.getPackageElement("java.lang");
PackageElement unnamedPkg = eltUtils.getPackageElement("");
ModuleElement moduleElt = eltUtils.getModuleElement("java.base");
PackageElement pkg = null;
if (!javaLangPkg.equals(pkg=eltUtils.getPackageOf(stringElt) ) )
@ -66,6 +67,10 @@ public class TestGetPackageOf extends JavacTestingAbstractProcessor {
if (!unnamedPkg.equals(pkg=eltUtils.getPackageOf(unnamedPkg) ) )
throw new RuntimeException("Unexpected package for unnamed pkg: " + pkg);
if (eltUtils.getPackageOf(moduleElt) != null)
throw new RuntimeException("Unexpected package for module" +
moduleElt.getSimpleName());
}
return true;
}