Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/domain
Modified Files:
Newsletter.java Publication.java Subscription.java
Added Files:
Term.java
Removed Files:
Tag.java
Log Message:
CMSC-703 change tag to term
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-703
Term.java is new
Index: Newsletter.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Newsletter.java 24 Apr 2008 09:21:02 -0000 1.8
+++ Newsletter.java 29 Apr 2008 01:37:04 -0000 1.9
@@ -1,9 +1,7 @@
package com.finalist.newsletter.domain;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
public class Newsletter {
@@ -18,7 +16,7 @@
private Date interval;
- private Set<Tag> tags = new HashSet<Tag>();
+ private Set<Term> terms = new HashSet<Term>();
private String title;
@@ -102,13 +100,11 @@
this.fromAddress = fromAddress;
}
- public Set<Tag> getTags() {
- return tags;
+ public Set<Term> getTerms() {
+ return terms;
}
- public void setTags(Set<Tag> tags) {
- this.tags = tags;
+ public void setTerms(Set<Term> terms) {
+ this.terms = terms;
}
-
-
}
Index: Publication.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Publication.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Publication.java 18 Apr 2008 08:02:22 -0000 1.7
+++ Publication.java 29 Apr 2008 01:37:04 -0000 1.8
@@ -9,9 +9,11 @@
private int id;
private Date deliverTime;
private STATUS status = STATUS.INITIAL;
- private String url;
private Newsletter newsletter;
+ private int newsletterId;
+ private String url;
+ private String title;
public int getId() {
return id;
@@ -50,12 +52,27 @@
this.status = status;
}
+ public int getNewsletterId() {
+ return newsletterId;
+ }
+
+ public void setNewsletterId(int newsletterId) {
+ this.newsletterId = newsletterId;
+ }
+
public String getUrl() {
-// String newsletterPath =
NavigationUtil.getPathToRootString(publicationNode, true);
return url;
}
public void setUrl(String url) {
this.url = url;
}
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
}
Index: Subscription.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Subscription.java 25 Apr 2008 18:18:35 -0000 1.7
+++ Subscription.java 29 Apr 2008 01:37:04 -0000 1.8
@@ -12,16 +12,18 @@
private String mimeType;
private STATUS status = STATUS.INACTIVE;
- private Set<Tag> tags = new HashSet<Tag>();
+ private Set<Term> terms = new HashSet<Term>();
private Newsletter newsletter;
private String subscriberId;
-
+ private String email;
private int id;
+ private String url;
public enum STATUS {
ACTIVE, PAUSED, INACTIVE
}
+
public Person getSubscriber() {
return subscriber;
}
@@ -50,12 +52,13 @@
return newsletter;
}
- public Set<Tag> getTags() {
- return tags;
+
+ public Set<Term> getTerms() {
+ return terms;
}
- public void setTags(Set<Tag> tags) {
- this.tags = tags;
+ public void setTerms(Set<Term> terms) {
+ this.terms = terms;
}
public void setNewsletter(Newsletter newsletter) {
@@ -77,4 +80,12 @@
public void setSubscriberId(String subscriberId) {
this.subscriberId = subscriberId;
}
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
