Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
In directory james.mmbase.org:/tmp/cvs-serv22463/typehandler
Modified Files:
AbstractTypeHandler.java DateHandler.java DurationHandler.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/typehandler
Index: AbstractTypeHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/AbstractTypeHandler.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- AbstractTypeHandler.java 25 Feb 2008 18:14:41 -0000 1.61
+++ AbstractTypeHandler.java 27 Feb 2008 10:49:01 -0000 1.62
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: AbstractTypeHandler.java,v 1.61 2008/02/25 18:14:41 michiel
Exp $
+ * @version $Id: AbstractTypeHandler.java,v 1.62 2008/02/27 10:49:01 michiel
Exp $
*/
public abstract class AbstractTypeHandler implements TypeHandler {
@@ -77,7 +77,7 @@
return i <= max;
}
public Entry<Integer, Integer> next() {
- Integer value = new Integer(i++);
+ Integer value = i++;
return new Entry<Integer,
Integer>(value, value);
}
public void remove() {
@@ -101,7 +101,7 @@
return i <= max;
}
public Entry<Long, Long> next() {
- Long value = new Long(i++);
+ Long value = i++;
return new Entry<Long, Long>(value,
value);
}
public void remove() {
Index: DateHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/DateHandler.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- DateHandler.java 21 Sep 2007 12:53:43 -0000 1.55
+++ DateHandler.java 27 Feb 2008 10:49:01 -0000 1.56
@@ -30,7 +30,7 @@
* @author Michiel Meeuwissen
* @author Vincent vd Locht
* @since MMBase-1.6
- * @version $Id: DateHandler.java,v 1.55 2007/09/21 12:53:43 michiel Exp $
+ * @version $Id: DateHandler.java,v 1.56 2008/02/27 10:49:01 michiel Exp $
*/
public class DateHandler extends AbstractTypeHandler {
@@ -420,7 +420,7 @@
Object time = getSpecifiedValue(field, getInstance()).getTime();
if (field.getType() != Field.TYPE_DATETIME) {
- time = new Long(Casting.toLong(time));
+ time = Casting.toLong(time);
}
// expand fieldname with nodemanager name if needed
@@ -440,7 +440,7 @@
if (field.getType() == Field.TYPE_DATETIME) {
nextTime = new Date(((Date)time).getTime() + 24 * 60 * 60
* 1000);
} else {
- nextTime = new Long(((Long)time).longValue() + 24 * 60 *
60);
+ nextTime = ((Long)time).longValue() + 24 * 60 * 60;
}
con = Queries.createConstraint(query, fieldName,
Queries.OPERATOR_BETWEEN, time, nextTime, false);
} else {
Index: DurationHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/DurationHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- DurationHandler.java 21 Sep 2007 12:53:43 -0000 1.9
+++ DurationHandler.java 27 Feb 2008 10:49:01 -0000 1.10
@@ -28,7 +28,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7.2
- * @version $Id: DurationHandler.java,v 1.9 2007/09/21 12:53:43 michiel Exp $
+ * @version $Id: DurationHandler.java,v 1.10 2008/02/27 10:49:01 michiel Exp $
*/
public class DurationHandler extends AbstractTypeHandler {
@@ -162,10 +162,10 @@
protected long getSpecifiedValue(Field field) throws JspTagException {
try {
String fieldName = field.getName();
- Integer hours = new Integer( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_hours")));
- Integer minutes = new Integer( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_minutes")));
- Integer seconds = new Integer( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_seconds")));
- Integer milliSeconds = new Integer( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_milliseconds")));
+ Integer hours = Integer.parseInt((String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_hours")));
+ Integer minutes = Integer.parseInt( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_minutes")));
+ Integer seconds = Integer.parseInt( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_seconds")));
+ Integer milliSeconds = Integer.parseInt( (String)
tag.getContextProvider().getContextContainer().find(tag.getPageContext(),
prefix(fieldName + "_milliseconds")));
return (long) milliSeconds.intValue() + 1000 *
(seconds.intValue() + 60 * (minutes.intValue() + 60 * hours.intValue()));
} catch (java.lang.NumberFormatException e) {
throw new JspTagException("Not a valid number (" + e.toString() +
")");
@@ -210,7 +210,7 @@
return null;
}
- Long time = new Long(getSpecifiedValue(field));
+ Long time = getSpecifiedValue(field);
if (query.getSteps().size() > 1) {
fieldName = field.getNodeManager().getName()+"."+fieldName;
@@ -223,7 +223,7 @@
} else if (operator.equals("equal")) {
String options = tag.getOptions();
if (options != null && options.indexOf("date") > -1) {
- con = Queries.createConstraint(query, fieldName,
Queries.OPERATOR_BETWEEN, time, new Long(time.longValue() + 24 * 60 * 60),
false);
+ con = Queries.createConstraint(query, fieldName,
Queries.OPERATOR_BETWEEN, time, time + 24 * 60 * 60, false);
} else {
con = Queries.createConstraint(query, fieldName,
FieldCompareConstraint.EQUAL, time);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
