You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/11/23 20:53:00 UTC
svn commit: r1038303 - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-examples/src/main/java/org/apache/wicket/examples/c...
Author: pete
Date: Tue Nov 23 19:52:58 2010
New Revision: 1038303
URL: http://svn.apache.org/viewvc?rev=1038303&view=rev
Log:
remove unnecessary boxing/unboxing
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/FormInputModel.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MaximumValidatorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MinimumValidatorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/InMemoryPageStore.java
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java Tue Nov 23 19:52:58 2010
@@ -64,7 +64,7 @@ public class ContactsDatabase
*/
public void delete(final Contact contact)
{
- Contact c = map.remove(new Long(contact.getId()));
+ Contact c = map.remove(contact.getId());
fnameIdx.remove(contact);
lnameIdx.remove(contact);
@@ -97,7 +97,7 @@ public class ContactsDatabase
*/
public Contact get(long id)
{
- Contact c = map.get(new Long(id));
+ Contact c = map.get(id);
if (c == null)
{
throw new RuntimeException("contact with id [" + id + "] not found in the database");
@@ -135,7 +135,7 @@ public class ContactsDatabase
protected void add(final Contact contact)
{
- map.put(new Long(contact.getId()), contact);
+ map.put(contact.getId(), contact);
fnameIdx.add(contact);
lnameIdx.add(contact);
fnameDescIdx.add(contact);
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/FormInputModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/FormInputModel.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/FormInputModel.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/FormInputModel.java Tue Nov 23 19:52:58 2010
@@ -88,11 +88,11 @@ public final class FormInputModel implem
private Date dateProperty = new Date();
- private Double doubleProperty = new Double(20.5);
+ private Double doubleProperty = 20.5;
- private Integer integerInRangeProperty = new Integer(50);
+ private Integer integerInRangeProperty = 50;
- private Integer integerProperty = new Integer(100);
+ private Integer integerProperty = 100;
private List<Line> lines = new ArrayList<Line>();
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Tue Nov 23 19:52:58 2010
@@ -600,8 +600,7 @@ public class DatePicker extends Abstract
filterEmpty(dfSymbols.getShortWeekdays()));
setWidgetProperty(widgetProperties, "WEEKDAYS_LONG", filterEmpty(dfSymbols.getWeekdays()));
- widgetProperties.put("START_WEEKDAY", new Integer(Calendar.getInstance(getLocale())
- .getFirstDayOfWeek() - 1));
+ widgetProperties.put("START_WEEKDAY", Calendar.getInstance(getLocale()).getFirstDayOfWeek() - 1);
if (Locale.SIMPLIFIED_CHINESE.equals(getLocale()) ||
Locale.TRADITIONAL_CHINESE.equals(getLocale()))
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java Tue Nov 23 19:52:58 2010
@@ -243,11 +243,10 @@ public class DateTimeField extends FormC
if (hours != null)
{
boolean use12HourFormat = use12HourFormat();
- this.date.set(DateTimeFieldType.hourOfDay(), hours.intValue() %
- (use12HourFormat ? 12 : 24));
+ this.date.set(DateTimeFieldType.hourOfDay(), hours % (use12HourFormat ? 12 : 24));
Integer minutes = getMinutes();
- this.date.setMinuteOfHour((minutes != null) ? minutes.intValue() : 0);
+ this.date.setMinuteOfHour((minutes != null) ? minutes : 0);
}
setDefaultModelObject(this.date.toDate());
@@ -319,9 +318,8 @@ public class DateTimeField extends FormC
boolean use12HourFormat = use12HourFormat();
if (hours != null)
{
- date.set(DateTimeFieldType.hourOfDay(), hours.intValue() %
- getMaximumHours(use12HourFormat));
- date.setMinuteOfHour((minutes != null) ? minutes.intValue() : 0);
+ date.set(DateTimeFieldType.hourOfDay(), hours % getMaximumHours(use12HourFormat));
+ date.setMinuteOfHour((minutes != null) ? minutes : 0);
}
if (use12HourFormat)
{
@@ -414,14 +412,14 @@ public class DateTimeField extends FormC
if (use12HourFormat)
{
int hourOfHalfDay = date.get(DateTimeFieldType.hourOfHalfday());
- hours = new Integer(hourOfHalfDay == 0 ? 12 : hourOfHalfDay);
+ hours = hourOfHalfDay == 0 ? 12 : hourOfHalfDay;
}
else
{
- hours = new Integer(date.get(DateTimeFieldType.hourOfDay()));
+ hours = date.get(DateTimeFieldType.hourOfDay());
}
amOrPm = (date.get(DateTimeFieldType.halfdayOfDay()) == 0) ? AM_PM.AM : AM_PM.PM;
- minutes = new Integer(date.getMinuteOfHour());
+ minutes = date.getMinuteOfHour();
// we don't really have to reset the date field to the server's
// timezone, as it's the same milliseconds from EPOCH anyway, and
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java Tue Nov 23 19:52:58 2010
@@ -49,7 +49,7 @@ public class CheckBoxPage extends Wicket
@Override
protected void onSubmit()
{
- if (input.bool.booleanValue())
+ if (input.bool)
{
info("Ok, ok... we'll check it");
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java Tue Nov 23 19:52:58 2010
@@ -32,7 +32,7 @@ import org.apache.wicket.validation.vali
*/
public class StatelessPage extends WebPage
{
- private final Integer number = new Integer(10);
+ private final Integer number = 10;
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java Tue Nov 23 19:52:58 2010
@@ -32,7 +32,7 @@ import org.apache.wicket.validation.vali
*/
public class StatelessPage1 extends WebPage
{
- private final Integer number = new Integer(10);
+ private final Integer number = 10;
/**
* Constructor
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java Tue Nov 23 19:52:58 2010
@@ -32,7 +32,7 @@ import org.apache.wicket.validation.vali
*/
public class StatelessPage2 extends WebPage
{
- private final Integer number = new Integer(10);
+ private final Integer number = 10;
/**
* Constructor
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Tue Nov 23 19:52:58 2010
@@ -118,10 +118,10 @@ public class AjaxEditableLabel<T> extend
protected void respond(AjaxRequestTarget target)
{
RequestCycle requestCycle = RequestCycle.get();
- boolean save = Boolean.valueOf(requestCycle.getRequest()
- .getRequestParameters()
- .getParameterValue("save")
- .toBoolean(false));
+ boolean save = requestCycle.getRequest()
+ .getRequestParameters()
+ .getParameterValue("save")
+ .toBoolean(false);
if (save)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Tue Nov 23 19:52:58 2010
@@ -141,7 +141,7 @@ public class AjaxEditableMultiLineLabel<
@Override
public Integer getObject()
{
- return new Integer(rows);
+ return rows;
}
}));
editor.add(new AttributeModifier("cols", new AbstractReadOnlyModel<Integer>()
@@ -151,7 +151,7 @@ public class AjaxEditableMultiLineLabel<
@Override
public Integer getObject()
{
- return new Integer(cols);
+ return cols;
}
}));
editor.setOutputMarkupId(true);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Tue Nov 23 19:52:58 2010
@@ -90,7 +90,7 @@ public class TabbedPanel extends Panel
*/
public TabbedPanel(String id, List<? extends ITab> tabs)
{
- super(id, new Model<Integer>(new Integer(-1)));
+ super(id, new Model<Integer>(-1));
if (tabs == null)
{
@@ -342,7 +342,7 @@ public class TabbedPanel extends Panel
throw new IndexOutOfBoundsException();
}
- setDefaultModelObject(new Integer(index));
+ setDefaultModelObject(index);
final Component component;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java Tue Nov 23 19:52:58 2010
@@ -59,7 +59,7 @@ public abstract class AbstractCheckBoxMo
*/
public final Boolean getObject()
{
- return Boolean.valueOf(isSelected());
+ return isSelected();
}
/**
Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java Tue Nov 23 19:52:58 2010
@@ -103,10 +103,10 @@ public class LazyInitProxyFactory
/**
* Primitive java types and their object wrappers
*/
- private static final List<?> PRIMITIVES = Arrays.asList(new Class[] { String.class, byte.class,
+ private static final List<?> PRIMITIVES = Arrays.asList(String.class, byte.class,
Byte.class, short.class, Short.class, int.class, Integer.class, long.class, Long.class,
float.class, Float.class, double.class, Double.class, char.class, Character.class,
- boolean.class, Boolean.class });
+ boolean.class, Boolean.class);
/**
* Create a lazy init proxy for the specified type. The target object will be located using the
@@ -297,7 +297,7 @@ public class LazyInitProxyFactory
}
else if (isHashCodeMethod(method))
{
- return new Integer(hashCode());
+ return hashCode();
}
else if (isToStringMethod(method))
{
@@ -391,7 +391,7 @@ public class LazyInitProxyFactory
}
else if (isHashCodeMethod(method))
{
- return new Integer(hashCode());
+ return hashCode();
}
else if (isToStringMethod(method))
{
Modified: wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java (original)
+++ wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java Tue Nov 23 19:52:58 2010
@@ -61,7 +61,7 @@ public class RequestLogger implements Re
org.apache.wicket.protocol.http.IRequestLogger logger = getRequestLogger();
if (logger != null)
{
- return Integer.valueOf(logger.getTotalCreatedSessions());
+ return logger.getTotalCreatedSessions();
}
return null;
}
@@ -74,7 +74,7 @@ public class RequestLogger implements Re
org.apache.wicket.protocol.http.IRequestLogger logger = getRequestLogger();
if (logger != null)
{
- return Integer.valueOf(logger.getLiveSessions().length);
+ return logger.getLiveSessions().length;
}
return null;
}
@@ -87,7 +87,7 @@ public class RequestLogger implements Re
org.apache.wicket.protocol.http.IRequestLogger logger = getRequestLogger();
if (logger != null)
{
- return Integer.valueOf(logger.getPeakSessions());
+ return logger.getPeakSessions();
}
return null;
}
Modified: wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java (original)
+++ wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java Tue Nov 23 19:52:58 2010
@@ -206,9 +206,9 @@ public class SpringBeanLocator implement
{
if (singletonCache == null)
{
- singletonCache = Boolean.valueOf(getSpringContext().isSingleton(getBeanName()));
+ singletonCache = getSpringContext().isSingleton(getBeanName());
}
- return singletonCache.booleanValue();
+ return singletonCache;
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java Tue Nov 23 19:52:58 2010
@@ -862,7 +862,7 @@ public class IntHashMap<V> implements Cl
*/
public Integer next()
{
- return new Integer(nextEntry().getKey());
+ return nextEntry().getKey();
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ByteConverter.java Tue Nov 23 19:52:58 2010
@@ -48,7 +48,7 @@ public class ByteConverter extends Abstr
return null;
}
- return new Byte(number.byteValue());
+ return number.byteValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CharacterConverter.java Tue Nov 23 19:52:58 2010
@@ -48,7 +48,7 @@ public class CharacterConverter extends
}
else if (length == 1)
{
- return new Character(value.charAt(0));
+ return value.charAt(0);
}
throw newConversionException("Cannot convert '" + value + "' to Character", value, locale);
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DoubleConverter.java Tue Nov 23 19:52:58 2010
@@ -50,7 +50,7 @@ public class DoubleConverter extends Abs
return null;
}
- return new Double(number.doubleValue());
+ return number.doubleValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/FloatConverter.java Tue Nov 23 19:52:58 2010
@@ -48,7 +48,7 @@ public class FloatConverter extends Abst
return null;
}
- return new Float(number.floatValue());
+ return number.floatValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/IntegerConverter.java Tue Nov 23 19:52:58 2010
@@ -48,7 +48,7 @@ public class IntegerConverter extends Ab
return null;
}
- return new Integer(number.intValue());
+ return number.intValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/LongConverter.java Tue Nov 23 19:52:58 2010
@@ -48,7 +48,7 @@ public class LongConverter extends Abstr
return null;
}
- return new Long(number.longValue());
+ return number.longValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ShortConverter.java Tue Nov 23 19:52:58 2010
@@ -48,7 +48,7 @@ public class ShortConverter extends Abst
return null;
}
- return new Short(number.shortValue());
+ return number.shortValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java Tue Nov 23 19:52:58 2010
@@ -71,7 +71,7 @@ public class ZeroPaddingIntegerConverter
return null;
}
- return new Integer(number.intValue());
+ return number.intValue();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java Tue Nov 23 19:52:58 2010
@@ -380,7 +380,7 @@ public class Diff extends ToString
Random r = new Random(seed);
for (int i = 0; i < result.length; i++)
{
- result[i] = new Integer(r.nextInt(size));
+ result[i] = r.nextInt(size);
}
return result;
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java Tue Nov 23 19:52:58 2010
@@ -79,13 +79,13 @@ public final class Objects
static
{
primitiveDefaults.put(Boolean.TYPE, Boolean.FALSE);
- primitiveDefaults.put(Byte.TYPE, new Byte((byte)0));
- primitiveDefaults.put(Short.TYPE, new Short((short)0));
- primitiveDefaults.put(Character.TYPE, new Character((char)0));
- primitiveDefaults.put(Integer.TYPE, new Integer(0));
- primitiveDefaults.put(Long.TYPE, new Long(0L));
- primitiveDefaults.put(Float.TYPE, new Float(0.0f));
- primitiveDefaults.put(Double.TYPE, new Double(0.0));
+ primitiveDefaults.put(Byte.TYPE, (byte) 0);
+ primitiveDefaults.put(Short.TYPE, (short) 0);
+ primitiveDefaults.put(Character.TYPE, (char) 0);
+ primitiveDefaults.put(Integer.TYPE, 0);
+ primitiveDefaults.put(Long.TYPE, 0L);
+ primitiveDefaults.put(Float.TYPE, 0.0f);
+ primitiveDefaults.put(Double.TYPE, 0.0);
primitiveDefaults.put(BigInteger.class, new BigInteger("0"));
primitiveDefaults.put(BigDecimal.class, new BigDecimal(0.0));
}
@@ -120,7 +120,7 @@ public final class Objects
}
if (c == Boolean.class)
{
- return BigDecimal.valueOf(((Boolean)value).booleanValue() ? 1 : 0);
+ return BigDecimal.valueOf((Boolean) value ? 1 : 0);
}
if (c == Character.class)
{
@@ -159,11 +159,11 @@ public final class Objects
}
if (c == Boolean.class)
{
- return BigInteger.valueOf(((Boolean)value).booleanValue() ? 1 : 0);
+ return BigInteger.valueOf((Boolean) value ? 1 : 0);
}
if (c == Character.class)
{
- return BigInteger.valueOf(((Character)value).charValue());
+ return BigInteger.valueOf((Character) value);
}
return new BigInteger(stringValue(value, true));
}
@@ -186,11 +186,11 @@ public final class Objects
Class<?> c = value.getClass();
if (c == Boolean.class)
{
- return ((Boolean)value).booleanValue();
+ return (Boolean) value;
}
if (c == Character.class)
{
- return ((Character)value).charValue() != 0;
+ return (Character) value != 0;
}
if (value instanceof Number)
{
@@ -312,11 +312,11 @@ public final class Objects
{
if ((toType == Integer.class) || (toType == Integer.TYPE))
{
- result = new Integer((int)longValue(value));
+ result = (int) longValue(value);
}
if ((toType == Double.class) || (toType == Double.TYPE))
{
- result = new Double(doubleValue(value));
+ result = doubleValue(value);
}
if ((toType == Boolean.class) || (toType == Boolean.TYPE))
{
@@ -324,19 +324,19 @@ public final class Objects
}
if ((toType == Byte.class) || (toType == Byte.TYPE))
{
- result = new Byte((byte)longValue(value));
+ result = (byte) longValue(value);
}
if ((toType == Character.class) || (toType == Character.TYPE))
{
- result = new Character((char)longValue(value));
+ result = (char) longValue(value);
}
if ((toType == Short.class) || (toType == Short.TYPE))
{
- result = new Short((short)longValue(value));
+ result = (short) longValue(value);
}
if ((toType == Long.class) || (toType == Long.TYPE))
{
- result = new Long(longValue(value));
+ result = longValue(value);
}
if ((toType == Float.class) || (toType == Float.TYPE))
{
@@ -388,11 +388,11 @@ public final class Objects
}
if (c == Boolean.class)
{
- return ((Boolean)value).booleanValue() ? 1 : 0;
+ return (Boolean) value ? 1 : 0;
}
if (c == Character.class)
{
- return ((Character)value).charValue();
+ return (Character) value;
}
String s = stringValue(value, true);
@@ -649,11 +649,11 @@ public final class Objects
}
if (c == Boolean.class)
{
- return ((Boolean)value).booleanValue() ? 1 : 0;
+ return (Boolean) value ? 1 : 0;
}
if (c == Character.class)
{
- return ((Character)value).charValue();
+ return (Character) value;
}
return Long.parseLong(stringValue(value, true));
}
@@ -677,22 +677,22 @@ public final class Objects
case BOOL :
case CHAR :
case INT :
- return new Integer((int)value);
+ return (int) value;
case FLOAT :
- return new Float(value);
+ return (float) value;
case DOUBLE :
- return new Double(value);
+ return (double) value;
case LONG :
- return new Long(value);
+ return value;
case BYTE :
- return new Byte((byte)value);
+ return (byte) value;
case SHORT :
- return new Short((short)value);
+ return (short) value;
default :
return BigInteger.valueOf(value);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java Tue Nov 23 19:52:58 2010
@@ -417,7 +417,7 @@ public class StringValue implements IClu
*/
public final Character toCharacter() throws StringValueConversionException
{
- return new Character(toChar());
+ return toChar();
}
/**
@@ -460,7 +460,7 @@ public class StringValue implements IClu
*/
public final Double toDoubleObject() throws StringValueConversionException
{
- return new Double(toDouble());
+ return toDouble();
}
/**
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java Tue Nov 23 19:52:58 2010
@@ -929,7 +929,7 @@ public final class Strings
*/
public static Boolean toBoolean(final String s) throws StringValueConversionException
{
- return Boolean.valueOf(isTrue(s));
+ return isTrue(s);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Tue Nov 23 19:52:58 2010
@@ -1487,7 +1487,7 @@ public abstract class Component
if (generatedMarkupId != -1)
{
- return new Integer(generatedMarkupId);
+ return generatedMarkupId;
}
return getMetaData(MARKUP_ID_KEY);
@@ -1546,11 +1546,11 @@ public abstract class Component
}
final int generatedMarkupId = storedMarkupId instanceof Integer
- ? ((Integer)storedMarkupId).intValue() : Session.get().nextSequenceValue();
+ ? (Integer) storedMarkupId : Session.get().nextSequenceValue();
if (storedMarkupId == null)
{
- setMarkupIdImpl(new Integer(generatedMarkupId));
+ setMarkupIdImpl(generatedMarkupId);
}
String markupIdPrefix = "id";
@@ -2763,7 +2763,7 @@ public abstract class Component
if (markupId instanceof Integer)
{
- generatedMarkupId = ((Integer)markupId).intValue();
+ generatedMarkupId = (Integer) markupId;
setMetaData(MARKUP_ID_KEY, null);
return;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java Tue Nov 23 19:52:58 2010
@@ -61,12 +61,12 @@ public class FeedbackMessage implements
static
{
- levelStrings.put(new Integer(0), "UNDEFINED");
- levelStrings.put(new Integer(100), "DEBUG");
- levelStrings.put(new Integer(200), "INFO");
- levelStrings.put(new Integer(300), "WARNING");
- levelStrings.put(new Integer(400), "ERROR");
- levelStrings.put(new Integer(500), "FATAL");
+ levelStrings.put(0, "UNDEFINED");
+ levelStrings.put(100, "DEBUG");
+ levelStrings.put(200, "INFO");
+ levelStrings.put(300, "WARNING");
+ levelStrings.put(400, "ERROR");
+ levelStrings.put(500, "FATAL");
}
/**
@@ -144,7 +144,7 @@ public class FeedbackMessage implements
*/
public String getLevelAsString()
{
- return levelStrings.get(new Integer(getLevel()));
+ return levelStrings.get(getLevel());
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java Tue Nov 23 19:52:58 2010
@@ -130,7 +130,7 @@ public class SecurePackageResourceGuard
Boolean rtn = cache.get(path);
if (rtn != null)
{
- return rtn.booleanValue();
+ return rtn;
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java Tue Nov 23 19:52:58 2010
@@ -51,7 +51,7 @@ public abstract class Loop extends Abstr
*/
public Loop(final String id, final int iterations)
{
- super(id, new Model<Integer>(new Integer(iterations)));
+ super(id, new Model<Integer>(iterations));
}
/**
@@ -73,7 +73,7 @@ public abstract class Loop extends Abstr
*/
public final int getIterations()
{
- return ((Integer)getDefaultModelObject()).intValue();
+ return (Integer) getDefaultModelObject();
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java Tue Nov 23 19:52:58 2010
@@ -242,7 +242,7 @@ public class PagingNavigation extends Lo
@Override
protected void onBeforeRender()
{
- setDefaultModel(new Model<Integer>(new Integer(pageable.getPageCount())));
+ setDefaultModel(new Model<Integer>(pageable.getPageCount()));
// PagingNavigation itself (as well as the PageableListView)
// may have pages.
@@ -392,7 +392,7 @@ public class PagingNavigation extends Lo
*/
private void setIterations(int i)
{
- setDefaultModelObject(new Integer(i));
+ setDefaultModelObject(i);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Tue Nov 23 19:52:58 2010
@@ -300,10 +300,8 @@ public class BrowserInfoForm extends Pan
properties.setNavigatorAppName(navigatorAppName);
properties.setNavigatorAppVersion(navigatorAppVersion);
properties.setNavigatorAppCodeName(navigatorAppCodeName);
- properties.setCookiesEnabled((navigatorCookieEnabled != null)
- ? navigatorCookieEnabled.booleanValue() : false);
- properties.setJavaEnabled((navigatorJavaEnabled != null)
- ? navigatorJavaEnabled.booleanValue() : false);
+ properties.setCookiesEnabled((navigatorCookieEnabled != null) ? navigatorCookieEnabled : false);
+ properties.setJavaEnabled((navigatorJavaEnabled != null) ? navigatorJavaEnabled : false);
properties.setNavigatorLanguage(navigatorLanguage);
properties.setNavigatorPlatform(navigatorPlatform);
properties.setNavigatorUserAgent(navigatorUserAgent);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java Tue Nov 23 19:52:58 2010
@@ -193,14 +193,14 @@ public class FileChannelPool
// increase the usage count for this channel
Integer count = channelToUseCount.get(channel);
- if (count == null || count.intValue() == 0)
+ if (count == null || count == 0)
{
- channelToUseCount.put(channel, new Integer(1));
+ channelToUseCount.put(channel, 1);
idleChannels.remove(channel);
}
else
{
- count = new Integer(count.intValue() + 1);
+ count = count + 1;
channelToUseCount.put(channel, count);
}
}
@@ -217,15 +217,15 @@ public class FileChannelPool
public synchronized void returnFileChannel(FileChannel channel)
{
Integer count = channelToUseCount.get(channel);
- if (count == null || count.intValue() == 0)
+ if (count == null || count == 0)
{
throw new IllegalArgumentException("Trying to return unused channel");
}
- count = new Integer(count.intValue() - 1);
+ count = count - 1;
// decrease the usage count
- if (count.intValue() == 0)
+ if (count == 0)
{
channelToUseCount.remove(channel);
if (channelsToDeleteOnReturn.contains(channel))
@@ -285,7 +285,7 @@ public class FileChannelPool
nameToChannel.remove(name);
Integer count = channelToUseCount.get(channel);
- if (count != null && count.intValue() > 0)
+ if (count != null && count > 0)
{
channelsToDeleteOnReturn.add(channel);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java Tue Nov 23 19:52:58 2010
@@ -1128,7 +1128,7 @@ public class ClientProperties implements
if (field.getType().equals(Integer.TYPE))
{
- if (((Integer)value).intValue() == -1)
+ if ((Integer) value == -1)
{
value = null;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java Tue Nov 23 19:52:58 2010
@@ -269,7 +269,7 @@ public interface IRequestLogger
*/
public Long getTimeTaken()
{
- return new Long(timeTaken);
+ return timeTaken;
}
/**
@@ -411,7 +411,7 @@ public interface IRequestLogger
*/
public Long getSessionSize()
{
- return new Long(totalSessionSize);
+ return totalSessionSize;
}
@Override
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java Tue Nov 23 19:52:58 2010
@@ -539,7 +539,7 @@ public class MockHttpServletRequest impl
{
return -1;
}
- return Integer.valueOf(value).intValue();
+ return Integer.valueOf(value);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java Tue Nov 23 19:52:58 2010
@@ -119,14 +119,14 @@ public final class ClassStreamHandler
{
classHandler = new ClassStreamHandler(cls);
handlesClasses.put(cls.getName(), classHandler);
- handlesClasses.put(new Short(classHandler.getClassId()), classHandler);
+ handlesClasses.put(classHandler.getClassId(), classHandler);
}
return classHandler;
}
static ClassStreamHandler lookup(short s)
{
- ClassStreamHandler classHandler = handlesClasses.get(new Short(s));
+ ClassStreamHandler classHandler = handlesClasses.get(s);
if (classHandler == null)
{
throw new RuntimeException("class not found for: " + s);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java Tue Nov 23 19:52:58 2010
@@ -378,11 +378,10 @@ public final class SerializableChecker e
{
try
{
- desc = (ObjectStreamClass)LOOKUP_METHOD.invoke(null, new Object[] { cls,
- Boolean.TRUE });
+ desc = (ObjectStreamClass)LOOKUP_METHOD.invoke(null, cls, Boolean.TRUE);
Class<?> repCl;
- if (!((Boolean)HAS_WRITE_REPLACE_METHOD_METHOD.invoke(desc, (Object[])null)).booleanValue() ||
- (obj = INVOKE_WRITE_REPLACE_METHOD.invoke(desc, new Object[] { obj })) == null ||
+ if (!(Boolean) HAS_WRITE_REPLACE_METHOD_METHOD.invoke(desc, (Object[]) null) ||
+ (obj = INVOKE_WRITE_REPLACE_METHOD.invoke(desc, obj)) == null ||
(repCl = obj.getClass()) == cls)
{
break;
@@ -575,7 +574,7 @@ public final class SerializableChecker e
int numFields;
try
{
- numFields = ((Integer)GET_NUM_OBJ_FIELDS_METHOD.invoke(desc, (Object[])null)).intValue();
+ numFields = (Integer) GET_NUM_OBJ_FIELDS_METHOD.invoke(desc, (Object[]) null);
}
catch (IllegalAccessException e)
{
@@ -594,7 +593,7 @@ public final class SerializableChecker e
numPrimFields = fields.length - objVals.length;
try
{
- GET_OBJ_FIELD_VALUES_METHOD.invoke(desc, new Object[] { obj, objVals });
+ GET_OBJ_FIELD_VALUES_METHOD.invoke(desc, obj, objVals);
}
catch (IllegalAccessException e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java Tue Nov 23 19:52:58 2010
@@ -451,7 +451,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Byte(readByte()));
+ values.put(key, readByte());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -466,7 +466,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Short(readShort()));
+ values.put(key, readShort());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -481,7 +481,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Character(readChar()));
+ values.put(key, readChar());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -496,7 +496,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Integer(readInt()));
+ values.put(key, readInt());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -511,7 +511,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Long(readLong()));
+ values.put(key, readLong());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -526,7 +526,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Float(readFloat()));
+ values.put(key, readFloat());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -541,7 +541,7 @@ public final class WicketObjectInputStre
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, new Double(readDouble()));
+ values.put(key, readDouble());
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -584,7 +584,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Byte)
{
- return ((Byte)o).byteValue();
+ return (Byte) o;
}
return val;
}
@@ -598,7 +598,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Character)
{
- return ((Character)o).charValue();
+ return (Character) o;
}
return val;
}
@@ -612,7 +612,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Double)
{
- return ((Double)o).doubleValue();
+ return (Double) o;
}
return val;
}
@@ -626,7 +626,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Float)
{
- return ((Float)o).floatValue();
+ return (Float) o;
}
return val;
}
@@ -640,7 +640,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Integer)
{
- return ((Integer)o).intValue();
+ return (Integer) o;
}
return val;
}
@@ -654,7 +654,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Long)
{
- return ((Long)o).longValue();
+ return (Long) o;
}
return val;
}
@@ -668,7 +668,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Short)
{
- return ((Short)o).shortValue();
+ return (Short) o;
}
return val;
}
@@ -682,7 +682,7 @@ public final class WicketObjectInputStre
Object o = values.get(name);
if (o instanceof Boolean)
{
- return ((Boolean)o).booleanValue();
+ return (Boolean) o;
}
return val;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java Tue Nov 23 19:52:58 2010
@@ -925,7 +925,7 @@ public final class PropertyResolver
*/
public Object getValue(Object object)
{
- return new Integer(Array.getLength(object));
+ return Array.getLength(object);
}
/**
@@ -963,7 +963,7 @@ public final class PropertyResolver
ArrayPropertyGetSet(Method method, int index)
{
- this.index = new Integer(index);
+ this.index = index;
getMethod = method;
getMethod.setAccessible(true);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java Tue Nov 23 19:52:58 2010
@@ -96,9 +96,8 @@ public abstract class StringValidator ex
protected Map<String, Object> variablesMap(IValidatable<String> validatable)
{
final Map<String, Object> map = super.variablesMap(validatable);
- map.put("length", (validatable.getValue() != null) ? new Integer(
- (validatable.getValue()).length()) : 0);
- map.put("exact", new Integer(length));
+ map.put("length", (validatable.getValue() != null) ? (validatable.getValue()).length() : 0);
+ map.put("exact", length);
return map;
}
@@ -178,9 +177,9 @@ public abstract class StringValidator ex
protected Map<String, Object> variablesMap(IValidatable<String> validatable)
{
final Map<String, Object> map = super.variablesMap(validatable);
- map.put("minimum", new Integer(minimum));
- map.put("maximum", new Integer(maximum));
- map.put("length", new Integer((validatable.getValue()).length()));
+ map.put("minimum", minimum);
+ map.put("maximum", maximum);
+ map.put("length", (validatable.getValue()).length());
return map;
}
@@ -244,8 +243,8 @@ public abstract class StringValidator ex
protected Map<String, Object> variablesMap(IValidatable<String> validatable)
{
final Map<String, Object> map = super.variablesMap(validatable);
- map.put("maximum", new Integer(maximum));
- map.put("length", new Integer((validatable.getValue()).length()));
+ map.put("maximum", maximum);
+ map.put("length", (validatable.getValue()).length());
return map;
}
}
@@ -308,8 +307,8 @@ public abstract class StringValidator ex
protected Map<String, Object> variablesMap(IValidatable<String> validatable)
{
final Map<String, Object> map = super.variablesMap(validatable);
- map.put("minimum", new Integer(minimum));
- map.put("length", new Integer((validatable.getValue()).length()));
+ map.put("minimum", minimum);
+ map.put("length", (validatable.getValue()).length());
return map;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java Tue Nov 23 19:52:58 2010
@@ -70,12 +70,9 @@ public final class ConvertersTest extend
public void testConversion()
{
final IConverterLocator converter = new ConverterLocator();
- assertEquals("7", converter.getConverter(Integer.class).convertToString(new Integer(7),
- Locale.US));
- assertEquals("7.1", converter.getConverter(Double.class).convertToString(new Double(7.1),
- Locale.US));
- assertEquals("7,1", converter.getConverter(Double.class).convertToString(new Double(7.1),
- DUTCH_LOCALE));
+ assertEquals("7", converter.getConverter(Integer.class).convertToString(7, Locale.US));
+ assertEquals("7.1", converter.getConverter(Double.class).convertToString(7.1, Locale.US));
+ assertEquals("7,1", converter.getConverter(Double.class).convertToString(7.1, DUTCH_LOCALE));
Calendar cal = Calendar.getInstance(DUTCH_LOCALE);
cal.clear();
@@ -110,7 +107,7 @@ public final class ConvertersTest extend
assertEquals(new BigDecimal(3000), bdc.convertToObject("3 000", Locale.FRENCH));
DoubleConverter dc = new DoubleConverter();
- assertEquals(new Double(3000), dc.convertToObject("3 000", Locale.FRENCH));
+ assertEquals((double) 3000, dc.convertToObject("3 000", Locale.FRENCH));
}
@@ -149,7 +146,7 @@ public final class ConvertersTest extend
{
ByteConverter converter = new ByteConverter();
assertEquals(new Byte((byte)10), converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString(new Byte((byte)10), Locale.US));
+ assertEquals("10", converter.convertToString((byte) 10, Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -185,8 +182,8 @@ public final class ConvertersTest extend
public void testDoubleConversions()
{
DoubleConverter converter = new DoubleConverter();
- assertEquals(new Double(1.1), converter.convertToObject("1.1", Locale.US));
- assertEquals("1.1", converter.convertToString(new Double(1.1), Locale.US));
+ assertEquals(1.1, converter.convertToObject("1.1", Locale.US));
+ assertEquals("1.1", converter.convertToString(1.1, Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -242,7 +239,7 @@ public final class ConvertersTest extend
{
IntegerConverter converter = new IntegerConverter();
assertEquals(new Integer(10), converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString(new Integer(10), Locale.US));
+ assertEquals("10", converter.convertToString(10, Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -279,7 +276,7 @@ public final class ConvertersTest extend
{
LongConverter converter = new LongConverter();
assertEquals(new Long(10), converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString(new Long(10), Locale.US));
+ assertEquals("10", converter.convertToString((long) 10, Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -316,7 +313,7 @@ public final class ConvertersTest extend
{
ShortConverter converter = new ShortConverter();
assertEquals(new Short((short)10), converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString(new Short((short)10), Locale.US));
+ assertEquals("10", converter.convertToString((short) 10, Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java Tue Nov 23 19:52:58 2010
@@ -55,11 +55,11 @@ public class ObjectsTest extends WicketT
assertTrue(Objects.equal(null, null));
assertFalse(Objects.equal(new Object(), new Object()));
- assertTrue(Objects.equal(new Integer(1), new Integer(1)));
- assertFalse(Objects.equal("1", new Integer(1)));
- assertFalse(Objects.equal(new Integer(1), "1"));
- assertTrue(Objects.equal("1", new Integer(1).toString()));
- assertTrue(Objects.equal(new Integer(1).toString(), "1"));
+ assertTrue(Objects.equal(1, 1));
+ assertFalse(Objects.equal("1", 1));
+ assertFalse(Objects.equal(1, "1"));
+ assertTrue(Objects.equal("1", Integer.toString(1)));
+ assertTrue(Objects.equal(Integer.toString(1), "1"));
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Tue Nov 23 19:52:58 2010
@@ -77,11 +77,11 @@ public class PropertyResolverTest extend
public void testPrimitiveValue() throws Exception
{
Integer integer = (Integer)PropertyResolver.getValue("age", person);
- assertTrue(integer.intValue() == 0);
+ assertTrue(integer == 0);
- PropertyResolver.setValue("age", person, new Integer(10), CONVERTER);
+ PropertyResolver.setValue("age", person, 10, CONVERTER);
integer = (Integer)PropertyResolver.getValue("age", person);
- assertTrue(integer.intValue() == 10);
+ assertTrue(integer == 10);
try
{
@@ -308,9 +308,9 @@ public class PropertyResolverTest extend
addresses.add(new Address());
person.setAddressList(addresses);
Object size = PropertyResolver.getValue("addressList.size", person);
- assertEquals(size, new Integer(2));
+ assertEquals(size, 2);
size = PropertyResolver.getValue("addressList.size()", person);
- assertEquals(size, new Integer(2));
+ assertEquals(size, 2);
}
@@ -327,7 +327,7 @@ public class PropertyResolverTest extend
Object addressFromMap = PropertyResolver.getValue("addressMap.size", person);
assertEquals(addressFromMap, address);
Object size = PropertyResolver.getValue("addressMap.size()", person);
- assertEquals(size, new Integer(2));
+ assertEquals(size, 2);
}
/**
@@ -337,9 +337,9 @@ public class PropertyResolverTest extend
{
person.setAddressArray(new Address[] { new Address(), new Address() });
Object size = PropertyResolver.getValue("addressArray.length", person);
- assertEquals(size, new Integer(2));
+ assertEquals(size, 2);
size = PropertyResolver.getValue("addressArray.size", person);
- assertEquals(size, new Integer(2));
+ assertEquals(size, 2);
}
/**
@@ -476,10 +476,10 @@ public class PropertyResolverTest extend
{
Person person = new Person();
- PropertyResolver.setValue("onlyGetterPrimitive", person, new Integer(1), CONVERTER);
+ PropertyResolver.setValue("onlyGetterPrimitive", person, 1, CONVERTER);
assertEquals(person.getOnlyGetterPrimitive(), 1);
- assertEquals(PropertyResolver.getValue("onlyGetterPrimitive", person), new Integer(1));
+ assertEquals(PropertyResolver.getValue("onlyGetterPrimitive", person), 1);
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MaximumValidatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MaximumValidatorTest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MaximumValidatorTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MaximumValidatorTest.java Tue Nov 23 19:52:58 2010
@@ -37,19 +37,19 @@ public class MaximumValidatorTest extend
{
IValidator<Double> validator = new MaximumValidator<Double>(1.8);
- Validatable<Double> validatable = new Validatable<Double>(new Double(-100.8));
+ Validatable<Double> validatable = new Validatable<Double>(-100.8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1));
+ validatable = new Validatable<Double>((double) 1);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1.8));
+ validatable = new Validatable<Double>(1.8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(2));
+ validatable = new Validatable<Double>((double) 2);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
}
@@ -62,19 +62,19 @@ public class MaximumValidatorTest extend
{
IValidator<Integer> validator = new MaximumValidator<Integer>(8);
- Validatable<Integer> validatable = new Validatable<Integer>(new Integer(-100));
+ Validatable<Integer> validatable = new Validatable<Integer>(-100);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(1));
+ validatable = new Validatable<Integer>(1);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(8));
+ validatable = new Validatable<Integer>(8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(9));
+ validatable = new Validatable<Integer>(9);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MinimumValidatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MinimumValidatorTest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MinimumValidatorTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/MinimumValidatorTest.java Tue Nov 23 19:52:58 2010
@@ -35,19 +35,19 @@ public class MinimumValidatorTest extend
{
IValidator<Double> validator = new MinimumValidator<Double>(1.8);
- Validatable<Double> validatable = new Validatable<Double>(new Double(-100.8));
+ Validatable<Double> validatable = new Validatable<Double>(-100.8);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1));
+ validatable = new Validatable<Double>((double) 1);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1.8));
+ validatable = new Validatable<Double>(1.8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(2));
+ validatable = new Validatable<Double>((double) 2);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
}
@@ -60,19 +60,19 @@ public class MinimumValidatorTest extend
{
IValidator<Integer> validator = new MinimumValidator<Integer>(8);
- Validatable<Integer> validatable = new Validatable<Integer>(new Integer(-100));
+ Validatable<Integer> validatable = new Validatable<Integer>(-100);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(1));
+ validatable = new Validatable<Integer>(1);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(8));
+ validatable = new Validatable<Integer>(8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(9));
+ validatable = new Validatable<Integer>(9);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/RangeValidatorTest.java Tue Nov 23 19:52:58 2010
@@ -36,23 +36,23 @@ public class RangeValidatorTest extends
{
IValidator<Double> validator = new RangeValidator<Double>(1.1, 1.8);
- Validatable<Double> validatable = new Validatable<Double>(new Double(1));
+ Validatable<Double> validatable = new Validatable<Double>((double) 1);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1.1));
+ validatable = new Validatable<Double>(1.1);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1.5));
+ validatable = new Validatable<Double>(1.5);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(1.8));
+ validatable = new Validatable<Double>(1.8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Double>(new Double(2));
+ validatable = new Validatable<Double>((double) 2);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
}
@@ -65,23 +65,23 @@ public class RangeValidatorTest extends
{
IValidator<Integer> validator = new RangeValidator<Integer>(1, 8);
- Validatable<Integer> validatable = new Validatable<Integer>(new Integer(0));
+ Validatable<Integer> validatable = new Validatable<Integer>(0);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(1));
+ validatable = new Validatable<Integer>(1);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(5));
+ validatable = new Validatable<Integer>(5);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(8));
+ validatable = new Validatable<Integer>(8);
validator.validate(validatable);
assertEquals(0, validatable.getErrors().size());
- validatable = new Validatable<Integer>(new Integer(9));
+ validatable = new Validatable<Integer>(9);
validator.validate(validatable);
assertEquals(1, validatable.getErrors().size());
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/InMemoryPageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/InMemoryPageStore.java?rev=1038303&r1=1038302&r2=1038303&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/InMemoryPageStore.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/InMemoryPageStore.java Tue Nov 23 19:52:58 2010
@@ -55,7 +55,7 @@ class InMemoryPageStore implements IData
final Map<Integer, byte[]> sessionPages = store.get(sessionId);
if (sessionPages != null)
{
- pageAsBytes = sessionPages.get(Integer.valueOf(pageId));
+ pageAsBytes = sessionPages.get(pageId);
}
return pageAsBytes;
@@ -69,7 +69,7 @@ class InMemoryPageStore implements IData
final Map<Integer, byte[]> sessionPages = store.get(sessionId);
if (sessionPages != null)
{
- sessionPages.remove(Integer.valueOf(pageId));
+ sessionPages.remove(pageId);
}
}
@@ -93,7 +93,7 @@ class InMemoryPageStore implements IData
store.put(sessionId, sessionPages);
}
- sessionPages.put(Integer.valueOf(pageId), pageAsBytes);
+ sessionPages.put(pageId, pageAsBytes);
}
/**