hg: jdk/jdk: 8133616: compiler error messages for dup single type, single static import switched

[jan.lahoda at oracle.com]

Changeset: 8b11e4b32db3
Author:    jlahoda
Date:      2017-11-27 19:29 +0100
URL:       http://hg.openjdk.java.net/jdk/jdk/rev/8b11e4b32db3

8133616: compiler error messages for dup single type, single static import switched
Summary: When reporting clashing imports, use the (non-)staticness of the original import to generate the error message.
Reviewed-by: mcimadamore

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! test/langtools/jdk/jshell/ForwardReferenceImportTest.java
! test/langtools/tools/javac/4980495/std/NonStatic2StaticImportClash.java
! test/langtools/tools/javac/4980495/std/Static2NonStaticImportClash.java
! test/langtools/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java