Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory
james.mmbase.org:/tmp/cvs-serv4350/portlets-newsletter/src/java/com/finalist/newsletter/domain
Modified Files:
Tag.java Subscription.java
Log Message:
CMSC-818 modify cao,servise,portlet and jsp files.
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-818
Index: Tag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Tag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Tag.java 18 Apr 2008 08:06:22 -0000 1.4
+++ Tag.java 23 Apr 2008 10:32:05 -0000 1.5
@@ -30,4 +30,21 @@
public void setId(int id) {
this.id = id;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof Tag) {
+ Tag tag = (Tag) obj;
+ if(this.name.equals(tag.name)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.name.hashCode();
+ }
+
}
Index: Subscription.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Subscription.java 22 Apr 2008 03:44:12 -0000 1.5
+++ Subscription.java 23 Apr 2008 10:32:05 -0000 1.6
@@ -46,10 +46,9 @@
}
public Newsletter getNewsletter() {
- return this.newsletter;
+ return newsletter;
}
-
public Set<Tag> getTags() {
return tags;
}
@@ -58,8 +57,6 @@
this.tags = tags;
}
-
-
public void setNewsletter(Newsletter newsletter) {
this.newsletter = newsletter;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
