--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java 2019-12-20 15:41:06.000000000 +0000 +++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java 2019-12-20 15:41:06.000000000 +0000 @@ -296,7 +296,7 @@ (owner.flags() & STATIC) == 0; } - /** Is class accessible in given evironment? + /** Is class accessible in given environment? * @param env The current environment. * @param c The class whose accessibility is checked. */ @@ -3224,7 +3224,7 @@ @Override ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) { if (boundRes.isSuccess() && !boundRes.hasKind(StaticKind.NON_STATIC)) { - //the first serach has at least one applicable static method + //the first search has at least one applicable static method return boundRes; } else if (unboundRes.isSuccess() && !unboundRes.hasKind(StaticKind.STATIC)) { //the second search has at least one applicable non-static method @@ -4587,7 +4587,7 @@ */ interface DiagnosticRewriter { JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags, - DiagnosticPosition preferedPos, DiagnosticSource preferredSource, + DiagnosticPosition preferredPos, DiagnosticSource preferredSource, DiagnosticType preferredKind, JCDiagnostic d); } @@ -4643,12 +4643,12 @@ @Override public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags, - DiagnosticPosition preferedPos, DiagnosticSource preferredSource, + DiagnosticPosition preferredPos, DiagnosticSource preferredSource, DiagnosticType preferredKind, JCDiagnostic d) { JCDiagnostic cause = (JCDiagnostic)d.getArgs()[causeIndex]; DiagnosticPosition pos = d.getDiagnosticPosition(); if (pos == null) { - pos = preferedPos; + pos = preferredPos; } return diags.create(preferredKind, preferredSource, pos, "prob.found.req", cause);