Author: felixk
Date: Tue Mar 22 20:41:30 2011
New Revision: 1084344
URL: http://svn.apache.org/viewvc?rev=1084344&view=rev
Log:
Use equals instead of == (see MAILBOX-43)
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java
Tue Mar 22 20:41:30 2011
@@ -167,8 +167,20 @@ public class JCRHeader extends AbstractC
if (getClass() != obj.getClass())
return false;
final JCRHeader other = (JCRHeader) obj;
- if (getValue() != other.getValue() || getFieldName() !=
other.getFieldName())
- return false;
+ if (getValue() != null) {
+ if (!getValue().equals(other.getValue()))
+ return false;
+ } else {
+ if (other.getValue() != null)
+ return false;
+ }
+ if (getFieldName() != null) {
+ if (!getFieldName().equals(other.getFieldName()))
+ return false;
+ } else {
+ if (other.getFieldName() != null)
+ return false;
+ }
return true;
}
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
Tue Mar 22 20:41:30 2011
@@ -180,8 +180,13 @@ public class JCRMailbox implements Mailb
if (getClass() != obj.getClass())
return false;
final JCRMailbox other = (JCRMailbox) obj;
- if (getMailboxId() != other.getMailboxId())
- return false;
+ if (getMailboxId() != null) {
+ if (!getMailboxId().equals(other.getMailboxId()))
+ return false;
+ } else {
+ if (other.getMailboxId() != null)
+ return false;
+ }
return true;
}
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
Tue Mar 22 20:41:30 2011
@@ -418,12 +418,28 @@ public class JCRMessage extends Abstract
return false;
final JCRMessage other = (JCRMessage) obj;
- if (getUUID() != other.getUUID())
- return false;
- if (getMailboxId() != other.getMailboxId())
- return false;
- if (getId() != other.getId())
- return false;
+
+ if (getUUID() != null) {
+ if (!getUUID().equals(other.getUUID()))
+ return false;
+ } else {
+ if (other.getUUID() != null)
+ return false;
+ }
+ if (getMailboxId() != null) {
+ if (!getMailboxId().equals(other.getMailboxId()))
+ return false;
+ } else {
+ if (other.getMailboxId() != null)
+ return false;
+ }
+ if (getId() != null) {
+ if (!getId().equals(other.getId()))
+ return false;
+ } else {
+ if (other.getId() != null)
+ return false;
+ }
return true;
}
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
Tue Mar 22 20:41:30 2011
@@ -189,8 +189,28 @@ public class JCRProperty extends Abstrac
if (getClass() != obj.getClass())
return false;
final JCRProperty other = (JCRProperty) obj;
- if (getLocalName() != other.getLocalName() || getNamespace() !=
other.getNamespace() || getValue() !=other.getValue())
- return false;
+
+ if (getLocalName() != null) {
+ if (!getLocalName().equals(other.getLocalName()))
+ return false;
+ } else {
+ if (other.getLocalName() != null)
+ return false;
+ }
+ if (getNamespace() != null) {
+ if (!getNamespace().equals(other.getNamespace()))
+ return false;
+ } else {
+ if (other.getNamespace() != null)
+ return false;
+ }
+ if (getValue() != null) {
+ if (!getValue().equals(other.getValue()))
+ return false;
+ } else {
+ if (other.getValue() != null)
+ return false;
+ }
return true;
}
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
Tue Mar 22 20:41:30 2011
@@ -147,8 +147,20 @@ public class JCRSubscription implements
if (getClass() != obj.getClass())
return false;
final JCRSubscription other = (JCRSubscription) obj;
- if (getUser() != other.getUser() || getMailbox() != other.getMailbox())
- return false;
+ if (getUser() != null) {
+ if (!getUser().equals(other.getUser()))
+ return false;
+ } else {
+ if (other.getUser() != null)
+ return false;
+ }
+ if (getMailbox() != null) {
+ if (!getMailbox().equals(other.getMailbox()))
+ return false;
+ } else {
+ if (other.getMailbox() != null)
+ return false;
+ }
return true;
}
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
(original)
+++
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
Tue Mar 22 20:41:30 2011
@@ -319,8 +319,13 @@ public abstract class AbstractJPAMailbox
if (getClass() != obj.getClass())
return false;
final AbstractJPAMailboxMembership other =
(AbstractJPAMailboxMembership) obj;
- if (getMailboxId() != other.getMailboxId())
- return false;
+ if (getMailboxId() != null) {
+ if (!getMailboxId().equals(other.getMailboxId()))
+ return false;
+ } else {
+ if (other.getMailboxId() != null)
+ return false;
+ }
if (uid != other.uid)
return false;
return true;
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java
Tue Mar 22 20:41:30 2011
@@ -152,7 +152,7 @@ public class MaildirMessageName {
* @param fullName A name of a message file in the correct Maildir format
*/
public void setFullName(String fullName) {
- if (this.fullName != fullName) {
+ if (this.fullName == null || !this.fullName.equals(fullName)) {
this.fullName = fullName;
this.file = null;
this.isSplit = false;
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java?rev=1084344&r1=1084343&r2=1084344&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
Tue Mar 22 20:41:30 2011
@@ -127,9 +127,13 @@ public class MaildirMailbox implements M
return true;
}
if (obj instanceof MaildirMailbox) {
- if (id == ((MaildirMailbox) obj).getMailboxId()) {
- return true;
- }
+ if (id != null) {
+ if (id.equals(((MaildirMailbox)
obj).getMailboxId()))
+ return true;
+ } else {
+ if (((MaildirMailbox) obj).getMailboxId() == null)
+ return true;
+ }
}
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
