diff -r 7693aa00e131 -r f0c186d76c8a langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java Wed Jul 05 21:49:00 2017 +0200 +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java Wed Jun 08 00:32:31 2016 -0700 @@ -82,7 +82,7 @@ Snippet getSnippet(int ki) { Snippet sn = getSnippetDeadOrAlive(ki); - return (sn != null && !sn.status().isActive) + return (sn != null && !sn.status().isActive()) ? null : sn; } @@ -102,7 +102,7 @@ StringBuilder sb = new StringBuilder(); sb.append("package ").append(REPL_PACKAGE).append(";\n"); for (Snippet si : keyIndexToSnippet) { - if (si != null && si.status().isDefined && (except == null || !except.contains(si.key()))) { + if (si != null && si.status().isDefined() && (except == null || !except.contains(si.key()))) { sb.append(si.importLine(state)); } } @@ -114,7 +114,7 @@ } List getDependents(Snippet snip) { - if (!snip.kind().isPersistent) { + if (!snip.kind().isPersistent()) { return Collections.emptyList(); } Set depset; @@ -190,6 +190,6 @@ private Stream importSnippets() { return state.keyMap.importKeys() .map(key -> (ImportSnippet)getSnippet(key)) - .filter(sn -> sn != null && state.status(sn).isDefined); + .filter(sn -> sn != null && state.status(sn).isDefined()); } }