support non-jetbrains notnull annotations in equals/hashCode generator (IDEA-120036)

This commit is contained in:
peter
2014-01-30 19:03:35 +01:00
parent 7feba9e64c
commit c491893fa6
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.generation.ui;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInsight.generation.GenerateEqualsHelper;
import com.intellij.ide.wizard.StepAdapter;
import com.intellij.openapi.diagnostic.Logger;
@@ -94,7 +95,7 @@ public class GenerateEqualsWizard extends AbstractGenerateEqualsWizard<PsiClass,
myNonNullPanel = new MemberSelectionPanel(CodeInsightBundle.message("generate.equals.hashcode.non.null.fields.chooser.title"), Collections.<MemberInfo>emptyList(), null);
myFieldsToNonNull = createFieldToMemberInfoMap(false);
for (final Map.Entry<PsiMember, MemberInfo> entry : myFieldsToNonNull.entrySet()) {
entry.getValue().setChecked(entry.getKey().getModifierList().findAnnotation(NotNull.class.getName()) != null);
entry.getValue().setChecked(NullableNotNullManager.isNotNull(entry.getKey()));
}
}