From 8a74f4fc3e473cce131e8935da62db5e4db06537 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Tue, 22 Nov 2011 13:49:48 +0400 Subject: [PATCH] str.equals("") replaced by str.isEmpty() --- src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java | 2 +- src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java | 2 +- test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index 325cbbdb61f..dcf71736c8b 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -58,7 +58,7 @@ public class ExpressionVisitor extends StatementVisitor { if (tokenType == JavaTokenType.OREQ) secondOp = "or"; if (tokenType == JavaTokenType.GTGTGTEQ) secondOp = "cyclicShiftRight"; - if (!secondOp.equals("")) // if not Kotlin operators + if (!secondOp.isEmpty()) // if not Kotlin operators myResult = new AssignmentExpression( expressionToExpression(expression.getLExpression()), new BinaryExpression( diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java index ac5555b3ec4..26797cd9055 100644 --- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java @@ -47,7 +47,7 @@ public class TypeVisitor extends PsiTypeVisitor { @Override public Type visitClassType(PsiClassType classType) { String classTypeName = createQualifiedName(classType); - if (classTypeName.equals("")) + if (classTypeName.isEmpty()) classTypeName = getClassTypeName(classType); List resolvedClassTypeParams = createRawTypesForResolvedReference(classType); diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java index e391dc3bffc..b67404fa11c 100644 --- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java +++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java @@ -47,7 +47,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase { else if (javaFile.getParent().endsWith("/class")) actual = fileToKotlin(javaCode); else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode); - assert !actual.equals("") : "Specify what is it: file, class, method, statement or expression"; + assert !actual.isEmpty() : "Specify what is it: file, class, method, statement or expression"; final File tmp = new File(kotlinPath + ".tmp"); if (!expected.equals(actual)) writeStringToFile(tmp, actual);