From c491893fa69a8fb4cb85e2304a1681e99485639a Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 30 Jan 2014 13:42:22 +0100 Subject: [PATCH] support non-jetbrains notnull annotations in equals/hashCode generator (IDEA-120036) --- .../codeInsight/generation/ui/GenerateEqualsWizard.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java index c051e3a2aa1c..035a469e500c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java @@ -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 AbstractGenerateEqualsWizardemptyList(), null); myFieldsToNonNull = createFieldToMemberInfoMap(false); for (final Map.Entry entry : myFieldsToNonNull.entrySet()) { - entry.getValue().setChecked(entry.getKey().getModifierList().findAnnotation(NotNull.class.getName()) != null); + entry.getValue().setChecked(NullableNotNullManager.isNotNull(entry.getKey())); } }