MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

typos

Browse Source
This commit is contained in:
Anna Kozlova
2013-09-12 21:49:04 +04:00
parent fbc3d18f9e
commit 1af2b843bd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
+8 -8
View File
@@ -91,7 +91,7 @@ public class SubtypingConstraint implements ConstraintFormula {
for (PsiTypeParameter parameter : SClass.getTypeParameters()) {
final PsiType tSubstituted = tSubstitutor.substitute(parameter);
final PsiType sSubstituted = sSubstitutor.substitute(parameter);
if (tSubstituted != null & sSubstituted != null) {
if (tSubstituted != null && sSubstituted != null) {
constraints.add(new SubtypingConstraint(tSubstituted, sSubstituted, false));
}
}
@@ -111,22 +111,22 @@ public class SubtypingConstraint implements ConstraintFormula {
if (myT.equals(PsiType.NULL)) return false;
} else {
if (myT instanceof PsiWildcardType) {
final PsiType tBbound = ((PsiWildcardType)myT).getBound();
if (tBbound == null) {
final PsiType tBound = ((PsiWildcardType)myT).getBound();
if (tBound == null) {
return true;
}
if (((PsiWildcardType)myT).isExtends()) {
if (tBbound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {
if (tBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {
return true;
}
if (myS instanceof PsiWildcardType) {
final PsiType sBound = ((PsiWildcardType)myS).getBound();
if (sBound != null && ((PsiWildcardType)myS).isExtends()) {
constraints.add(new SubtypingConstraint(tBbound, sBound, true));
constraints.add(new SubtypingConstraint(tBound, sBound, true));
return true;
}
} else {
constraints.add(new SubtypingConstraint(tBbound, myS, true));
constraints.add(new SubtypingConstraint(tBound, myS, true));
return true;
}
return false;
@@ -134,11 +134,11 @@ public class SubtypingConstraint implements ConstraintFormula {
if (myS instanceof PsiWildcardType) {
final PsiType sBound = ((PsiWildcardType)myS).getBound();
if (sBound != null && ((PsiWildcardType)myS).isSuper()) {
constraints.add(new SubtypingConstraint(sBound, tBbound, true));
constraints.add(new SubtypingConstraint(sBound, tBound, true));
return true;
}
} else {
constraints.add(new SubtypingConstraint(myS, tBbound, true));
constraints.add(new SubtypingConstraint(myS, tBound, true));
return true;
}
}