jdk-sandbox: comparison langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java

equal deleted inserted replaced

-:c84d0cce090e
+:9c137b83a8b8
 String n;
 while ((n = at.next()) != null) {
 ed.add(n);
 }
 editor = ed.toArray(new String[ed.size()]);
-fluffmsg("jshell.msg.set.editor.set", arg);
+fluffmsg("jshell.msg.set.editor.set", prog);
 return true;
 }
 }
 case "start": {
-String init = readFile(at.next(), "'/set start'");
+String init = readFile(at.next(), "/set start");
 if (init == null) {
 return false;
 } else {
 prefs.put(STARTUP_KEY, init);
 return true;
 }
 List<Snippet> snippets = stream
 .filter(sn -> state.status(sn).isActive && sn instanceof PersistentSnippet)
 .collect(toList());
 if (snippets.isEmpty()) {
-errormsg("jshell.err.drop.active");
+errormsg("jshell.err.drop.not.active");
 return false;
 }
 if (snippets.size() > 1) {
 errormsg("jshell.err.drop.ambiguous");
 fluffmsg("jshell.msg.use.one.of", snippets.stream()
 });
 return true;
 }
 private boolean cmdOpen(String filename) {
-return runFile(filename, "'/open'");
+return runFile(filename, "/open");
 }
 private boolean runFile(String filename, String context) {
 if (!filename.isEmpty()) {
 try {
 byte[] encoded = Files.readAllBytes(Paths.get(filename));
 return new String(encoded);
 } catch (AccessDeniedException e) {
 errormsg("jshell.err.file.not.accessible", context, filename, e.getMessage());
 } catch (NoSuchFileException e) {
-errormsg("jshell.err.file.not.found", context, filename, e.getMessage());
+errormsg("jshell.err.file.not.found", context, filename);
 } catch (Exception e) {
 errormsg("jshell.err.file.exception", context, filename, e);
 }
 } else {
 errormsg("jshell.err.file.filename", context);

changeset 37389	9c137b83a8b8
parent 37007	6023a9a9d58a
child 37745	4b6b59f8e327