From 9c3d13940e04377f5b49c9fa6726cb3a75996b4e Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 19 Feb 2014 17:53:42 +0400 Subject: [PATCH] Typo fixed in the method name --- .../src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java | 2 +- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 6 +++--- .../lazy/descriptors/LazyTypeParameterDescriptor.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java index 8c95d462c7c..24ecb805df2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java @@ -33,7 +33,7 @@ public class JetTypeConstraint extends JetElementImpl { return visitor.visitTypeConstraint(this, data); } - public boolean isClassObjectContraint() { + public boolean isClassObjectConstraint() { return findChildByType(JetTokens.CLASS_KEYWORD) != null && findChildByType(JetTokens.OBJECT_KEYWORD) != null; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index e24b8d8a163..acc517cf771 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -641,7 +641,7 @@ public class DescriptorResolver { } } for (JetTypeConstraint constraint : declaration.getTypeConstraints()) { - if (constraint.isClassObjectContraint()) { + if (constraint.isClassObjectConstraint()) { trace.report(UNSUPPORTED.on(constraint, "Class objects constraints are not supported yet")); } @@ -656,7 +656,7 @@ public class DescriptorResolver { if (boundTypeReference != null) { bound = typeResolver.resolveType(scope, boundTypeReference, trace, false); deferredUpperBoundCheckerTasks - .add(new UpperBoundCheckerTask(boundTypeReference, bound, constraint.isClassObjectContraint())); + .add(new UpperBoundCheckerTask(boundTypeReference, bound, constraint.isClassObjectConstraint())); } if (typeParameterDescriptor == null) { @@ -673,7 +673,7 @@ public class DescriptorResolver { else { trace.record(BindingContext.REFERENCE_TARGET, subjectTypeParameterName, typeParameterDescriptor); if (bound != null) { - if (constraint.isClassObjectContraint()) { + if (constraint.isClassObjectConstraint()) { typeParameterDescriptor.addClassObjectBound(bound); } else { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index a40f2a42f00..47f2f8ec58e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -83,7 +83,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri if (classOrObject instanceof JetClass) { JetClass jetClass = (JetClass) classOrObject; for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) { - if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue; + if (jetTypeConstraint.isClassObjectConstraint() != forClassObject) continue; JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName(); if (constrainedParameterName != null) {