From 027d1e2c99655af53327eae8474f312f89b448f6 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Fri, 14 Aug 2015 23:00:01 +0200 Subject: [PATCH] Invert conditional expressions that are negated. #1555 Fixes `NegatedConditional` inspection violations. Description: >Reports conditional expressions whose conditions are negated. Flipping the order of the conditional expression branches will usually increase the clarity of such statements. --- .../com/puppycrawl/tools/checkstyle/checks/ClassResolver.java | 2 +- .../puppycrawl/tools/checkstyle/checks/TranslationCheck.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java index 88eb625ad..035ddf760 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java @@ -121,7 +121,7 @@ public class ClassResolver { throws ClassNotFoundException { Class clazz = null; if (!currentClass.isEmpty()) { - final String innerClass = (!pkg.isEmpty() ? pkg + "." : "") + final String innerClass = (pkg.isEmpty() ? "" : pkg + ".") + currentClass + "$" + name; if (isLoadable(innerClass)) { clazz = safeLoad(innerClass); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java index 4dfe6e390..667d081a9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java @@ -134,7 +134,7 @@ public class TranslationCheck final int underscoreIdx = filePath.indexOf(basenameSeparator, baseNameStart); final int dotIdx = filePath.indexOf('.', baseNameStart); - final int cutoffIdx = underscoreIdx != -1 ? underscoreIdx : dotIdx; + final int cutoffIdx = underscoreIdx == -1 ? dotIdx : underscoreIdx; return filePath.substring(0, cutoffIdx); }