Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv22463
Modified Files:
ContextReferrerTag.java CountRelationsTag.java FieldTag.java
FormatterTag.java IndexTag.java NodeInfoTag.java NodeTag.java
SizeTag.java WriterHelper.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
Index: ContextReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContextReferrerTag.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- ContextReferrerTag.java 25 Oct 2007 17:20:24 -0000 1.102
+++ ContextReferrerTag.java 27 Feb 2008 10:49:01 -0000 1.103
@@ -33,7 +33,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ContextReferrerTag.java,v 1.102 2007/10/25 17:20:24 michiel
Exp $
+ * @version $Id: ContextReferrerTag.java,v 1.103 2008/02/27 10:49:01 michiel
Exp $
* @see ContextTag
*/
@@ -399,11 +399,11 @@
protected Integer getAttributeInteger(String i, int def) throws
JspTagException {
try {
i = getAttributeValue(i);
- if (i.length() == 0) return new Integer(def);
- return new Integer(i);
+ if (i.length() == 0) return def;
+ return Integer.parseInt(i);
} catch (NumberFormatException e) { // try first if it was a float
try {
- return new Integer(new java.math.BigDecimal(i).intValue());
+ return new java.math.BigDecimal(i).intValue();
} catch (NumberFormatException e2) {
throw new TaglibException(i + " is not an integer value ", e2);
}
Index: CountRelationsTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/CountRelationsTag.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- CountRelationsTag.java 7 Dec 2006 13:21:34 -0000 1.26
+++ CountRelationsTag.java 27 Feb 2008 10:49:01 -0000 1.27
@@ -20,7 +20,7 @@
*
* @author Jaco de Groot
* @author Michiel Meeuwissen
- * @version $Id: CountRelationsTag.java,v 1.26 2006/12/07 13:21:34 michiel Exp
$
+ * @version $Id: CountRelationsTag.java,v 1.27 2008/02/27 10:49:01 michiel Exp
$
*/
public class CountRelationsTag extends NodeReferrerTag implements Writer {
@@ -62,7 +62,7 @@
if (direction == null) direction = "BOTH";
String r = (String) role.getValue(this);
if ("".equals(r)) r = null;
- helper.setValue(new Integer(node.countRelatedNodes(other, r,
direction)));
+ helper.setValue(node.countRelatedNodes(other, r, direction));
}
if (getId() != null) {
getContextProvider().getContextContainer().register(getId(),
helper.getValue());
Index: FieldTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldTag.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- FieldTag.java 22 Jan 2008 11:03:37 -0000 1.71
+++ FieldTag.java 27 Feb 2008 10:49:01 -0000 1.72
@@ -25,7 +25,7 @@
* The FieldTag can be used as a child of a 'NodeProvider' tag.
*
* @author Michiel Meeuwissen
- * @version $Id: FieldTag.java,v 1.71 2008/01/22 11:03:37 michiel Exp $
+ * @version $Id: FieldTag.java,v 1.72 2008/02/27 10:49:01 michiel Exp $
*/
public class FieldTag extends FieldReferrerTag implements FieldProvider,
Writer {
@@ -271,16 +271,16 @@
break;
case Field.TYPE_INTEGER:
case Field.TYPE_NODE:
- value = new Integer(node.getIntValue(fieldName));
+ value = node.getIntValue(fieldName);
break;
case Field.TYPE_DOUBLE:
- value = new Double(node.getDoubleValue(fieldName));
+ value = node.getDoubleValue(fieldName);
break;
case Field.TYPE_LONG:
- value = new Long(node.getLongValue(fieldName));
+ value = node.getLongValue(fieldName);
break;
case Field.TYPE_FLOAT:
- value = new Float(node.getFloatValue(fieldName));
+ value = node.getFloatValue(fieldName);
break;
case Field.TYPE_DATETIME:
value = node.getValue(fieldName);
Index: FormatterTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FormatterTag.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- FormatterTag.java 18 Jul 2007 07:50:47 -0000 1.76
+++ FormatterTag.java 27 Feb 2008 10:49:01 -0000 1.77
@@ -42,7 +42,7 @@
*
* @since MMBase-1.6
* @author Michiel Meeuwissen
- * @version $Id: FormatterTag.java,v 1.76 2007/07/18 07:50:47 michiel Exp $
+ * @version $Id: FormatterTag.java,v 1.77 2008/02/27 10:49:01 michiel Exp $
*/
public class FormatterTag extends CloudReferrerTag implements ParamHandler {
@@ -433,7 +433,7 @@
}
// iso 8601 for date/time
dateFormat.applyPattern(pattern);
- Date datum = new Date((new Long(body)).longValue() * 1000);
+ Date datum = new Date(Long.parseLong(body) * 1000);
helper.setValue(dateFormat.format(datum));
break;
default:
Index: IndexTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/IndexTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- IndexTag.java 27 Sep 2006 20:48:26 -0000 1.22
+++ IndexTag.java 27 Feb 2008 10:49:01 -0000 1.23
@@ -22,7 +22,7 @@
* The index of current item of a list.
*
* @author Michiel Meeuwissen
- * @version $Id: IndexTag.java,v 1.22 2006/09/27 20:48:26 michiel Exp $
+ * @version $Id: IndexTag.java,v 1.23 2008/02/27 10:49:01 michiel Exp $
*/
public class IndexTag extends ListReferrerTag implements Writer,
QueryContainerReferrer {
@@ -73,7 +73,7 @@
}
}
- helper.setValue(new Integer(index));
+ helper.setValue(index);
if (getId() != null) {
getContextProvider().getContextContainer().register(getId(),
helper.getValue());
}
Index: NodeInfoTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeInfoTag.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- NodeInfoTag.java 29 Sep 2006 10:06:03 -0000 1.42
+++ NodeInfoTag.java 27 Feb 2008 10:49:01 -0000 1.43
@@ -25,7 +25,7 @@
* like what its nodemanager is.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeInfoTag.java,v 1.42 2006/09/29 10:06:03 michiel Exp $
+ * @version $Id: NodeInfoTag.java,v 1.43 2008/02/27 10:49:01 michiel Exp $
*/
public class NodeInfoTag extends NodeReferrerTag implements Writer {
@@ -93,9 +93,9 @@
switch(t) {
case TYPE_NODENUMBER:
if (nodeManagerAtt == Attribute.NULL) { // living as NodeReferrer
- show = new Integer(getNode().getNumber());
+ show = getNode().getNumber();
} else {
- show = new Integer(nodeManager.getNumber());
+ show = nodeManager.getNumber();
}
break;
case TYPE_CONTEXT:
Index: NodeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeTag.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- NodeTag.java 13 Nov 2007 16:52:45 -0000 1.73
+++ NodeTag.java 27 Feb 2008 10:49:01 -0000 1.74
@@ -27,7 +27,7 @@
*
* @author Rob Vermeulen
* @author Michiel Meeuwissen
- * @version $Id: NodeTag.java,v 1.73 2007/11/13 16:52:45 michiel Exp $
+ * @version $Id: NodeTag.java,v 1.74 2008/02/27 10:49:01 michiel Exp $
*/
public class NodeTag extends AbstractNodeProviderTag implements BodyTag {
@@ -36,7 +36,6 @@
private Attribute number = Attribute.NULL;
private Attribute element = Attribute.NULL;
-
private Attribute notfound = Attribute.NULL;
/**
@@ -62,16 +61,6 @@
public void setNotfound(String i) throws JspTagException {
notfound = getAttribute(i);
}
- /**
- * This function cannot be added because of Orion.
- * It will call this function even if you use an attribute without <%= %>,
stupidly.
-
- public void setNumber(int number) throws JspTagException {
- this.number = new Integer(number).toString();
- }
-
- */
-
/**
* The element attribute is used to access elements of
Index: SizeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/SizeTag.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- SizeTag.java 10 Feb 2007 16:49:27 -0000 1.27
+++ SizeTag.java 27 Feb 2008 10:49:01 -0000 1.28
@@ -23,7 +23,7 @@
* The size of a list or of a nodelistcontainer (then the query is consulted).
*
* @author Michiel Meeuwissen
- * @version $Id: SizeTag.java,v 1.27 2007/02/10 16:49:27 nklasens Exp $
+ * @version $Id: SizeTag.java,v 1.28 2008/02/27 10:49:01 michiel Exp $
*/
public class SizeTag extends ListReferrerTag implements Writer,
QueryContainerReferrer {
@@ -45,7 +45,7 @@
int res = Queries.count(query) - query.getOffset();
int max = query.getMaxNumber();
if (max > -1 && res > max) { res = max; }
- helper.setValue(new Integer(res));
+ helper.setValue(res);
}
/**
@@ -53,7 +53,7 @@
* @since MMBase-1.7
*/
protected void listProviderSize(LoopTag list) throws JspTagException {
- helper.setValue(new Integer(list.getLoopStatus().getCount()));
+ helper.setValue(list.getLoopStatus().getCount());
}
@@ -64,7 +64,7 @@
}
QueryContainer c = findParentTag(QueryContainer.class, (String)
container.getValue(this));
if (c instanceof TreeContainerTag) {
- helper.setValue(new
Integer(((TreeContainerTag)c).getTree().size()));
+ helper.setValue(((TreeContainerTag)c).getTree().size());
} else {
nodeListContainerSize(c);
}
@@ -73,7 +73,7 @@
} else {
Tag tag = findLoopOrQuery(null, true);
if (tag instanceof TreeContainerTag) {
- helper.setValue(new
Integer(((TreeContainerTag)tag).getTree().size()));
+ helper.setValue(((TreeContainerTag)tag).getTree().size());
} else if (tag instanceof QueryContainer) {
nodeListContainerSize((QueryContainer) tag);
} else {
Index: WriterHelper.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/WriterHelper.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- WriterHelper.java 9 Aug 2007 13:35:12 -0000 1.95
+++ WriterHelper.java 27 Feb 2008 10:49:01 -0000 1.96
@@ -27,7 +27,7 @@
* they can't extend, but that's life.
*
* @author Michiel Meeuwissen
- * @version $Id: WriterHelper.java,v 1.95 2007/08/09 13:35:12 michiel Exp $
+ * @version $Id: WriterHelper.java,v 1.96 2008/02/27 10:49:01 michiel Exp $
*/
public class WriterHelper {
@@ -361,17 +361,17 @@
break;
case TYPE_DOUBLE:
if (! (v instanceof Double)) {
- v = new Double(Casting.toDouble(v));
+ v = Casting.toDouble(v);
}
break;
case TYPE_LONG:
if (! (v instanceof Long)) {
- v = new Long(Casting.toLong(v));
+ v = Casting.toLong(v);
}
break;
case TYPE_FLOAT:
if (! (v instanceof Float)) {
- v = new Float(Casting.toFloat(v));
+ v = Casting.toFloat(v);
}
break;
case TYPE_DECIMAL:
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
