Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/domain
Modified Files:
Newsletter.java Subscription.java
Log Message:
CMSC-888 fix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
See also: http://www.mmbase.org/jira/browse/CMSC-888
Index: Newsletter.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Newsletter.java 30 Apr 2008 07:30:10 -0000 1.10
+++ Newsletter.java 7 May 2008 02:54:40 -0000 1.11
@@ -127,4 +127,25 @@
public void setTxtempty(String txtempty) {
this.txtempty = txtempty;
}
+
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ Newsletter that = (Newsletter) o;
+
+ if (id != that.id) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public int hashCode() {
+ return id;
+ }
}
Index: Subscription.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Subscription.java 3 May 2008 14:40:59 -0000 1.9
+++ Subscription.java 7 May 2008 02:54:40 -0000 1.10
@@ -110,4 +110,25 @@
public void setPausedTill(Date pausedTill) {
this.pausedTill = pausedTill;
}
+
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ Subscription that = (Subscription) o;
+
+ if (newesletterId != null ? !newesletterId.equals(that.newesletterId) :
that.newesletterId != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public int hashCode() {
+ return 31 * (newesletterId != null ? newesletterId.hashCode() : 0);
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
