Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl In directory james.mmbase.org:/tmp/cvs-serv7203/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files: Tag: b1_5 NewsLetterStatisticCAOImpl.java Log Message: CMSC-907 - Clean up code: convert to better methods; fix naming convention violations; remove extra imports. 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-907 Index: NewsLetterStatisticCAOImpl.java =================================================================== RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -b -r1.17 -r1.17.2.1 --- NewsLetterStatisticCAOImpl.java 23 Sep 2008 07:52:39 -0000 1.17 +++ NewsLetterStatisticCAOImpl.java 11 Feb 2009 09:08:29 -0000 1.17.2.1 @@ -260,9 +260,9 @@ query.setNodeStep(parameterStep); Queries.addSortOrders(query, "logdate", "DOWN"); query.setMaxNumber(3); - SearchUtil.addEqualConstraint(query, logNodeManager.getField("newsletter"), new Integer(newsletterId)); + SearchUtil.addEqualConstraint(query, logNodeManager.getField("newsletter"), Integer.valueOf(newsletterId)); - SearchUtil.addEqualConstraint(query, logNodeManager.getField("userid"), new Integer(userId)); + SearchUtil.addEqualConstraint(query, logNodeManager.getField("userid"), Integer.valueOf(userId)); NodeList logs = query.getList(); if (logs.size() < 2) { isLog = true; @@ -283,7 +283,7 @@ } public Node getLogNode(int userId, int newsletterId) { - log.info("-------------------logPubliction -in process...getLogNode....: "); + log.info("-------------------logPublication -in process...getLogNode....: "); NodeManager logNodeManager = cloud.getNodeManager("newsletterdailylog"); Node logNode = null; NodeQuery query = cloud.createNodeQuery(); @@ -291,10 +291,10 @@ query.setNodeStep(parameterStep); Queries.addSortOrders(query, "logdate", "DOWN"); query.setMaxNumber(1); - SearchUtil.addEqualConstraint(query, logNodeManager.getField("newsletter"), new Integer(newsletterId)); - SearchUtil.addEqualConstraint(query, logNodeManager.getField("userid"), new Integer(userId)); + SearchUtil.addEqualConstraint(query, logNodeManager.getField("newsletter"), Integer.valueOf(newsletterId)); + SearchUtil.addEqualConstraint(query, logNodeManager.getField("userid"), Integer.valueOf(userId)); FieldValueConstraint liConstraint = query.createConstraint((query.getStepField(logNodeManager - .getField("bounches"))), FieldCompareConstraint.GREATER, new Integer(0)); + .getField("bounches"))), FieldCompareConstraint.GREATER, Integer.valueOf(0)); SearchUtil.addConstraint(query, liConstraint); NodeList logs = query.getList(); if (logs != null && logs.size() > 0) { _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs