From 07196fb289b552bac57c6b566f8214dbbfd5c76a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 Nov 2010 17:21:57 +0300 Subject: [PATCH] Typos --- .../daemon/impl/analysis/HighlightUtil.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 29c0f8f3c505..f399888ce64e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -1731,21 +1731,20 @@ public class HighlightUtil { rTypeParams = psiClass == null ? PsiTypeParameter.EMPTY_ARRAY : psiClass.getTypeParameters(); } - int typeParamColumns = Math.max(lTypeParams.length, rTypeParams.length); - @Language("HTML") @NonNls String requredRow = ""; + @Language("HTML") @NonNls String requiredRow = ""; @Language("HTML") @NonNls String foundRow = ""; for (int i = 0; i < typeParamColumns; i++) { PsiTypeParameter lTypeParameter = i >= lTypeParams.length ? null : lTypeParams[i]; PsiTypeParameter rTypeParameter = i >= rTypeParams.length ? null : rTypeParams[i]; - PsiType lSubstedType = lTypeParameter == null ? null : lTypeSubstitutor.substitute(lTypeParameter); - PsiType rSubstedType = rTypeParameter == null ? null : rTypeSubstitutor.substitute(rTypeParameter); - boolean matches = Comparing.equal(lSubstedType, rSubstedType); + PsiType lSubstitutedType = lTypeParameter == null ? null : lTypeSubstitutor.substitute(lTypeParameter); + PsiType rSubstitutedType = rTypeParameter == null ? null : rTypeSubstitutor.substitute(rTypeParameter); + boolean matches = Comparing.equal(lSubstitutedType, rSubstitutedType); @NonNls String openBrace = i == 0 ? "<" : ""; @NonNls String closeBrace = i == typeParamColumns - 1 ? ">" : ","; - requredRow += "" + (lTypeParams.length == 0 ? "" : openBrace) + redIfNotMatch(lSubstedType, matches) + - (i < lTypeParams.length ? closeBrace : "") + ""; - foundRow += "" + (rTypeParams.length == 0 ? "" : openBrace) + redIfNotMatch(rSubstedType, matches) + + requiredRow += "" + (lTypeParams.length == 0 ? "" : openBrace) + redIfNotMatch(lSubstitutedType, matches) + + (i < lTypeParams.length ? closeBrace : "") + ""; + foundRow += "" + (rTypeParams.length == 0 ? "" : openBrace) + redIfNotMatch(rSubstitutedType, matches) + (i < rTypeParams.length ? closeBrace : "") + ""; } PsiType lRawType = lType1 instanceof PsiClassType ? ((PsiClassType)lType1).rawType() : lType1; @@ -1753,7 +1752,7 @@ public class HighlightUtil { boolean assignable = lRawType == null || rRawType == null || TypeConversionUtil.isAssignable(lRawType, rRawType); String toolTip = JavaErrorMessages.message("incompatible.types.html.tooltip", - redIfNotMatch(lRawType, assignable), requredRow, + redIfNotMatch(lRawType, assignable), requiredRow, redIfNotMatch(rRawType, assignable), foundRow); String description = JavaErrorMessages.message("incompatible.types", formatType(lType1), formatType(rType1));