Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers
In directory james.mmbase.org:/tmp/cvs-serv22463/containers
Modified Files:
QueryAgeConstraintTag.java QueryAliasConstraintTag.java
QueryTypeConstraintTag.java
Log Message:
using autoboxing to simply things a bit
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers
Index: QueryAgeConstraintTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers/QueryAgeConstraintTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- QueryAgeConstraintTag.java 10 Feb 2007 16:49:27 -0000 1.7
+++ QueryAgeConstraintTag.java 27 Feb 2008 10:49:01 -0000 1.8
@@ -23,7 +23,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: QueryAgeConstraintTag.java,v 1.7 2007/02/10 16:49:27 nklasens
Exp $
+ * @version $Id: QueryAgeConstraintTag.java,v 1.8 2008/02/27 10:49:01 michiel
Exp $
* @see org.mmbase.module.builders.DayMarkers
*/
public class QueryAgeConstraintTag extends CloudReferrerTag implements
QueryContainerReferrer {
@@ -73,7 +73,7 @@
NodeQuery query = dayMarks.createQuery();
StepField step = query.createStepField("daycount");
int currentDay = (int) (System.currentTimeMillis()/(1000*60*60*24));
- Integer day = new Integer(currentDay - age);
+ Integer day = currentDay - age;
if (log.isDebugEnabled()) {
log.debug("today : " + currentDay + " requested " + day);
}
@@ -129,17 +129,17 @@
int maxMarker = getDayMark(maxAgeInt);
if (maxMarker > 0) {
// BETWEEN constraint
- newConstraint = query.createConstraint(stepField, new
Integer(maxMarker + 1), new Integer(getDayMark(minAgeInt - 1)));
+ newConstraint = query.createConstraint(stepField, maxMarker +
1, Integer.valueOf(getDayMark(minAgeInt - 1)));
} else {
- newConstraint = query.createConstraint(stepField,
FieldCompareConstraint.LESS_EQUAL, new Integer(getDayMark(minAgeInt - 1)));
+ newConstraint = query.createConstraint(stepField,
FieldCompareConstraint.LESS_EQUAL, Integer.valueOf(getDayMark(minAgeInt - 1)));
}
} else if (maxAgeInt != -1) { // only on max
int maxMarker = getDayMark(maxAgeInt);
if (maxMarker > 0) {
- newConstraint = query.createConstraint(stepField,
FieldCompareConstraint.GREATER_EQUAL, new Integer(maxMarker + 1));
+ newConstraint = query.createConstraint(stepField,
FieldCompareConstraint.GREATER_EQUAL, Integer.valueOf(maxMarker + 1));
}
} else if (minAgeInt > 0) {
- newConstraint = query.createConstraint(stepField,
FieldCompareConstraint.LESS_EQUAL, new Integer(getDayMark(minAgeInt - 1)));
+ newConstraint = query.createConstraint(stepField,
FieldCompareConstraint.LESS_EQUAL, Integer.valueOf(getDayMark(minAgeInt - 1)));
} else {
// both unspecified
}
Index: QueryAliasConstraintTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers/QueryAliasConstraintTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- QueryAliasConstraintTag.java 18 Jul 2007 07:50:47 -0000 1.10
+++ QueryAliasConstraintTag.java 27 Feb 2008 10:49:01 -0000 1.11
@@ -23,7 +23,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: QueryAliasConstraintTag.java,v 1.10 2007/07/18 07:50:47
michiel Exp $
+ * @version $Id: QueryAliasConstraintTag.java,v 1.11 2008/02/27 10:49:01
michiel Exp $
*/
public class QueryAliasConstraintTag extends CloudReferrerTag implements
QueryContainerReferrer {
@@ -57,7 +57,7 @@
protected Integer getAlias(String name) throws JspTagException {
Cloud cloud = getCloudVar();
Node node = cloud.getNode(name);
- return new Integer(node.getNumber());
+ return node.getNumber();
}
protected SortedSet<Integer> getAliases(List<String> names) throws
JspTagException {
Index: QueryTypeConstraintTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers/QueryTypeConstraintTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- QueryTypeConstraintTag.java 18 Jul 2007 07:50:47 -0000 1.7
+++ QueryTypeConstraintTag.java 27 Feb 2008 10:49:01 -0000 1.8
@@ -23,7 +23,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: QueryTypeConstraintTag.java,v 1.7 2007/07/18 07:50:47 michiel
Exp $
+ * @version $Id: QueryTypeConstraintTag.java,v 1.8 2008/02/27 10:49:01 michiel
Exp $
*/
public class QueryTypeConstraintTag extends CloudReferrerTag implements
QueryContainerReferrer {
@@ -66,11 +66,11 @@
boolean desc = descendants.getBoolean(this, true);
while (i.hasNext()) {
NodeManager nm = cloud.getNodeManager(i.next());
- set.add(new Integer(nm.getNumber()));
+ set.add(nm.getNumber());
if (desc) {
NodeManagerIterator j =
nm.getDescendants().nodeManagerIterator();
while (j.hasNext()) {
- set.add(new Integer(j.nextNodeManager().getNumber()));
+ set.add(j.nextNodeManager().getNumber());
}
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
