summaryrefslogtreecommitdiff
path: root/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java')
-rw-r--r--plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java
index 7760b9377942..8a71995910f1 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java
@@ -180,10 +180,7 @@ public class UnnecessaryExplicitNumericCastInspection extends BaseInspection {
else if (parent instanceof PsiAssignmentExpression) {
final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent;
final PsiType lhsType = assignmentExpression.getType();
- if (!castType.equals(lhsType)) {
- return true;
- }
- return !isLegalAssignmentConversion(operand, lhsType);
+ return !castType.equals(lhsType) || !isLegalAssignmentConversion(operand, lhsType);
}
else if (parent instanceof PsiVariable) {
final PsiVariable variable = (PsiVariable)parent;
@@ -235,12 +232,9 @@ public class UnnecessaryExplicitNumericCastInspection extends BaseInspection {
if (targetMethod != newMethodCall.resolveMethod()) {
return true;
}
- return false;
- }
- else {
- final PsiType expectedType = ExpectedTypeUtils.findExpectedType(expression, false);
- return !castType.equals(expectedType) || !isLegalWideningConversion(operand, castType);
}
+ final PsiType expectedType = ExpectedTypeUtils.findExpectedType(expression, false);
+ return !castType.equals(expectedType) || !isLegalWideningConversion(operand, castType);
}
static boolean isLegalWideningConversion(PsiExpression expression, PsiType requiredType) {