diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotated.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotated.java index 1d772e70eb..89cc750619 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotated.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotated.java @@ -39,11 +39,11 @@ public boolean equals(Object obj) { return false; } else { Annotated o = (Annotated)obj; - return baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(annotations(), o.annotations()); + return this.baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()); } } public int hashCode() { - return 37 * (37 * (37 * (17 + "xsbti.api.Annotated".hashCode()) + baseType().hashCode()) + annotations().hashCode()); + return 37 * (37 * (37 * (17 + "xsbti.api.Annotated".hashCode()) + baseType().hashCode()) + java.util.Arrays.deepHashCode(annotations())); } public String toString() { return "Annotated(" + "baseType: " + baseType() + ", " + "annotations: " + annotations() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotation.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotation.java index a6f93e9b2a..b39bfe8511 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotation.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Annotation.java @@ -39,11 +39,11 @@ public boolean equals(Object obj) { return false; } else { Annotation o = (Annotation)obj; - return base().equals(o.base()) && java.util.Arrays.deepEquals(arguments(), o.arguments()); + return this.base().equals(o.base()) && java.util.Arrays.deepEquals(this.arguments(), o.arguments()); } } public int hashCode() { - return 37 * (37 * (37 * (17 + "xsbti.api.Annotation".hashCode()) + base().hashCode()) + arguments().hashCode()); + return 37 * (37 * (37 * (17 + "xsbti.api.Annotation".hashCode()) + base().hashCode()) + java.util.Arrays.deepHashCode(arguments())); } public String toString() { return "Annotation(" + "base: " + base() + ", " + "arguments: " + arguments() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/AnnotationArgument.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/AnnotationArgument.java index f2212d8da7..f49c06c747 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/AnnotationArgument.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/AnnotationArgument.java @@ -39,7 +39,7 @@ public boolean equals(Object obj) { return false; } else { AnnotationArgument o = (AnnotationArgument)obj; - return name().equals(o.name()) && value().equals(o.value()); + return this.name().equals(o.name()) && this.value().equals(o.value()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassDefinition.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassDefinition.java index 9d9aa1a399..c8c0de9c6c 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassDefinition.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassDefinition.java @@ -20,11 +20,11 @@ public boolean equals(Object obj) { return false; } else { ClassDefinition o = (ClassDefinition)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ClassDefinition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ClassDefinition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())); } public String toString() { return "ClassDefinition(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassLikeDef.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassLikeDef.java index fd8d3879a8..34cb78709a 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassLikeDef.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ClassLikeDef.java @@ -46,11 +46,11 @@ public boolean equals(Object obj) { return false; } else { ClassLikeDef o = (ClassLikeDef)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()) && definitionType().equals(o.definitionType()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()) && this.definitionType().equals(o.definitionType()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ClassLikeDef".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + definitionType().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ClassLikeDef".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())) + definitionType().hashCode()); } public String toString() { return "ClassLikeDef(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "definitionType: " + definitionType() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Companions.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Companions.java index 48f8bddce4..25409f10fe 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Companions.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Companions.java @@ -39,7 +39,7 @@ public boolean equals(Object obj) { return false; } else { Companions o = (Companions)obj; - return classApi().equals(o.classApi()) && objectApi().equals(o.objectApi()); + return this.classApi().equals(o.classApi()) && this.objectApi().equals(o.objectApi()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Constant.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Constant.java index b28b2dbdcb..091e3f51f9 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Constant.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Constant.java @@ -39,7 +39,7 @@ public boolean equals(Object obj) { return false; } else { Constant o = (Constant)obj; - return baseType().equals(o.baseType()) && value().equals(o.value()); + return this.baseType().equals(o.baseType()) && this.value().equals(o.value()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Def.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Def.java index 36bb14ade1..2015bba534 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Def.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Def.java @@ -54,11 +54,11 @@ public boolean equals(Object obj) { return false; } else { Def o = (Def)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()) && java.util.Arrays.deepEquals(valueParameters(), o.valueParameters()) && returnType().equals(o.returnType()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()) && java.util.Arrays.deepEquals(this.valueParameters(), o.valueParameters()) && this.returnType().equals(o.returnType()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Def".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + valueParameters().hashCode()) + returnType().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Def".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())) + java.util.Arrays.deepHashCode(valueParameters())) + returnType().hashCode()); } public String toString() { return "Def(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "valueParameters: " + valueParameters() + ", " + "returnType: " + returnType() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Definition.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Definition.java index 4e3917038d..66f8e5032e 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Definition.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Definition.java @@ -38,11 +38,11 @@ public boolean equals(Object obj) { return false; } else { Definition o = (Definition)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Definition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Definition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())); } public String toString() { return "Definition(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Existential.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Existential.java index cc82127119..f68e5525b7 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Existential.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Existential.java @@ -39,11 +39,11 @@ public boolean equals(Object obj) { return false; } else { Existential o = (Existential)obj; - return baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(clause(), o.clause()); + return this.baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(this.clause(), o.clause()); } } public int hashCode() { - return 37 * (37 * (37 * (17 + "xsbti.api.Existential".hashCode()) + baseType().hashCode()) + clause().hashCode()); + return 37 * (37 * (37 * (17 + "xsbti.api.Existential".hashCode()) + baseType().hashCode()) + java.util.Arrays.deepHashCode(clause())); } public String toString() { return "Existential(" + "baseType: " + baseType() + ", " + "clause: " + clause() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ExternalDependency.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ExternalDependency.java index 290cd671b3..abad709792 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ExternalDependency.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ExternalDependency.java @@ -55,7 +55,7 @@ public boolean equals(Object obj) { return false; } else { ExternalDependency o = (ExternalDependency)obj; - return sourceClassName().equals(o.sourceClassName()) && targetProductClassName().equals(o.targetProductClassName()) && targetClass().equals(o.targetClass()) && context().equals(o.context()); + return this.sourceClassName().equals(o.sourceClassName()) && this.targetProductClassName().equals(o.targetProductClassName()) && this.targetClass().equals(o.targetClass()) && this.context().equals(o.context()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/FieldLike.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/FieldLike.java index 13cce119b8..3be7a1a1ed 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/FieldLike.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/FieldLike.java @@ -23,11 +23,11 @@ public boolean equals(Object obj) { return false; } else { FieldLike o = (FieldLike)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && tpe().equals(o.tpe()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && this.tpe().equals(o.tpe()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.FieldLike".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + tpe().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.FieldLike".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + tpe().hashCode()); } public String toString() { return "FieldLike(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "tpe: " + tpe() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Id.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Id.java index 506b659e5a..a3edcdd0b1 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Id.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Id.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { return false; } else { Id o = (Id)obj; - return id().equals(o.id()); + return this.id().equals(o.id()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/IdQualifier.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/IdQualifier.java index 9d9f2e56be..0f2148ba7c 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/IdQualifier.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/IdQualifier.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { return false; } else { IdQualifier o = (IdQualifier)obj; - return value().equals(o.value()); + return this.value().equals(o.value()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/InternalDependency.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/InternalDependency.java index 0090d7dce7..1b102468da 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/InternalDependency.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/InternalDependency.java @@ -47,7 +47,7 @@ public boolean equals(Object obj) { return false; } else { InternalDependency o = (InternalDependency)obj; - return sourceClassName().equals(o.sourceClassName()) && targetClassName().equals(o.targetClassName()) && context().equals(o.context()); + return this.sourceClassName().equals(o.sourceClassName()) && this.targetClassName().equals(o.targetClassName()) && this.context().equals(o.context()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/MethodParameter.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/MethodParameter.java index da1180181c..823e729c74 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/MethodParameter.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/MethodParameter.java @@ -55,7 +55,7 @@ public boolean equals(Object obj) { return false; } else { MethodParameter o = (MethodParameter)obj; - return name().equals(o.name()) && tpe().equals(o.tpe()) && (hasDefault() == o.hasDefault()) && modifier().equals(o.modifier()); + return this.name().equals(o.name()) && this.tpe().equals(o.tpe()) && (this.hasDefault() == o.hasDefault()) && this.modifier().equals(o.modifier()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/NameHash.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/NameHash.java index 41b0841ef2..e45e1ba649 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/NameHash.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/NameHash.java @@ -47,7 +47,7 @@ public boolean equals(Object obj) { return false; } else { NameHash o = (NameHash)obj; - return name().equals(o.name()) && scope().equals(o.scope()) && (hash() == o.hash()); + return this.name().equals(o.name()) && this.scope().equals(o.scope()) && (this.hash() == o.hash()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Package.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Package.java index 5613be533d..b3db685f40 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Package.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Package.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { return false; } else { Package o = (Package)obj; - return name().equals(o.name()); + return this.name().equals(o.name()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterList.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterList.java index e49dfe4afe..cdf399c44d 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterList.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterList.java @@ -39,11 +39,11 @@ public boolean equals(Object obj) { return false; } else { ParameterList o = (ParameterList)obj; - return java.util.Arrays.deepEquals(parameters(), o.parameters()) && (isImplicit() == o.isImplicit()); + return java.util.Arrays.deepEquals(this.parameters(), o.parameters()) && (this.isImplicit() == o.isImplicit()); } } public int hashCode() { - return 37 * (37 * (37 * (17 + "xsbti.api.ParameterList".hashCode()) + parameters().hashCode()) + (new Boolean(isImplicit())).hashCode()); + return 37 * (37 * (37 * (17 + "xsbti.api.ParameterList".hashCode()) + java.util.Arrays.deepHashCode(parameters())) + (new Boolean(isImplicit())).hashCode()); } public String toString() { return "ParameterList(" + "parameters: " + parameters() + ", " + "isImplicit: " + isImplicit() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterRef.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterRef.java index eaa8e41e86..0f6412ead4 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterRef.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterRef.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { return false; } else { ParameterRef o = (ParameterRef)obj; - return id().equals(o.id()); + return this.id().equals(o.id()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Parameterized.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Parameterized.java index cb2921c362..37dce280a4 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Parameterized.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Parameterized.java @@ -39,11 +39,11 @@ public boolean equals(Object obj) { return false; } else { Parameterized o = (Parameterized)obj; - return baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(typeArguments(), o.typeArguments()); + return this.baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(this.typeArguments(), o.typeArguments()); } } public int hashCode() { - return 37 * (37 * (37 * (17 + "xsbti.api.Parameterized".hashCode()) + baseType().hashCode()) + typeArguments().hashCode()); + return 37 * (37 * (37 * (17 + "xsbti.api.Parameterized".hashCode()) + baseType().hashCode()) + java.util.Arrays.deepHashCode(typeArguments())); } public String toString() { return "Parameterized(" + "baseType: " + baseType() + ", " + "typeArguments: " + typeArguments() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterizedDefinition.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterizedDefinition.java index eadd8ab9c7..52a57bd33a 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterizedDefinition.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/ParameterizedDefinition.java @@ -23,11 +23,11 @@ public boolean equals(Object obj) { return false; } else { ParameterizedDefinition o = (ParameterizedDefinition)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ParameterizedDefinition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.ParameterizedDefinition".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())); } public String toString() { return "ParameterizedDefinition(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Path.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Path.java index 439f614609..d469891e8e 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Path.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Path.java @@ -31,11 +31,11 @@ public boolean equals(Object obj) { return false; } else { Path o = (Path)obj; - return java.util.Arrays.deepEquals(components(), o.components()); + return java.util.Arrays.deepEquals(this.components(), o.components()); } } public int hashCode() { - return 37 * (37 * (17 + "xsbti.api.Path".hashCode()) + components().hashCode()); + return 37 * (37 * (17 + "xsbti.api.Path".hashCode()) + java.util.Arrays.deepHashCode(components())); } public String toString() { return "Path(" + "components: " + components() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Polymorphic.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Polymorphic.java index 8b12dd0f07..57645690dd 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Polymorphic.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Polymorphic.java @@ -39,11 +39,11 @@ public boolean equals(Object obj) { return false; } else { Polymorphic o = (Polymorphic)obj; - return baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(parameters(), o.parameters()); + return this.baseType().equals(o.baseType()) && java.util.Arrays.deepEquals(this.parameters(), o.parameters()); } } public int hashCode() { - return 37 * (37 * (37 * (17 + "xsbti.api.Polymorphic".hashCode()) + baseType().hashCode()) + parameters().hashCode()); + return 37 * (37 * (37 * (17 + "xsbti.api.Polymorphic".hashCode()) + baseType().hashCode()) + java.util.Arrays.deepHashCode(parameters())); } public String toString() { return "Polymorphic(" + "baseType: " + baseType() + ", " + "parameters: " + parameters() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Private.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Private.java index eec014cacf..2d24ec06db 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Private.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Private.java @@ -28,7 +28,7 @@ public boolean equals(Object obj) { return false; } else { Private o = (Private)obj; - return qualifier().equals(o.qualifier()); + return this.qualifier().equals(o.qualifier()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Projection.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Projection.java index e33cc8a853..7acec6e90c 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Projection.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Projection.java @@ -39,7 +39,7 @@ public boolean equals(Object obj) { return false; } else { Projection o = (Projection)obj; - return prefix().equals(o.prefix()) && id().equals(o.id()); + return this.prefix().equals(o.prefix()) && this.id().equals(o.id()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Protected.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Protected.java index ff844cc2b8..4fb24be6cc 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Protected.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Protected.java @@ -28,7 +28,7 @@ public boolean equals(Object obj) { return false; } else { Protected o = (Protected)obj; - return qualifier().equals(o.qualifier()); + return this.qualifier().equals(o.qualifier()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Qualified.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Qualified.java index e77952d264..f5881036bc 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Qualified.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Qualified.java @@ -23,7 +23,7 @@ public boolean equals(Object obj) { return false; } else { Qualified o = (Qualified)obj; - return qualifier().equals(o.qualifier()); + return this.qualifier().equals(o.qualifier()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Singleton.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Singleton.java index 7c35df7520..27c412af34 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Singleton.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Singleton.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { return false; } else { Singleton o = (Singleton)obj; - return path().equals(o.path()); + return this.path().equals(o.path()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Super.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Super.java index 4658d5bf65..9949b1d1da 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Super.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Super.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { return false; } else { Super o = (Super)obj; - return qualifier().equals(o.qualifier()); + return this.qualifier().equals(o.qualifier()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeAlias.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeAlias.java index 6efb49e0ec..d90c079a09 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeAlias.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeAlias.java @@ -46,11 +46,11 @@ public boolean equals(Object obj) { return false; } else { TypeAlias o = (TypeAlias)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()) && tpe().equals(o.tpe()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()) && this.tpe().equals(o.tpe()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeAlias".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + tpe().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeAlias".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())) + tpe().hashCode()); } public String toString() { return "TypeAlias(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "tpe: " + tpe() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeDeclaration.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeDeclaration.java index ee51d23596..882aa7659e 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeDeclaration.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeDeclaration.java @@ -54,11 +54,11 @@ public boolean equals(Object obj) { return false; } else { TypeDeclaration o = (TypeDeclaration)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()) && lowerBound().equals(o.lowerBound()) && upperBound().equals(o.upperBound()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()) && this.lowerBound().equals(o.lowerBound()) && this.upperBound().equals(o.upperBound()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeDeclaration".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + lowerBound().hashCode()) + upperBound().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeDeclaration".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())) + lowerBound().hashCode()) + upperBound().hashCode()); } public String toString() { return "TypeDeclaration(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "lowerBound: " + lowerBound() + ", " + "upperBound: " + upperBound() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeMember.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeMember.java index 8968e8eb44..b85da6ca55 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeMember.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeMember.java @@ -20,11 +20,11 @@ public boolean equals(Object obj) { return false; } else { TypeMember o = (TypeMember)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeMember".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeMember".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())); } public String toString() { return "TypeMember(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeParameter.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeParameter.java index 5d130833dd..f6e625aae9 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeParameter.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/TypeParameter.java @@ -71,11 +71,11 @@ public boolean equals(Object obj) { return false; } else { TypeParameter o = (TypeParameter)obj; - return id().equals(o.id()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && java.util.Arrays.deepEquals(typeParameters(), o.typeParameters()) && variance().equals(o.variance()) && lowerBound().equals(o.lowerBound()) && upperBound().equals(o.upperBound()); + return this.id().equals(o.id()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && java.util.Arrays.deepEquals(this.typeParameters(), o.typeParameters()) && this.variance().equals(o.variance()) && this.lowerBound().equals(o.lowerBound()) && this.upperBound().equals(o.upperBound()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeParameter".hashCode()) + id().hashCode()) + annotations().hashCode()) + typeParameters().hashCode()) + variance().hashCode()) + lowerBound().hashCode()) + upperBound().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.TypeParameter".hashCode()) + id().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + java.util.Arrays.deepHashCode(typeParameters())) + variance().hashCode()) + lowerBound().hashCode()) + upperBound().hashCode()); } public String toString() { return "TypeParameter(" + "id: " + id() + ", " + "annotations: " + annotations() + ", " + "typeParameters: " + typeParameters() + ", " + "variance: " + variance() + ", " + "lowerBound: " + lowerBound() + ", " + "upperBound: " + upperBound() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Val.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Val.java index ee8bd73daa..880ce22ce2 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Val.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Val.java @@ -40,11 +40,11 @@ public boolean equals(Object obj) { return false; } else { Val o = (Val)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && tpe().equals(o.tpe()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && this.tpe().equals(o.tpe()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Val".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + tpe().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Val".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + tpe().hashCode()); } public String toString() { return "Val(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "tpe: " + tpe() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Var.java b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Var.java index 17cfb10216..9c40f6714e 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/api/Var.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/api/Var.java @@ -40,11 +40,11 @@ public boolean equals(Object obj) { return false; } else { Var o = (Var)obj; - return name().equals(o.name()) && access().equals(o.access()) && modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(annotations(), o.annotations()) && tpe().equals(o.tpe()); + return this.name().equals(o.name()) && this.access().equals(o.access()) && this.modifiers().equals(o.modifiers()) && java.util.Arrays.deepEquals(this.annotations(), o.annotations()) && this.tpe().equals(o.tpe()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Var".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + annotations().hashCode()) + tpe().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.api.Var".hashCode()) + name().hashCode()) + access().hashCode()) + modifiers().hashCode()) + java.util.Arrays.deepHashCode(annotations())) + tpe().hashCode()); } public String toString() { return "Var(" + "name: " + name() + ", " + "access: " + access() + ", " + "modifiers: " + modifiers() + ", " + "annotations: " + annotations() + ", " + "tpe: " + tpe() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/ClasspathOptions.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/ClasspathOptions.java index c69f26279e..a6bc74951c 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/ClasspathOptions.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/ClasspathOptions.java @@ -87,7 +87,7 @@ public boolean equals(Object obj) { return false; } else { ClasspathOptions o = (ClasspathOptions)obj; - return (bootLibrary() == o.bootLibrary()) && (compiler() == o.compiler()) && (extra() == o.extra()) && (autoBoot() == o.autoBoot()) && (filterLibrary() == o.filterLibrary()); + return (this.bootLibrary() == o.bootLibrary()) && (this.compiler() == o.compiler()) && (this.extra() == o.extra()) && (this.autoBoot() == o.autoBoot()) && (this.filterLibrary() == o.filterLibrary()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileOptions.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileOptions.java index 76476e1589..7890ac33f4 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileOptions.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileOptions.java @@ -115,11 +115,11 @@ public boolean equals(Object obj) { return false; } else { CompileOptions o = (CompileOptions)obj; - return java.util.Arrays.deepEquals(classpath(), o.classpath()) && java.util.Arrays.deepEquals(sources(), o.sources()) && classesDirectory().equals(o.classesDirectory()) && java.util.Arrays.deepEquals(scalacOptions(), o.scalacOptions()) && java.util.Arrays.deepEquals(javacOptions(), o.javacOptions()) && (maxErrors() == o.maxErrors()) && sourcePositionMapper().equals(o.sourcePositionMapper()) && order().equals(o.order()); + return java.util.Arrays.deepEquals(this.classpath(), o.classpath()) && java.util.Arrays.deepEquals(this.sources(), o.sources()) && this.classesDirectory().equals(o.classesDirectory()) && java.util.Arrays.deepEquals(this.scalacOptions(), o.scalacOptions()) && java.util.Arrays.deepEquals(this.javacOptions(), o.javacOptions()) && (this.maxErrors() == o.maxErrors()) && this.sourcePositionMapper().equals(o.sourcePositionMapper()) && this.order().equals(o.order()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.compile.CompileOptions".hashCode()) + classpath().hashCode()) + sources().hashCode()) + classesDirectory().hashCode()) + scalacOptions().hashCode()) + javacOptions().hashCode()) + (new Integer(maxErrors())).hashCode()) + sourcePositionMapper().hashCode()) + order().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.compile.CompileOptions".hashCode()) + java.util.Arrays.deepHashCode(classpath())) + java.util.Arrays.deepHashCode(sources())) + classesDirectory().hashCode()) + java.util.Arrays.deepHashCode(scalacOptions())) + java.util.Arrays.deepHashCode(javacOptions())) + (new Integer(maxErrors())).hashCode()) + sourcePositionMapper().hashCode()) + order().hashCode()); } public String toString() { return "CompileOptions(" + "classpath: " + classpath() + ", " + "sources: " + sources() + ", " + "classesDirectory: " + classesDirectory() + ", " + "scalacOptions: " + scalacOptions() + ", " + "javacOptions: " + javacOptions() + ", " + "maxErrors: " + maxErrors() + ", " + "sourcePositionMapper: " + sourcePositionMapper() + ", " + "order: " + order() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileResult.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileResult.java index fb48739b8e..a1381d2ec1 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileResult.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/CompileResult.java @@ -48,7 +48,7 @@ public boolean equals(Object obj) { return false; } else { CompileResult o = (CompileResult)obj; - return analysis().equals(o.analysis()) && setup().equals(o.setup()) && (hasModified() == o.hasModified()); + return this.analysis().equals(o.analysis()) && this.setup().equals(o.setup()) && (this.hasModified() == o.hasModified()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Compilers.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Compilers.java index fe4df47920..3f504f2b4a 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Compilers.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Compilers.java @@ -44,7 +44,7 @@ public boolean equals(Object obj) { return false; } else { Compilers o = (Compilers)obj; - return scalac().equals(o.scalac()) && javaTools().equals(o.javaTools()); + return this.scalac().equals(o.scalac()) && this.javaTools().equals(o.javaTools()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/FileHash.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/FileHash.java index c54e25663f..dc0f70a332 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/FileHash.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/FileHash.java @@ -39,7 +39,7 @@ public boolean equals(Object obj) { return false; } else { FileHash o = (FileHash)obj; - return file().equals(o.file()) && (hash() == o.hash()); + return this.file().equals(o.file()) && (this.hash() == o.hash()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncOptions.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncOptions.java index 6c4532b3fa..72c6784051 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncOptions.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncOptions.java @@ -265,7 +265,7 @@ public boolean equals(Object obj) { return false; } else { IncOptions o = (IncOptions)obj; - return (transitiveStep() == o.transitiveStep()) && (recompileAllFraction() == o.recompileAllFraction()) && (relationsDebug() == o.relationsDebug()) && (apiDebug() == o.apiDebug()) && (apiDiffContextSize() == o.apiDiffContextSize()) && apiDumpDirectory().equals(o.apiDumpDirectory()) && classfileManagerType().equals(o.classfileManagerType()) && (useCustomizedFileManager() == o.useCustomizedFileManager()) && recompileOnMacroDef().equals(o.recompileOnMacroDef()) && (useOptimizedSealed() == o.useOptimizedSealed()) && (storeApis() == o.storeApis()) && (enabled() == o.enabled()) && extra().equals(o.extra()) && (logRecompileOnMacro() == o.logRecompileOnMacro()) && externalHooks().equals(o.externalHooks()); + return (this.transitiveStep() == o.transitiveStep()) && (this.recompileAllFraction() == o.recompileAllFraction()) && (this.relationsDebug() == o.relationsDebug()) && (this.apiDebug() == o.apiDebug()) && (this.apiDiffContextSize() == o.apiDiffContextSize()) && this.apiDumpDirectory().equals(o.apiDumpDirectory()) && this.classfileManagerType().equals(o.classfileManagerType()) && (this.useCustomizedFileManager() == o.useCustomizedFileManager()) && this.recompileOnMacroDef().equals(o.recompileOnMacroDef()) && (this.useOptimizedSealed() == o.useOptimizedSealed()) && (this.storeApis() == o.storeApis()) && (this.enabled() == o.enabled()) && this.extra().equals(o.extra()) && (this.logRecompileOnMacro() == o.logRecompileOnMacro()) && this.externalHooks().equals(o.externalHooks()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncToolOptions.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncToolOptions.java index 7ad476bcd7..84ef328166 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncToolOptions.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/IncToolOptions.java @@ -48,7 +48,7 @@ public boolean equals(Object obj) { return false; } else { IncToolOptions o = (IncToolOptions)obj; - return classFileManager().equals(o.classFileManager()) && (useCustomizedFileManager() == o.useCustomizedFileManager()); + return this.classFileManager().equals(o.classFileManager()) && (this.useCustomizedFileManager() == o.useCustomizedFileManager()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Inputs.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Inputs.java index e3619d4c44..226e70f8b3 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Inputs.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Inputs.java @@ -59,7 +59,7 @@ public boolean equals(Object obj) { return false; } else { Inputs o = (Inputs)obj; - return compilers().equals(o.compilers()) && options().equals(o.options()) && setup().equals(o.setup()) && previousResult().equals(o.previousResult()); + return this.compilers().equals(o.compilers()) && this.options().equals(o.options()) && this.setup().equals(o.setup()) && this.previousResult().equals(o.previousResult()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniOptions.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniOptions.java index cde360e7d3..279b73a171 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniOptions.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniOptions.java @@ -53,11 +53,11 @@ public boolean equals(Object obj) { return false; } else { MiniOptions o = (MiniOptions)obj; - return java.util.Arrays.deepEquals(classpathHash(), o.classpathHash()) && java.util.Arrays.deepEquals(scalacOptions(), o.scalacOptions()) && java.util.Arrays.deepEquals(javacOptions(), o.javacOptions()); + return java.util.Arrays.deepEquals(this.classpathHash(), o.classpathHash()) && java.util.Arrays.deepEquals(this.scalacOptions(), o.scalacOptions()) && java.util.Arrays.deepEquals(this.javacOptions(), o.javacOptions()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (17 + "xsbti.compile.MiniOptions".hashCode()) + classpathHash().hashCode()) + scalacOptions().hashCode()) + javacOptions().hashCode()); + return 37 * (37 * (37 * (37 * (17 + "xsbti.compile.MiniOptions".hashCode()) + java.util.Arrays.deepHashCode(classpathHash())) + java.util.Arrays.deepHashCode(scalacOptions())) + java.util.Arrays.deepHashCode(javacOptions())); } public String toString() { return "MiniOptions(" + "classpathHash: " + classpathHash() + ", " + "scalacOptions: " + scalacOptions() + ", " + "javacOptions: " + javacOptions() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniSetup.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniSetup.java index 0d6e04ab1f..e652c5cba7 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniSetup.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/MiniSetup.java @@ -72,11 +72,11 @@ public boolean equals(Object obj) { return false; } else { MiniSetup o = (MiniSetup)obj; - return output().equals(o.output()) && options().equals(o.options()) && compilerVersion().equals(o.compilerVersion()) && order().equals(o.order()) && (storeApis() == o.storeApis()) && java.util.Arrays.deepEquals(extra(), o.extra()); + return this.output().equals(o.output()) && this.options().equals(o.options()) && this.compilerVersion().equals(o.compilerVersion()) && this.order().equals(o.order()) && (this.storeApis() == o.storeApis()) && java.util.Arrays.deepEquals(this.extra(), o.extra()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.compile.MiniSetup".hashCode()) + output().hashCode()) + options().hashCode()) + compilerVersion().hashCode()) + order().hashCode()) + (new Boolean(storeApis())).hashCode()) + extra().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.compile.MiniSetup".hashCode()) + output().hashCode()) + options().hashCode()) + compilerVersion().hashCode()) + order().hashCode()) + (new Boolean(storeApis())).hashCode()) + java.util.Arrays.deepHashCode(extra())); } public String toString() { return "MiniSetup(" + "output: " + output() + ", " + "options: " + options() + ", " + "compilerVersion: " + compilerVersion() + ", " + "order: " + order() + ", " + "storeApis: " + storeApis() + ", " + "extra: " + extra() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/PreviousResult.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/PreviousResult.java index afbff7ffb7..1da7ea4e75 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/PreviousResult.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/PreviousResult.java @@ -40,7 +40,7 @@ public boolean equals(Object obj) { return false; } else { PreviousResult o = (PreviousResult)obj; - return analysis().equals(o.analysis()) && setup().equals(o.setup()); + return this.analysis().equals(o.analysis()) && this.setup().equals(o.setup()); } } public int hashCode() { diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Setup.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Setup.java index d623718b65..65eaf3b500 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Setup.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/Setup.java @@ -96,11 +96,11 @@ public boolean equals(Object obj) { return false; } else { Setup o = (Setup)obj; - return perClasspathEntryLookup().equals(o.perClasspathEntryLookup()) && (skip() == o.skip()) && cacheFile().equals(o.cacheFile()) && cache().equals(o.cache()) && incrementalCompilerOptions().equals(o.incrementalCompilerOptions()) && reporter().equals(o.reporter()) && progress().equals(o.progress()) && java.util.Arrays.deepEquals(extra(), o.extra()); + return this.perClasspathEntryLookup().equals(o.perClasspathEntryLookup()) && (this.skip() == o.skip()) && this.cacheFile().equals(o.cacheFile()) && this.cache().equals(o.cache()) && this.incrementalCompilerOptions().equals(o.incrementalCompilerOptions()) && this.reporter().equals(o.reporter()) && this.progress().equals(o.progress()) && java.util.Arrays.deepEquals(this.extra(), o.extra()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.compile.Setup".hashCode()) + perClasspathEntryLookup().hashCode()) + (new Boolean(skip())).hashCode()) + cacheFile().hashCode()) + cache().hashCode()) + incrementalCompilerOptions().hashCode()) + reporter().hashCode()) + progress().hashCode()) + extra().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.compile.Setup".hashCode()) + perClasspathEntryLookup().hashCode()) + (new Boolean(skip())).hashCode()) + cacheFile().hashCode()) + cache().hashCode()) + incrementalCompilerOptions().hashCode()) + reporter().hashCode()) + progress().hashCode()) + java.util.Arrays.deepHashCode(extra())); } public String toString() { return "Setup(" + "perClasspathEntryLookup: " + perClasspathEntryLookup() + ", " + "skip: " + skip() + ", " + "cacheFile: " + cacheFile() + ", " + "cache: " + cache() + ", " + "incrementalCompilerOptions: " + incrementalCompilerOptions() + ", " + "reporter: " + reporter() + ", " + "progress: " + progress() + ", " + "extra: " + extra() + ")"; diff --git a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/TransactionalManagerType.java b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/TransactionalManagerType.java index c630322ee9..22ddbd6fbb 100644 --- a/internal/compiler-interface/src/main/contraband-java/xsbti/compile/TransactionalManagerType.java +++ b/internal/compiler-interface/src/main/contraband-java/xsbti/compile/TransactionalManagerType.java @@ -44,7 +44,7 @@ public boolean equals(Object obj) { return false; } else { TransactionalManagerType o = (TransactionalManagerType)obj; - return backupDirectory().equals(o.backupDirectory()) && logger().equals(o.logger()); + return this.backupDirectory().equals(o.backupDirectory()) && this.logger().equals(o.logger()); } } public int hashCode() { diff --git a/internal/zinc-compile-core/src/main/contraband-java/xsbti/ReporterConfig.java b/internal/zinc-compile-core/src/main/contraband-java/xsbti/ReporterConfig.java index f68f0437f4..4ad9612fe3 100644 --- a/internal/zinc-compile-core/src/main/contraband-java/xsbti/ReporterConfig.java +++ b/internal/zinc-compile-core/src/main/contraband-java/xsbti/ReporterConfig.java @@ -79,11 +79,11 @@ public boolean equals(Object obj) { return false; } else { ReporterConfig o = (ReporterConfig)obj; - return loggerName().equals(o.loggerName()) && (maximumErrors() == o.maximumErrors()) && (useColor() == o.useColor()) && java.util.Arrays.deepEquals(msgFilters(), o.msgFilters()) && java.util.Arrays.deepEquals(fileFilters(), o.fileFilters()) && logLevel().equals(o.logLevel()) && positionMapper().equals(o.positionMapper()); + return this.loggerName().equals(o.loggerName()) && (this.maximumErrors() == o.maximumErrors()) && (this.useColor() == o.useColor()) && java.util.Arrays.deepEquals(this.msgFilters(), o.msgFilters()) && java.util.Arrays.deepEquals(this.fileFilters(), o.fileFilters()) && this.logLevel().equals(o.logLevel()) && this.positionMapper().equals(o.positionMapper()); } } public int hashCode() { - return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.ReporterConfig".hashCode()) + loggerName().hashCode()) + (new Integer(maximumErrors())).hashCode()) + (new Boolean(useColor())).hashCode()) + msgFilters().hashCode()) + fileFilters().hashCode()) + logLevel().hashCode()) + positionMapper().hashCode()); + return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "xsbti.ReporterConfig".hashCode()) + loggerName().hashCode()) + (new Integer(maximumErrors())).hashCode()) + (new Boolean(useColor())).hashCode()) + java.util.Arrays.deepHashCode(msgFilters())) + java.util.Arrays.deepHashCode(fileFilters())) + logLevel().hashCode()) + positionMapper().hashCode()); } public String toString() { return "ReporterConfig(" + "loggerName: " + loggerName() + ", " + "maximumErrors: " + maximumErrors() + ", " + "useColor: " + useColor() + ", " + "msgFilters: " + msgFilters() + ", " + "fileFilters: " + fileFilters() + ", " + "logLevel: " + logLevel() + ", " + "positionMapper: " + positionMapper() + ")"; diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5131026f22..13b37ef532 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,9 +7,9 @@ object Dependencies { val scala212 = "2.12.4" val scala213 = "2.13.0-M2" - private val ioVersion = "1.1.3" - private val utilVersion = "1.1.2" - private val lmVersion = "1.1.2" + private val ioVersion = "1.1.4" + private val utilVersion = "1.1.3" + private val lmVersion = "1.1.4" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion diff --git a/project/plugins.sbt b/project/plugins.sbt index d59c2837de..8ed6cba090 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.5") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2") addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.12-rc5")