You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2007/08/08 21:59:40 UTC
svn commit: r564006 - in
/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools: ./
generic/ view/
Author: nbubna
Date: Wed Aug 8 12:59:37 2007
New Revision: 564006
URL: http://svn.apache.org/viewvc?view=rev&rev=564006
Log:
use more efficient valueOf() factories for numbers and booleans (FindBugs)
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ConversionUtils.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DateTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ListTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/MathTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ConversionUtils.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ConversionUtils.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ConversionUtils.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ConversionUtils.java Wed Aug 8 12:59:37 2007
@@ -186,12 +186,12 @@
}
if (obj instanceof Date)
{
- return new Long(((Date)obj).getTime());
+ return Long.valueOf(((Date)obj).getTime());
}
if (obj instanceof Calendar)
{
Date date = ((Calendar)obj).getTime();
- return new Long(date.getTime());
+ return Long.valueOf(date.getTime());
}
return null;
}
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java Wed Aug 8 12:59:37 2007
@@ -118,14 +118,14 @@
static
{
Map units = new LinkedHashMap(8);
- units.put(MILLISECOND_KEY, new Long(1));
- units.put(SECOND_KEY, new Long(MILLIS_PER_SECOND));
- units.put(MINUTE_KEY, new Long(MILLIS_PER_MINUTE));
- units.put(HOUR_KEY, new Long(MILLIS_PER_HOUR));
- units.put(DAY_KEY, new Long(MILLIS_PER_DAY));
- units.put(WEEK_KEY, new Long(MILLIS_PER_WEEK));
- units.put(MONTH_KEY, new Long(MILLIS_PER_MONTH));
- units.put(YEAR_KEY, new Long(MILLIS_PER_YEAR));
+ units.put(MILLISECOND_KEY, Long.valueOf(1));
+ units.put(SECOND_KEY, Long.valueOf(MILLIS_PER_SECOND));
+ units.put(MINUTE_KEY, Long.valueOf(MILLIS_PER_MINUTE));
+ units.put(HOUR_KEY, Long.valueOf(MILLIS_PER_HOUR));
+ units.put(DAY_KEY, Long.valueOf(MILLIS_PER_DAY));
+ units.put(WEEK_KEY, Long.valueOf(MILLIS_PER_WEEK));
+ units.put(MONTH_KEY, Long.valueOf(MILLIS_PER_MONTH));
+ units.put(YEAR_KEY, Long.valueOf(MILLIS_PER_YEAR));
TIME_UNITS = Collections.unmodifiableMap(units);
}
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java Wed Aug 8 12:59:37 2007
@@ -209,7 +209,7 @@
return (Integer)value;
}
Number num = toNumber(value);
- return new Integer(num.intValue());
+ return Integer.valueOf(num.intValue());
}
/**
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DateTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DateTool.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DateTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DateTool.java Wed Aug 8 12:59:37 2007
@@ -288,7 +288,7 @@
{
return null;
}
- return new Integer(cal.get(field));
+ return Integer.valueOf(cal.get(field));
}
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ListTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ListTool.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ListTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ListTool.java Wed Aug 8 12:59:37 2007
@@ -194,14 +194,14 @@
if (isArray(list))
{
// Thanks to Eric Fixler for this refactor.
- return new Integer(Array.getLength(list));
+ return Integer.valueOf(Array.getLength(list));
}
if (!isList(list))
{
return null;
}
- return new Integer(((List) list).size());
+ return Integer.valueOf(((List) list).size());
}
/**
@@ -241,7 +241,7 @@
return null;
}
- return new Boolean(size.intValue() == 0);
+ return Boolean.valueOf(size.intValue() == 0);
}
/**
@@ -261,7 +261,7 @@
return null;
}
- return new Boolean(((List) list).contains(element));
+ return Boolean.valueOf(((List) list).contains(element));
}
/**
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/MathTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/MathTool.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/MathTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/MathTool.java Wed Aug 8 12:59:37 2007
@@ -180,7 +180,7 @@
return null;
}
int value = n1.intValue() / n2.intValue();
- return new Integer(value);
+ return Integer.valueOf(value);
}
@@ -205,7 +205,7 @@
return null;
}
int value = n1.intValue() % n2.intValue();
- return new Integer(value);
+ return Integer.valueOf(value);
}
@@ -279,7 +279,7 @@
{
return null;
}
- return new Integer((int)Math.ceil(n.doubleValue()));
+ return Integer.valueOf((int)Math.ceil(n.doubleValue()));
}
@@ -294,7 +294,7 @@
{
return null;
}
- return new Integer((int)Math.floor(n.doubleValue()));
+ return Integer.valueOf((int)Math.floor(n.doubleValue()));
}
@@ -313,7 +313,7 @@
{
return null;
}
- return new Integer((int)Math.rint(n.doubleValue()));
+ return Integer.valueOf((int)Math.rint(n.doubleValue()));
}
@@ -422,7 +422,7 @@
{
return null;
}
- return new Integer(n.intValue());
+ return Integer.valueOf(n.intValue());
}
@@ -514,11 +514,11 @@
}
else if (out > Integer.MAX_VALUE || out < Integer.MIN_VALUE)
{
- return new Long((long)out);
+ return Long.valueOf((long)out);
}
else
{
- return new Integer((int)out);
+ return Integer.valueOf((int)out);
}
}
@@ -529,14 +529,14 @@
if (value.indexOf('.') < 0)
{
// check for large numbers
- long i = new Long(value).longValue();
+ long i = Long.valueOf(value).longValue();
if (i > Integer.MAX_VALUE || i < Integer.MIN_VALUE)
{
- return new Long(i);
+ return Long.valueOf(i);
}
else
{
- return new Integer((int)i);
+ return Integer.valueOf((int)i);
}
}
else
@@ -759,7 +759,7 @@
{
result += values[i];
}
- return new Long(result);
+ return Long.valueOf(result);
}
/**
Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java?view=diff&rev=564006&r1=564005&r2=564006
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java Wed Aug 8 12:59:37 2007
@@ -380,7 +380,7 @@
{
return null;
}
- return new Integer(Math.min(getTotal() - 1, index + itemsPerPage - 1));
+ return Integer.valueOf(Math.min(getTotal() - 1, index + itemsPerPage - 1));
}
/**
@@ -396,7 +396,7 @@
int next = index + itemsPerPage;
if (next < getTotal())
{
- return new Integer(next);
+ return Integer.valueOf(next);
}
return null;
}
@@ -419,7 +419,7 @@
{
return null;
}
- return new Integer(Math.min(getTotal() - 1, index));
+ return Integer.valueOf(Math.min(getTotal() - 1, index));
}
/**
@@ -435,7 +435,7 @@
int prev = Math.min(index, getTotal()) - itemsPerPage;
if (index > 0)
{
- return new Integer(Math.max(0, prev));
+ return Integer.valueOf(Math.max(0, prev));
}
return null;
}
@@ -482,7 +482,7 @@
{
return null;
}
- return new Integer(1 + i / itemsPerPage);
+ return Integer.valueOf(1 + i / itemsPerPage);
}
@@ -597,7 +597,7 @@
List slip = new ArrayList(slipEnd - slipStart);
for (int i=slipStart; i < slipEnd; i++)
{
- slip.add(new Integer(i * itemsPerPage));
+ slip.add(Integer.valueOf(i * itemsPerPage));
}
return slip;
}