Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv29578/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterSubscriptionCAOImpl.java
Log Message:
CMSC-979 - Better code style and use Generics.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-979
Index: NewsletterSubscriptionCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- NewsletterSubscriptionCAOImpl.java 24 Jul 2008 11:45:43 -0000 1.25
+++ NewsletterSubscriptionCAOImpl.java 24 Jul 2008 11:50:44 -0000 1.26
@@ -129,10 +129,10 @@
Node record = cloud.getNode(recordId);
List<Node> terms = record.getRelatedNodes("term");
- Iterator termsit = terms.iterator();
+ Iterator<Node> termsit = terms.iterator();
record.deleteRelations("termed");
for (int i = 0; i < terms.size(); i++) {
- Node term = (Node) termsit.next();
+ Node term = termsit.next();
if (termId != term.getNumber()) {
RelationManager insrel =
cloud.getRelationManager("subscriptionrecord", "term", "termed");
record.createRelation(term, insrel).commit();
@@ -289,7 +289,7 @@
nodeQuery.setConstraint(constraints);
}
List<Node> list = nodeQuery.getList();
- Set results = new HashSet<Node>();
+ Set<Node> results = new HashSet<Node>();
List<Node> recordList = null;
for (Node termNode : list) {
@@ -312,8 +312,7 @@
for (Node subscription : subscriptions) {
List<Node> tmpNewsletters =
subscription.getRelatedNodes("newsletter", "newslettered", "source");
for (Node newsletter : tmpNewsletters) {
- if (newsletter != null)
- newsletters.add(newsletter);
+ if (newsletter != null) newsletters.add(newsletter);
}
}
return newsletters;
@@ -328,8 +327,7 @@
for (Node subscription : subscriptions) {
List<Node> tmpTerms =
subscription.getRelatedNodes("term", "termed", "destination");
for (Node term : tmpTerms) {
- if (term != null)
- terms.add(term);
+ if (term != null) terms.add(term);
}
}
return terms;
@@ -344,7 +342,7 @@
else {
subscription.setIntValue("count_bounces",1);
}
- subscription.setDateValue("last_bounce",new
Date(System.currentTimeMillis()));
+ subscription.setDateValue("last_bounce", new
Date(System.currentTimeMillis()));
subscription.commit();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
