xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.

Browse source 
Former-commit-id: f6b36b4ff8 [formerly c6f92e9207] [formerly 2a1f84b72d] [formerly 2a1f84b72d [formerly 92b404f6ec]] [formerly 9e817de4a9 [formerly 2a1f84b72d [formerly 92b404f6ec] [formerly 9e817de4a9 [formerly 605f5a0a496deeb9be0e3aed1a56f6ac816038b4]]]]
Former-commit-id: 9e817de4a9
Former-commit-id: f37d430d4d2538e43f55c057c1ac5c922cb68114 [formerly 7d5d1b7a0fc09fb10c44af68831e25eff4f1f078] [formerly 850ee18fd4 [formerly fc3dec0591]]
Former-commit-id: 850ee18fd4
Former-commit-id: e395071beb
This commit is contained in:
Mike Duff 2014-01-13 09:25:34 -06:00
parent b6a5a49cc3
commit 26acacf883
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/NameProviderKey.java
View file

@ -19,8 +19,6 @@
**/
package com.raytheon.uf.edex.datadelivery.bandwidth.util;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
/**
* Object holding name and provider Strings to act as a hash key.
@ -31,7 +29,8 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 20, 2013 2636 mpduff Initial creation
* Dec 20, 2013 2636 mpduff Initial creation.
* Jan 13, 2014 2636 mpduff Removed the apache commons Equals/Hashcode builder.
*
* </pre>
*
@ -89,11 +88,12 @@ public class NameProviderKey {
*/
@Override
public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder();
builder.append(name);
builder.append(provider);
return builder.hashCode();
final int prime = 31;
int result = 1;
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result
+ ((provider == null) ? 0 : provider.hashCode());
return result;
}
/*
@ -103,15 +103,30 @@ public class NameProviderKey {
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (!(obj instanceof NameProviderKey)) {
return false;
}
NameProviderKey other = (NameProviderKey) obj;
EqualsBuilder builder = new EqualsBuilder();
builder.append(this.name, other.getName());
builder.append(this.provider, other.getProvider());
return builder.isEquals();
if (name == null) {
if (other.name != null) {
return false;
}
} else if (!name.equals(other.name)) {
return false;
}
if (provider == null) {
if (other.provider != null) {
return false;
}
} else if (!provider.equals(other.provider)) {
return false;
}
return true;
}
}