From 78114bd9880239cd0a35704a993e6279d62bf6a7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 21 Feb 2017 11:25:28 +0100 Subject: [PATCH] Cleanup (warnings; formatting) --- .../codeInsight/daemon/impl/quickfix/ModifierFix.java | 4 ++-- resources-en/src/messages/QuickFixBundle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java index 4bc99f22510e..8be71367f862 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ public class ModifierFix extends LocalQuickFixAndIntentionActionOnPsiElement { private String format(PsiVariable variable, PsiModifierList modifierList) { String name = null; - PsiElement parent = variable == null ? modifierList == null ? null : modifierList.getParent() : variable; + PsiElement parent = variable != null ? variable : modifierList != null ? modifierList.getParent() : null; if (parent instanceof PsiClass) { name = ((PsiClass)parent).getName(); } diff --git a/resources-en/src/messages/QuickFixBundle.properties b/resources-en/src/messages/QuickFixBundle.properties index 2ffbf4a3ae36..b99e387599a3 100644 --- a/resources-en/src/messages/QuickFixBundle.properties +++ b/resources-en/src/messages/QuickFixBundle.properties @@ -124,7 +124,7 @@ fix.return.type.text=Make ''{0}'' return ''{1}'' fix.throws.list.family=Fix Throws List fix.throws.list.add.exception=Add ''{0}'' to ''{1}'' throws list fix.throws.list.remove.exception=Remove ''{0}'' from ''{1}'' throws list -fix.modifiers.family=Fix Modifiers +fix.modifiers.family=Fix modifiers anonymous.class.presentation=Anonymous class derived from {0} # {0} owner class name