hg: kulla/dev/langtools: Flatten Key subinterfaces as nested interfaces of Key rather than of grouping subinterfaces. Add PersistentKey grouping that includes ImportKey and all DeclarationKey. Switch the flag on Key.Kind to align with that.

[robert.field at oracle.com]

Changeset: b3baf971bb25
Author:    rfield
Date:      2015-04-27 18:53 -0700
URL:       http://hg.openjdk.java.net/kulla/dev/langtools/rev/b3baf971bb25

Flatten Key subinterfaces as nested interfaces of Key rather than of grouping subinterfaces. Add PersistentKey grouping that includes ImportKey and all DeclarationKey.  Switch the flag on Key.Kind to align with that.

! src/jdk.jshell/share/classes/jdk/internal/jshell/impl/JDIExecution.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/impl/JShellStateImpl.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/impl/SnippetImpl.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/impl/SnippetMaps.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/impl/UnresolvedExceptionImpl.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
! src/jdk.jshell/share/classes/jdk/jshell/JShellState.java
! src/jdk.jshell/share/classes/jdk/jshell/Key.java
! src/jdk.jshell/share/classes/jdk/jshell/UnresolvedException.java
! test/jdk/jshell/ClassesTest.java
! test/jdk/jshell/KullaTesting.java
! test/jdk/jshell/SimpleRegressionTest.java
! test/jdk/jshell/TypeNameTest.java
! test/jdk/jshell/VariablesTest.java