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

equals/hashCode templates: simplify guava/java 7 corresponding to arrays (IDEA-135684)

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-27 20:00:40 +03:00
parent 201e0dac79
commit 55e07132e9
4 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/guavaEquals.vm
-8
View File
@@ -13,15 +13,7 @@ Object $paramName){
&&
#end
#set($i = $i + 1)
#if ($field.array)
#if ($field.nestedArray)
java.util.Arrays.deepEquals($field.accessor, ${classInstanceName}.$field.accessor)##
#else
java.util.Arrays.equals($field.accessor, ${classInstanceName}.$field.accessor)##
#end
#else
com.google.common.base.Objects.equal($field.accessor, ${classInstanceName}.$field.accessor)##
#end
#end
;
}
java/java-impl/src/com/intellij/codeInsight/generation/guavaHashCode.vm
+4 -6
View File
@@ -6,13 +6,11 @@ public int hashCode() {
#set($i = 1)
#end
#foreach($field in $fields)
#if (!$field.static)
#if ($i > 0)
, ##
#end
$field.accessor ##
#set($i = $i + 1)
#if ($i > 0)
, ##
#end
$field.accessor ##
#set($i = $i + 1)
#end
);
}
java/java-impl/src/com/intellij/codeInsight/generation/objectsHashCode.vm
+4 -6
View File
@@ -6,13 +6,11 @@ public int hashCode() {
#set($i = 1)
#end
#foreach($field in $fields)
#if (!$field.static)
#if ($i > 0)
, ##
#end
$field.accessor ##
#set($i = $i + 1)
#if ($i > 0)
, ##
#end
$field.accessor ##
#set($i = $i + 1)
#end
);
}
java/java-tests/testData/codeInsight/generateEquals/afterDifferentTypesSuperEqualsAndHashCodeGuava.java
+6 -8
View File
@@ -1,5 +1,3 @@
import java.util.Arrays;
class B {
@Override
public boolean equals(Object obj) {
@@ -42,12 +40,12 @@ class A extends B {
com.google.common.base.Objects.equal(a10, a.a10) &&
com.google.common.base.Objects.equal(a11, a.a11) &&
com.google.common.base.Objects.equal(a12, a.a12) &&
Arrays.equals(a1, a.a1) &&
Arrays.deepEquals(a2, a.a2) &&
Arrays.equals(a3, a.a3) &&
Arrays.deepEquals(a4, a.a4) &&
Arrays.equals(a5, a.a5) &&
Arrays.deepEquals(a6, a.a6) &&
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) &&
com.google.common.base.Objects.equal(a4, a.a4) &&
com.google.common.base.Objects.equal(a5, a.a5) &&
com.google.common.base.Objects.equal(a6, a.a6) &&
com.google.common.base.Objects.equal(a13, a.a13) &&
com.google.common.base.Objects.equal(a14, a.a14);
}