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

fix equals templates (IDEA-141700)

Browse Source
This commit is contained in:
Anna Kozlova
2015-06-23 12:05:19 +03:00
parent cb16764a48
commit 715ae734a2
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/equalsHelper.vm
+10
View File
@@ -47,3 +47,13 @@ if(this == $paramName) return true;
Float.compare(${classInstanceName}.$field.accessor, $field.accessor) != 0 ##
#end
#end
#macro(addPrimitiveFieldComparisonConditionDirect $field)
$field.accessor == ${classInstanceName}.$field.accessor ##
#end
#macro(addDoubleFieldComparisonConditionDirect $field)
#if ($field.double)
Double.compare(${classInstanceName}.$field.accessor, $field.accessor) == 0 ##
#else
Float.compare(${classInstanceName}.$field.accessor, $field.accessor) == 0 ##
#end
#end
java/java-impl/src/com/intellij/codeInsight/generation/guavaEquals.vm
+3 -3
View File
@@ -15,12 +15,12 @@ Object $paramName){
#set($i = $i + 1)
#if ($field.primitive)
#if ($field.double || $field.float)
#addDoubleFieldComparisonCondition($field) ##
#addDoubleFieldComparisonConditionDirect($field) ##
#else
#addPrimitiveFieldComparisonCondition($field) ##
#addPrimitiveFieldComparisonConditionDirect($field) ##
#end
#elseif ($field.enum)
#addPrimitiveFieldComparisonCondition($field) ##
#addPrimitiveFieldComparisonConditionDirect($field) ##
#else
com.google.common.base.Objects.equal($field.accessor, ${classInstanceName}.$field.accessor)##
#end
java/java-impl/src/com/intellij/codeInsight/generation/objectsEquals.vm
+3 -3
View File
@@ -15,12 +15,12 @@ Object $paramName){
#set($i = $i + 1)
#if ($field.primitive)
#if ($field.double || $field.float)
#addDoubleFieldComparisonCondition($field) ##
#addDoubleFieldComparisonConditionDirect($field) ##
#else
#addPrimitiveFieldComparisonCondition($field) ##
#addPrimitiveFieldComparisonConditionDirect($field) ##
#end
#elseif ($field.enum)
#addPrimitiveFieldComparisonCondition($field) ##
#addPrimitiveFieldComparisonConditionDirect($field) ##
#elseif ($field.array)
java.util.Arrays.equals($field.accessor, ${classInstanceName}.$field.accessor)##
#else
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesSuperEqualsAndHashCodeGuava.java
+6 -6
View File
@@ -34,12 +34,12 @@ class A extends B {
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
final A a = (A) o;
return a7 != a.a7 &&
a8 != a.a8 &&
a9 != a.a9 &&
a10 != a.a10 &&
Float.compare(a.a11, a11) != 0 &&
Double.compare(a.a12, a12) != 0 &&
return a7 == a.a7 &&
a8 == a.a8 &&
a9 == a.a9 &&
a10 == a.a10 &&
Float.compare(a.a11, a11) == 0 &&
Double.compare(a.a12, a12) == 0 &&
com.google.common.base.Objects.equal(a1, a.a1) &&
com.google.common.base.Objects.equal(a2, a.a2) &&
com.google.common.base.Objects.equal(a3, a.a3) &&