echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes from DataHelper.eq() deprecation

Browse Source
This commit is contained in:
zzz
2010-05-10 15:58:53 +00:00
parent 7ec1dd7a98
commit dc91580e30
13 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/src/net/i2p/data/RouterAddress.java
View File

@ -126,7 +126,7 @@ public class RouterAddress extends DataStructureImpl {
public boolean equals(Object object) {
if ((object == null) || !(object instanceof RouterAddress)) return false;
RouterAddress addr = (RouterAddress) object;
return DataHelper.eq(_cost, addr.getCost()) && DataHelper.eq(_expiration, addr.getExpiration())
return _cost == addr.getCost() && DataHelper.eq(_expiration, addr.getExpiration())
&& DataHelper.eq(_options, addr.getOptions())
&& DataHelper.eq(_transportStyle, addr.getTransportStyle());
}

2
core/java/src/net/i2p/data/RouterInfo.java
View File

@ -560,7 +560,7 @@ public class RouterInfo extends DataStructureImpl {
RouterInfo info = (RouterInfo) object;
return DataHelper.eq(_identity, info.getIdentity())
&& DataHelper.eq(_signature, info.getSignature())
&& DataHelper.eq(_published, info.getPublished())
&& _published == info.getPublished()
&& DataHelper.eq(_addresses, info.getAddresses())
&& DataHelper.eq(_options, info.getOptions())
&& DataHelper.eq(_peers, info.getPeers());

2
core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
View File

@ -51,7 +51,7 @@ public class AbuseSeverity extends DataStructureImpl {
@Override
public boolean equals(Object object) {
if ((object == null) || !(object instanceof AbuseSeverity)) return false;
return DataHelper.eq(getSeverity(), ((AbuseSeverity) object).getSeverity());
return _severityId == ((AbuseSeverity) object).getSeverity();
}
@Override

2
core/java/src/net/i2p/data/i2cp/MessageId.java
View File

@ -53,7 +53,7 @@ public class MessageId extends DataStructureImpl {
@Override
public boolean equals(Object object) {
if ((object == null) || !(object instanceof MessageId)) return false;
return DataHelper.eq(getMessageId(), ((MessageId) object).getMessageId());
return _messageId == ((MessageId) object).getMessageId();
}
@Override

4
core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
View File

@ -112,8 +112,8 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
public boolean equals(Object object) {
if ((object != null) && (object instanceof MessagePayloadMessage)) {
MessagePayloadMessage msg = (MessagePayloadMessage) object;
return DataHelper.eq(getSessionId(), msg.getSessionId())
&& DataHelper.eq(getMessageId(), msg.getMessageId())
return _sessionId == msg.getSessionId()
&& _messageId == msg.getMessageId()
&& DataHelper.eq(getPayload(), msg.getPayload());
}

6
core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
View File

@ -157,9 +157,9 @@ public class MessageStatusMessage extends I2CPMessageImpl {
public boolean equals(Object object) {
if ((object != null) && (object instanceof MessageStatusMessage)) {
MessageStatusMessage msg = (MessageStatusMessage) object;
return DataHelper.eq(getSessionId(), msg.getSessionId())
&& DataHelper.eq(getMessageId(), msg.getMessageId()) && (getNonce() == msg.getNonce())
&& DataHelper.eq(getSize(), msg.getSize()) && DataHelper.eq(getStatus(), msg.getStatus());
return _sessionId == msg.getSessionId()
&& _messageId == msg.getMessageId() && _nonce == msg.getNonce()
&& _size == msg.getSize() && _status == msg.getStatus();
}
return false;

4
core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
View File

@ -92,8 +92,8 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
public boolean equals(Object object) {
if ((object != null) && (object instanceof ReceiveMessageBeginMessage)) {
ReceiveMessageBeginMessage msg = (ReceiveMessageBeginMessage) object;
return DataHelper.eq(getSessionId(), msg.getSessionId())
&& DataHelper.eq(getMessageId(), msg.getMessageId());
return _sessionId == msg.getSessionId()
&& _messageId == msg.getMessageId();
}
return false;

4
core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
View File

@ -76,8 +76,8 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl {
public boolean equals(Object object) {
if ((object != null) && (object instanceof ReceiveMessageEndMessage)) {
ReceiveMessageEndMessage msg = (ReceiveMessageEndMessage) object;
return DataHelper.eq(getSessionId(), msg.getSessionId())
&& DataHelper.eq(getMessageId(), msg.getMessageId());
return _sessionId == msg.getSessionId()
&& _messageId == msg.getMessageId();
}
return false;

2
core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
View File

@ -87,7 +87,7 @@ public class SessionStatusMessage extends I2CPMessageImpl {
public boolean equals(Object object) {
if ((object != null) && (object instanceof SessionStatusMessage)) {
SessionStatusMessage msg = (SessionStatusMessage) object;
return DataHelper.eq(getSessionId(), msg.getSessionId()) && DataHelper.eq(getStatus(), msg.getStatus());
return DataHelper.eq(getSessionId(), msg.getSessionId()) && _status == msg.getStatus();
}
return false;

2
router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
View File

@ -247,7 +247,7 @@ public class DatabaseStoreMessage extends I2NPMessageImpl {
return DataHelper.eq(getKey(),msg.getKey()) &&
DataHelper.eq(getLeaseSet(),msg.getLeaseSet()) &&
DataHelper.eq(getRouterInfo(),msg.getRouterInfo()) &&
DataHelper.eq(getValueType(),msg.getValueType()) &&
_type == msg.getValueType() &&
getReplyToken() == msg.getReplyToken() &&
DataHelper.eq(getReplyTunnel(), msg.getReplyTunnel()) &&
DataHelper.eq(getReplyGateway(), msg.getReplyGateway());

4
router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
View File

@ -71,8 +71,8 @@ public class DeliveryStatusMessage extends I2NPMessageImpl {
public boolean equals(Object object) {
if ( (object != null) && (object instanceof DeliveryStatusMessage) ) {
DeliveryStatusMessage msg = (DeliveryStatusMessage)object;
return DataHelper.eq(getMessageId(),msg.getMessageId()) &&
DataHelper.eq(getArrival(),msg.getArrival());
return _id == msg.getMessageId() &&
_arrival == msg.getArrival();
} else {
return false;
}

2
router/java/src/net/i2p/data/i2np/GarlicClove.java
View File

@ -193,7 +193,7 @@ public class GarlicClove extends DataStructureImpl {
return false;
GarlicClove clove = (GarlicClove)obj;
return DataHelper.eq(getCertificate(), clove.getCertificate()) &&
DataHelper.eq(getCloveId(), clove.getCloveId()) &&
_cloveId == clove.getCloveId() &&
DataHelper.eq(getData(), clove.getData()) &&
DataHelper.eq(getExpiration(), clove.getExpiration()) &&
DataHelper.eq(getInstructions(), clove.getInstructions());

2
router/java/src/net/i2p/data/i2np/TunnelDataMessage.java
View File

@ -197,7 +197,7 @@ public class TunnelDataMessage extends I2NPMessageImpl {
public boolean equals(Object object) {
if ( (object != null) && (object instanceof TunnelDataMessage) ) {
TunnelDataMessage msg = (TunnelDataMessage)object;
return DataHelper.eq(getTunnelId(),msg.getTunnelId()) &&
return _tunnelId == msg.getTunnelId() &&
DataHelper.eq(getData(),msg.getData());
} else {
return false;