From 20f7213e03b1e8ce5d3b413ca8d0f704af9be9fa Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 13 Jan 2015 15:49:16 +0100
Subject: [PATCH] generate equals/hashCode: do not show @NotNull step for
 templates without notNull check

---
 .../generation/ui/GenerateEqualsWizard.java   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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 e2f6c1c3b9d4..8c6f8692a279 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
@@ -29,6 +29,7 @@ import com.intellij.openapi.projectRoots.JavaVersionService;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.ComponentWithBrowseButton;
 import com.intellij.openapi.ui.VerticalFlowLayout;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.refactoring.classMembers.AbstractMemberInfoModel;
 import com.intellij.refactoring.classMembers.MemberInfoBase;
@@ -47,6 +48,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.*;
 import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * @author dsl
@@ -236,11 +238,13 @@ public class GenerateEqualsWizard extends AbstractGenerateEqualsWizard<PsiClass,
   @Override
   protected int getNextStep(int step) {
     if (step + 1 == getNonNullStepCode()) {
-      for (MemberInfo classField : myClassFields) {
-        if (classField.isChecked()) {
-          PsiField field = (PsiField)classField.getMember();
-          if (!(field.getType() instanceof PsiPrimitiveType)) {
-            return getNonNullStepCode();
+      if (templateDependsOnFieldsNullability()) {
+        for (MemberInfo classField : myClassFields) {
+          if (classField.isChecked()) {
+            PsiField field = (PsiField)classField.getMember();
+            if (!(field.getType() instanceof PsiPrimitiveType)) {
+              return getNonNullStepCode();
+            }
           }
         }
       }
@@ -250,6 +254,14 @@ public class GenerateEqualsWizard extends AbstractGenerateEqualsWizard<PsiClass,
     return super.getNextStep(step);
   }
 
+  private static boolean templateDependsOnFieldsNullability() {
+    final EqualsHashCodeTemplatesManager templatesManager = EqualsHashCodeTemplatesManager.getInstance();
+    final String notNullCheckPresent = "\\.notNull[^\\w]";
+    final Pattern pattern = Pattern.compile(notNullCheckPresent);
+    return pattern.matcher(templatesManager.getDefaultEqualsTemplate().getTemplate()).find() ||
+           pattern.matcher(templatesManager.getDefaultHashcodeTemplate().getTemplate()).find();
+  }
+
   @Override
   protected void addSteps() {
     if (myEqualsPanel != null) {