Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv6541/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterSubscriptionUtil.java NewsletterUtil.java
BeanUtil.java
Log Message:
CMSC-707
CMSC-733
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-707
See also: http://www.mmbase.org/jira/browse/CMSC-733
Index: NewsletterSubscriptionUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterSubscriptionUtil.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- NewsletterSubscriptionUtil.java 21 Jan 2008 22:09:00 -0000 1.23
+++ NewsletterSubscriptionUtil.java 19 Feb 2008 21:13:55 -0000 1.24
@@ -21,13 +21,13 @@
public static final String USERNAME = "username";
public static final String SUBSCRIPTION_STATUS_KEY = "subscriptionstatus";
- public static final String SUBSCRIPTION_STATUS_ACTIVE =
rb.getString("status.active");
- public static final String SUBSCRIPTION_STATUS_PAUSED =
rb.getString("status.paused");
- public static final String SUBSCRIPTION_STATUS_TERMINATED =
rb.getString("status.terminated");
- public static final String SUBSCRIPTION_STATUS_DEFAULT =
SUBSCRIPTION_STATUS_ACTIVE;
+ public static final int SUBSCRIPTION_STATUS_TERMINATED = 0;
+ public static final int SUBSCRIPTION_STATUS_ACTIVE = 1;
+ public static final int SUBSCRIPTION_STATUS_PAUSED = 2;
+ public static final int SUBSCRIPTION_STATUS_DEFAULT =
SUBSCRIPTION_STATUS_ACTIVE;
public static final String STATUS_OPTIONS = "statusoptions";
- private static List<String> statusOptions = new ArrayList<String>();
+ private static List<Integer> statusOptions = new ArrayList<Integer>();
static {
statusOptions.add(SUBSCRIPTION_STATUS_ACTIVE);
@@ -100,7 +100,7 @@
return (null);
}
- public static List<String> getStatusOptions() {
+ public static List<Integer > getStatusOptions() {
return (statusOptions);
}
@@ -175,13 +175,13 @@
}
}
- public static void setSubscriptionStatus(String userName, String status) {
- if (status == null) {
+ public static void setSubscriptionStatus(String userName, int status) {
+ if (status < 0 ) {
status = SUBSCRIPTION_STATUS_DEFAULT;
}
- if (userName != null && status != null) {
+ if (userName != null && status >= 0 ) {
NewsletterCommunication.removeUserPreference(userName,
SUBSCRIPTION_STATUS_KEY);
- NewsletterCommunication.setUserPreference(userName,
SUBSCRIPTION_STATUS_KEY, status);
+ NewsletterCommunication.setUserPreference(userName,
SUBSCRIPTION_STATUS_KEY, String.valueOf(status));
return;
}
}
Index: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterUtil.java 20 Jan 2008 22:48:35 -0000 1.13
+++ NewsletterUtil.java 19 Feb 2008 21:13:55 -0000 1.14
@@ -264,4 +264,37 @@
return (secundary);
}
+ public static boolean isPaused(int number) {
+ if (number > 0) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ Node newsletterNode = cloud.getNode(number);
+ if (newsletterNode != null) {
+ boolean isPaused = newsletterNode.getBooleanValue("paused");
+ return (isPaused);
+ }
+ }
+ return (false);
+ }
+
+ public static void pauseNewsletter(int number) {
+ if (number > 0) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ Node newsletterNode = cloud.getNode(number);
+ if (newsletterNode != null) {
+ newsletterNode.setBooleanValue("paused", true);
+ newsletterNode.commit();
+ }
+ }
+ }
+
+ public static void resumeNewsletter(int number) {
+ if (number > 0) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ Node newsletterNode = cloud.getNode(number);
+ if (newsletterNode != null) {
+ newsletterNode.setBooleanValue("paused", false);
+ newsletterNode.commit();
+ }
+ }
+ }
}
\ No newline at end of file
Index: BeanUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/BeanUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- BeanUtil.java 21 Jan 2008 11:22:42 -0000 1.3
+++ BeanUtil.java 19 Feb 2008 21:13:55 -0000 1.4
@@ -73,7 +73,7 @@
List<String> availableMimeTypes =
NewsletterGeneratorFactory.getMimeTypes();
bean.setAvailableMimeTypes(availableMimeTypes);
- List<String> availableStatusOptions =
NewsletterSubscriptionUtil.getStatusOptions();
+ List<Integer> availableStatusOptions =
NewsletterSubscriptionUtil.getStatusOptions();
bean.setAvailableStatusOptions(availableStatusOptions);
List<Integer> subscribedThemes =
NewsletterSubscriptionUtil.getUserSubscribedThemes(userName);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
