This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit a18f8644103be5f104c61ba9a4bd478f6dfe24dc Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 2 18:14:26 2013 +0200 Simplifed equals() and hashCode() in DebianDependency since the fields are not null --- .../debian/maven/packager/DebianDependency.java | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java index 6d36a95..8b1edcd 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java @@ -48,31 +48,35 @@ public class DebianDependency implements Comparable<DebianDependency> { @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((minimumVersion == null) ? 0 : minimumVersion.hashCode()); - result = prime * result + ((packageName == null) ? 0 : packageName.hashCode()); - return result; + return packageName.hashCode(); } @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; - DebianDependency other = (DebianDependency) obj; - if (minimumVersion == null) { - if (other.minimumVersion != null) return false; - } else if (!minimumVersion.equals(other.minimumVersion)) return false; - if (packageName == null) { - if (other.packageName != null) return false; - } else if (!packageName.equals(other.packageName)) return false; + if (this == obj) { + return true; + } + if (!(obj instanceof DebianDependency)) { + return false; + } + + DebianDependency that = (DebianDependency) obj; + + if (!minimumVersion.equals(that.minimumVersion)) { + return false; + } + if (!packageName.equals(that.packageName)) { + return false; + } + return true; } @Override public int compareTo(DebianDependency other) { - if(equals(other)) return 0; + if (equals(other)) { + return 0; + } return toString().compareTo(other.toString()); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
