mirror of https://github.com/apache/maven.git
o Simplfied code (no need to check derived and immutable fields)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809322 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
eb83c67035
commit
0234dc7e0e
|
@ -133,14 +133,9 @@ public class ScopeArtifactFilter
|
||||||
public int hashCode()
|
public int hashCode()
|
||||||
{
|
{
|
||||||
int hash = 17;
|
int hash = 17;
|
||||||
hash = hash * 31 + ( compileScope ? 1 : 0 );
|
|
||||||
hash = hash * 31 + ( runtimeScope ? 1 : 0 );
|
hash = hash * 31 + ( scope != null ? scope.hashCode() : 0 );
|
||||||
hash = hash * 31 + ( testScope ? 1 : 0 );
|
|
||||||
hash = hash * 31 + ( providedScope ? 1 : 0 );
|
|
||||||
hash = hash * 31 + ( systemScope ? 1 : 0 );
|
|
||||||
|
|
||||||
hash = hash * 31 + ( scope != null ? scope.hashCode() : 0);
|
|
||||||
|
|
||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,12 +154,7 @@ public class ScopeArtifactFilter
|
||||||
|
|
||||||
ScopeArtifactFilter other = (ScopeArtifactFilter) obj;
|
ScopeArtifactFilter other = (ScopeArtifactFilter) obj;
|
||||||
|
|
||||||
return compileScope == other.compileScope
|
return equals( scope, other.scope );
|
||||||
&& runtimeScope == other.runtimeScope
|
|
||||||
&& testScope == other.testScope
|
|
||||||
&& providedScope == other.providedScope
|
|
||||||
&& systemScope == other.systemScope
|
|
||||||
&& equals( scope, other.scope );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean equals( String str1, String str2 )
|
private static boolean equals( String str1, String str2 )
|
||||||
|
|
Loading…
Reference in New Issue