Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory
james.mmbase.org:/tmp/cvs-serv29528/portlets-newsletter/src/java/com/finalist/newsletter/domain
Modified Files:
Newsletter.java Subscription.java Publication.java
Log Message:
CMSC-811 update domain.
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-811
Index: Newsletter.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Newsletter.java 17 Apr 2008 02:54:42 -0000 1.5
+++ Newsletter.java 18 Apr 2008 08:02:22 -0000 1.6
@@ -14,10 +14,10 @@
private String title;
private int number;
- private String replyName;
- private String replyAddress;
+ private String replytoName;
+ private String replytoMail;
private String fromName;
- private String fromAddress;
+ private String fromMail;
public int getId() {
return id;
@@ -76,20 +76,20 @@
}
- public String getReplyName() {
- return replyName;
+ public String getReplytoName() {
+ return replytoName;
}
- public void setReplyName(String replyName) {
- this.replyName = replyName;
+ public void setReplytoName(String replytoName) {
+ this.replytoName = replytoName;
}
- public String getReplyAddress() {
- return replyAddress;
+ public String getReplytoMail() {
+ return replytoMail;
}
- public void setReplyAddress(String replyAddress) {
- this.replyAddress = replyAddress;
+ public void setReplytoMail(String replytoMail) {
+ this.replytoMail = replytoMail;
}
public String getFromName() {
@@ -100,11 +100,11 @@
this.fromName = fromName;
}
- public String getFromAddress() {
- return fromAddress;
+ public String getFromMail() {
+ return fromMail;
}
- public void setFromAddress(String fromAddress) {
- this.fromAddress = fromAddress;
+ public void setFromMail(String fromMail) {
+ this.fromMail = fromMail;
}
}
Index: Subscription.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Subscription.java 15 Apr 2008 06:18:32 -0000 1.2
+++ Subscription.java 18 Apr 2008 08:02:22 -0000 1.3
@@ -2,16 +2,12 @@
import com.finalist.cmsc.services.community.person.Person;
-public class Subscription extends Newsletter {
+public class Subscription{
private Person subscriber;
private String mimeType;
- private String fromAddress;
- private String fromName;
- private String replyAddress;
- private String replyname;
- private String title;
private int id;
+ private Newsletter newsletter;
public Person getSubscriber() {
return subscriber;
@@ -38,46 +34,10 @@
}
public Newsletter getNewsletter() {
- return null; //To change body of created methods use File | Settings |
File Templates.
+ return newsletter;
}
- public String getFromAddress() {
- return fromAddress;
- }
-
- public void setFromAddress(String fromAddress) {
- this.fromAddress = fromAddress;
- }
-
- public String getFromName() {
- return fromName;
- }
-
- public void setFromName(String fromName) {
- this.fromName = fromName;
- }
-
- public String getReplyAddress() {
- return replyAddress;
- }
-
- public void setReplyAddress(String replyAddress) {
- this.replyAddress = replyAddress;
- }
-
- public String getReplyname() {
- return replyname;
- }
-
- public void setReplyname(String replyname) {
- this.replyname = replyname;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
+ public void setNewsletter(Newsletter newsletter) {
+ this.newsletter = newsletter;
}
}
Index: Publication.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Publication.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Publication.java 17 Apr 2008 02:54:42 -0000 1.6
+++ Publication.java 18 Apr 2008 08:02:22 -0000 1.7
@@ -8,7 +8,7 @@
private int id;
private Date deliverTime;
- private STATUS status;
+ private STATUS status = STATUS.INITIAL;
private String url;
private Newsletter newsletter;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
