--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties Thu Feb 09 16:30:30 2017 -0800
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties Thu Feb 09 18:58:36 2017 -0800
@@ -845,12 +845,12 @@
/set format verbose action ' update overwrote' overwrote-update \n\
/set format verbose action ' update dropped' dropped-update \n\
\n\
-/set format verbose until ', however, it cannot be instanciated or its methods invoked until' defined-class-primary \n\
+/set format verbose until ', however, it cannot be instantiated or its methods invoked until' defined-class-primary \n\
/set format verbose until ', however, its methods cannot be invoked until' defined-interface-primary \n\
/set format verbose until ', however, it cannot be used until' defined-enum,annotation-primary \n\
/set format verbose until ', however, it cannot be invoked until' defined-method-primary \n\
/set format verbose until ', however, it cannot be referenced until' notdefined-primary \n\
-/set format verbose until ' which cannot be instanciated or its methods invoked until' defined-class-update \n\
+/set format verbose until ' which cannot be instantiated or its methods invoked until' defined-class-update \n\
/set format verbose until ' whose methods cannot be invoked until' defined-interface-update \n\
/set format verbose until ' which cannot be invoked until' defined-method-update \n\
/set format verbose until ' which cannot be referenced until' notdefined-update \n\
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java Thu Feb 09 16:30:30 2017 -0800
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java Thu Feb 09 18:58:36 2017 -0800
@@ -60,7 +60,7 @@
private static final int TAG_CLOSED = 1;
private static final int TAG_EXCEPTION = 2;
- // never instanciated
+ // never instantiated
private Util() {}
/**
--- a/langtools/test/jdk/jshell/ToolSimpleTest.java Thu Feb 09 16:30:30 2017 -0800
+++ b/langtools/test/jdk/jshell/ToolSimpleTest.java Thu Feb 09 18:58:36 2017 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024 8160089 8153897 8167128 8154513 8170015 8170368 8172102 8172103 8165405 8173073 8173848 8174041 8173916 8174028
+ * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024 8160089 8153897 8167128 8154513 8170015 8170368 8172102 8172103 8165405 8173073 8173848 8174041 8173916 8174028 8174262
* @summary Simple jshell tool tests
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
@@ -504,12 +504,12 @@
a -> assertCommand(a, "class C extends NONE { int x; }",
"| created class C, however, it cannot be referenced until class NONE is declared"),
a -> assertCommand(a, "class D { void m() { System.out.println(nada); } }",
- "| created class D, however, it cannot be instanciated or its methods invoked until variable nada is declared"),
+ "| created class D, however, it cannot be instantiated or its methods invoked until variable nada is declared"),
a -> assertCommand(a, "/types",
"| class C\n" +
"| which cannot be referenced until class NONE is declared\n" +
"| class D\n" +
- "| which cannot be instanciated or its methods invoked until variable nada is declared\n")
+ "| which cannot be instantiated or its methods invoked until variable nada is declared\n")
);
}