From 6576eb8ce3e68de9b2ea00d5f5cdc4d79a922783 Mon Sep 17 00:00:00 2001 From: Santeri Hiltunen Date: Thu, 31 Jan 2013 14:58:34 +0200 Subject: [PATCH] Fixed compiler warnings Removed unnecessary !! operations, ?. calls and "out" declarations. --- src/org/jetbrains/jet/j2k/Converter.kt | 32 +++++++++---------- .../jetbrains/jet/j2k/ast/AnonymousClass.kt | 10 +++--- .../jet/j2k/ast/ArrayInitializerExpression.kt | 4 +-- .../jet/j2k/ast/NewClassExpression.kt | 4 +-- .../jetbrains/jet/j2k/ast/types/ClassType.kt | 2 +- .../jet/j2k/visitors/ElementVisitor.kt | 4 +-- .../jet/j2k/visitors/ExpressionVisitor.kt | 24 +++++++------- ...ressionVisitorForDirectObjectInheritors.kt | 2 +- .../jet/j2k/visitors/StatementVisitor.kt | 4 +-- .../jetbrains/jet/j2k/visitors/TypeVisitor.kt | 10 +++--- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt index df0f8d1959d..030bf5c970b 100644 --- a/src/org/jetbrains/jet/j2k/Converter.kt +++ b/src/org/jetbrains/jet/j2k/Converter.kt @@ -60,7 +60,7 @@ public open class Converter() { } public open fun getClassIdentifiers(): Set { - return Collections.unmodifiableSet(classIdentifiers)!! + return Collections.unmodifiableSet(classIdentifiers) } public open fun getMethodReturnType(): PsiType? { @@ -88,11 +88,11 @@ public open class Converter() { } public open fun fileToFile(javaFile: PsiJavaFile): File { - return fileToFile(javaFile, Collections.emptyList()!!) + return fileToFile(javaFile, Collections.emptyList()) } public open fun fileToFileWithCompatibilityImport(javaFile: PsiJavaFile): File { - return fileToFile(javaFile, Collections.singletonList("kotlin.compatibility.*")!!) + return fileToFile(javaFile, Collections.singletonList("kotlin.compatibility.*")) } private fun fileToFile(javaFile: PsiJavaFile, additionalImports: List): File { @@ -218,20 +218,20 @@ public open class Converter() { } } } - members.add(Constructor(Identifier.EMPTY_IDENTIFIER, arrayList(), Collections.emptySet()!!, - ClassType(name, Collections.emptyList()!!, false), - Collections.emptyList()!!, + members.add(Constructor(Identifier.EMPTY_IDENTIFIER, arrayList(), Collections.emptySet(), + ClassType(name, Collections.emptyList(), false), + Collections.emptyList(), ParameterList(createParametersFromFields(finalOrWithEmptyInitializer)), Block(createInitStatementsFromFields(finalOrWithEmptyInitializer)), true)) } if (psiClass.isInterface()) { - return Trait(this, name, docComments, modifiers, typeParameters, extendsTypes, Collections.emptyList()!!, implementsTypes, members) + return Trait(this, name, docComments, modifiers, typeParameters, extendsTypes, Collections.emptyList(), implementsTypes, members) } if (psiClass.isEnum()) { - return Enum(this, name, docComments, modifiers, typeParameters, Collections.emptyList()!!, Collections.emptyList()!!, implementsTypes, members) + return Enum(this, name, docComments, modifiers, typeParameters, Collections.emptyList(), Collections.emptyList(), implementsTypes, members) } return Class(this, name, docComments, modifiers, typeParameters, extendsTypes, baseClassParams, implementsTypes, members) @@ -242,7 +242,7 @@ public open class Converter() { } private fun fieldsToFieldList(fields: Array, psiClass: PsiClass): List { - return fields.map { fieldToField(it!!, psiClass) } + return fields.map { fieldToField(it, psiClass) } } private fun fieldToField(field: PsiField, psiClass: PsiClass?): Field { @@ -452,7 +452,7 @@ public open class Converter() { } public open fun parametersToParameterList(parameters: Array): List { - return parameters.map { parameterToParameter(it!!) } + return parameters.map { parameterToParameter(it) } } public open fun parameterToParameter(parameter: PsiParameter, forceNotNull: Boolean = false): Parameter { @@ -534,7 +534,7 @@ public open class Converter() { return packageName.split("\\.").map { Identifier(it).toKotlin() }.makeString(".") } - private fun getFinalOrWithEmptyInitializer(fields: List): List { + private fun getFinalOrWithEmptyInitializer(fields: List): List { val result = ArrayList() for (f : Field in fields) if (f.isVal() || f.initializer.toKotlin().isEmpty()) { @@ -548,7 +548,7 @@ public open class Converter() { return fields.map { Parameter(Identifier("_" + it.identifier.name), it.`type`, true) } } - private fun createInitStatementsFromFields(fields: List): List { + private fun createInitStatementsFromFields(fields: List): List { val result = ArrayList() for (f : Field in fields) { val identifierToKotlin: String? = f.identifier.toKotlin() @@ -644,7 +644,7 @@ public open class Converter() { } private fun isInheritFromObject(method: PsiMethod): Boolean { - var superSignatures: List = method.getHierarchicalMethodSignature().getSuperSignatures()!! + var superSignatures: List = method.getHierarchicalMethodSignature().getSuperSignatures() for (s : HierarchicalMethodSignature? in superSignatures) { var containingClass: PsiClass? = s?.getMethod()?.getContainingClass() var qualifiedName: String? = (if (containingClass != null) @@ -819,7 +819,7 @@ public fun isMainMethod(method: PsiMethod?): Boolean { if (parameters?.size!! != 1) return false - val `type`: PsiType? = parameters!![0]?.getType() + val `type`: PsiType? = parameters!![0].getType() if (`type` !is PsiArrayType) return false @@ -833,7 +833,7 @@ public fun countWritingAccesses(element: PsiElement?, container: PsiElement?): I val visitor: ReferenceCollector = ReferenceCollector() container.accept(visitor) for (e : PsiReferenceExpression in visitor.getCollectedReferences()) - if (e?.isReferenceTo(element)!! && PsiUtil.isAccessedForWriting(e)) { + if (e.isReferenceTo(element) && PsiUtil.isAccessedForWriting(e)) { counter++ } } @@ -864,7 +864,7 @@ public fun isAnnotatedAsNotNull(modifierList: PsiModifierList?): Boolean { if (modifierList != null) { val annotations: Array = modifierList.getAnnotations() for (a : PsiAnnotation in annotations) { - val qualifiedName: String? = a?.getQualifiedName() + val qualifiedName: String? = a.getQualifiedName() if (qualifiedName != null && Converter.NOT_NULL_ANNOTATIONS.contains(qualifiedName)) { return true } diff --git a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt b/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt index 9c204f5961e..7ea399dab6c 100644 --- a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt +++ b/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt @@ -8,10 +8,10 @@ public open class AnonymousClass(converter : Converter, members : List) : Class(converter, Identifier("anonClass"), arrayList(), - Collections.emptySet()!!, - Collections.emptyList()!!, - Collections.emptyList()!!, - Collections.emptyList()!!, - Collections.emptyList()!!, members) { + Collections.emptySet(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), + Collections.emptyList(), members) { public override fun toKotlin() = bodyToKotlin() } diff --git a/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt b/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt index bf3e9199fe5..1150854ad05 100644 --- a/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt @@ -48,10 +48,10 @@ public open class ArrayInitializerExpression(val `type` : Type, val initializers class object { private open fun getConversion(afterReplace : String) : String { - if (afterReplace.contains("double")!!) + if (afterReplace.contains("double")) return "." + OperatorConventions.DOUBLE + "()" - if (afterReplace.contains("float")!!) + if (afterReplace.contains("float")) return "." + OperatorConventions.FLOAT + "()" return "" diff --git a/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt b/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt index ff6102ad076..5a8bfa7029a 100644 --- a/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt @@ -7,11 +7,11 @@ public open class NewClassExpression(val name: Element, val qualifier: Expression = Expression.EMPTY_EXPRESSION, val anonymousClass: AnonymousClass? = null): Expression() { public override fun toKotlin(): String { - val callOperator: String? = (if (qualifier.isNullable()!!) + val callOperator: String? = (if (qualifier.isNullable()) "?." else ".") - val qualifier: String? = (if (qualifier.isEmpty()!!) + val qualifier: String? = (if (qualifier.isEmpty()) "" else qualifier.toKotlin() + callOperator) diff --git a/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt b/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt index 7c4c0660954..832b634bf3d 100644 --- a/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt +++ b/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt @@ -5,7 +5,7 @@ import org.jetbrains.jet.j2k.ast.Identifier import java.util.Collections import java.util.ArrayList -public open class ClassType(val `type` : Identifier, val parameters : List, nullable : Boolean) : Type(nullable) { +public open class ClassType(val `type` : Identifier, val parameters : List, nullable : Boolean) : Type(nullable) { public override fun toKotlin() : String { // TODO change to map() when KT-2051 is fixed val parametersToKotlin = ArrayList() diff --git a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt index fa102009ec7..b6206433bf4 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt @@ -41,7 +41,7 @@ public open class ElementVisitor(val myConverter : Converter) : JavaElementVisit myResult = ReferenceElement(Identifier(theReference.getReferenceName()!!), types) } else { - var result : String = Identifier(reference?.getReferenceName()!!).toKotlin() + var result : String = Identifier(reference.getReferenceName()!!).toKotlin() var qualifier : PsiElement? = theReference.getQualifier() while (qualifier != null) { @@ -59,7 +59,7 @@ public open class ElementVisitor(val myConverter : Converter) : JavaElementVisit public override fun visitTypeParameter(classParameter : PsiTypeParameter?) : Unit { myResult = TypeParameter(Identifier(classParameter!!.getName()!!), - classParameter!!.getExtendsListTypes().map { myConverter.typeToType(it) } ) + classParameter.getExtendsListTypes().map { myConverter.typeToType(it) } ) } public override fun visitParameterList(list : PsiParameterList?) : Unit { diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt index bc4f545b1f1..1c69ae4dbb8 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt @@ -167,7 +167,7 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv { return NewClassExpression(getConverter().elementToElement(classReference), getConverter().argumentsToExpressionList(expression!!), - getConverter().expressionToExpression(expression?.getQualifier()), + getConverter().expressionToExpression(expression.getQualifier()), (if (anonymousClass != null) getConverter().anonymousClassToAnonymousClass(anonymousClass) else @@ -178,7 +178,7 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv val typeParameters: List = (if (reference != null) getConverter().typesToTypeList(reference.getTypeParameters()) else - Collections.emptyList()!!) + Collections.emptyList()) return CallChainExpression(Identifier(constructor.getName(), false), MethodCallExpression(Identifier("init"), getConverter().expressionsToExpressionList(arguments), typeParameters, false)) } @@ -199,7 +199,7 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv public override fun visitPostfixExpression(expression: PsiPostfixExpression?): Unit { myResult = PostfixOperator(getOperatorString(expression!!.getOperationSign().getTokenType()!!), - getConverter().expressionToExpression(expression?.getOperand())) + getConverter().expressionToExpression(expression.getOperand())) } public override fun visitPrefixExpression(expression: PsiPrefixExpression?): Unit { @@ -214,16 +214,16 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv } public override fun visitReferenceExpression(expression: PsiReferenceExpression?): Unit { - val isFieldReference: Boolean = isFieldReference(expression!!, getContainingClass(expression!!)) - val insideSecondaryConstructor: Boolean = isInsideSecondaryConstructor(expression!!) + val isFieldReference: Boolean = isFieldReference(expression!!, getContainingClass(expression)) + val insideSecondaryConstructor: Boolean = isInsideSecondaryConstructor(expression) val hasReceiver: Boolean = isFieldReference && insideSecondaryConstructor - val isThis: Boolean = isThisExpression(expression!!) - val isNullable: Boolean = getConverter().typeToType(expression?.getType()).nullable - val className: String = getClassNameWithConstructor(expression!!) - val referencedName = expression?.getReferenceName()!! + val isThis: Boolean = isThisExpression(expression) + val isNullable: Boolean = getConverter().typeToType(expression.getType()).nullable + val className: String = getClassNameWithConstructor(expression) + val referencedName = expression.getReferenceName()!! var identifier: Expression = Identifier(referencedName, isNullable) val __: String = "__" - val qualifier = expression?.getQualifierExpression() + val qualifier = expression.getQualifierExpression() if (hasReceiver){ identifier = CallChainExpression(Identifier(__, false), Identifier(referencedName, isNullable)) } @@ -234,11 +234,11 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv identifier = Identifier("size", isNullable) } else if (qualifier == null) { - val resolved = expression?.getReference()?.resolve() + val resolved = expression.getReference()?.resolve() if (resolved is PsiMember && resolved.hasModifierProperty(PsiModifier.STATIC) && resolved.getContainingClass() != null && PsiTreeUtil.getParentOfType(expression, javaClass()) != resolved.getContainingClass() && - !isStaticallyImported(resolved, expression!!)) { + !isStaticallyImported(resolved, expression)) { var member = resolved as PsiMember var result = Identifier(referencedName).toKotlin() while(member.getContainingClass() != null) { diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt index 4632b09d29c..5c5ac65c16a 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt @@ -18,7 +18,7 @@ public open class ExpressionVisitorForDirectObjectInheritors(converter: Converte } else if (superMethodInvocation(methodExpression, "toString")) { myResult = DummyStringExpression(java.lang.String.format("getJavaClass<%s>.getName() + '@' + Integer.toHexString(hashCode())", - ExpressionVisitor.getClassName(methodExpression))!!) + ExpressionVisitor.getClassName(methodExpression))) } else { convertMethodCallExpression(expression!!) diff --git a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt index 625e6357c6b..0badd203e8c 100644 --- a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt @@ -83,7 +83,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert null) if (initialization is PsiDeclarationStatement && initialization.getFirstChild() == initialization.getLastChild() && condition != null && update != null && update.getChildren().size == 1 && - (isPlusPlusExpression(update.getChildren()[0]!!)) && (operationTokenType == JavaTokenType.LT || operationTokenType == JavaTokenType.LE) && + (isPlusPlusExpression(update.getChildren()[0])) && (operationTokenType == JavaTokenType.LT || operationTokenType == JavaTokenType.LE) && initialization.getFirstChild() != null && (initialization.getFirstChild() is PsiLocalVariable) && firstChild != null && firstChild.getNameIdentifier() != null && onceWritableIterator) { val end: Expression = getConverter().expressionToExpression((condition as PsiBinaryExpression).getROperand()) @@ -188,7 +188,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert val catchBlocks = statement?.getCatchBlocks()!! val catchBlockParameters = statement?.getCatchBlockParameters()!! for (i in 0..catchBlocks.size - 1) { - catches.add(CatchStatement(getConverter().parameterToParameter(catchBlockParameters[i]!!, true), + catches.add(CatchStatement(getConverter().parameterToParameter(catchBlockParameters[i], true), getConverter().blockToBlock(catchBlocks[i], true))) } myResult = TryStatement(getConverter().blockToBlock(statement?.getTryBlock(), true), diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt index 3d94c4363f3..4fef50dd598 100644 --- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt @@ -86,8 +86,8 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi for (p : PsiTypeParameter? in (resolve as PsiClass).getTypeParameters()) { val superTypes = p!!.getSuperTypes() val boundType : Type = (if (superTypes.size > 0) - ClassType(Identifier(getClassTypeName(superTypes[0]!!)), - myConverter.typesToTypeList(superTypes[0]!!.getParameters()), + ClassType(Identifier(getClassTypeName(superTypes[0])), + myConverter.typesToTypeList(superTypes[0].getParameters()), true) else StarProjectionType()) @@ -101,11 +101,11 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi public override fun visitWildcardType(wildcardType : PsiWildcardType?) : Type { if (wildcardType!!.isExtends()) { - myResult = OutProjectionType(myConverter.typeToType(wildcardType!!.getExtendsBound())) + myResult = OutProjectionType(myConverter.typeToType(wildcardType.getExtendsBound())) } else - if (wildcardType!!.isSuper()) { - myResult = InProjectionType(myConverter.typeToType(wildcardType?.getSuperBound())) + if (wildcardType.isSuper()) { + myResult = InProjectionType(myConverter.typeToType(wildcardType.getSuperBound())) } else { myResult = StarProjectionType()