From 1af2b843bdcbcc290e66c387c2190919e1444e90 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 12 Sep 2013 21:49:04 +0400
Subject: [PATCH] typos

---
 .../constraints/SubtypingConstraint.java         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
index 5e3d4d058c98..eeecd4968bce 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
@@ -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;
           }
         }