MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

generate equals/hashCode: do not show @NotNull step for templates without notNull check

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-13 16:18:28 +01:00
parent cd2d451fba
commit 20f7213e03
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java
+17 -5
View File
@@ -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) {