Author: jcompagner
Date: Sun Dec 16 09:33:29 2007
New Revision: 604658
URL: http://svn.apache.org/viewvc?rev=604658&view=rev
Log:
code cleanup: WICKET-830 (java 5)
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
Sun Dec 16 09:33:29 2007
@@ -109,7 +109,7 @@
*/
public Integer getNrOfVotes()
{
- return new Integer(nrOfVotes);
+ return nrOfVotes;
}
/**
@@ -132,7 +132,7 @@
*/
public Double getRating()
{
- return new Double(rating);
+ return rating;
}
/**
@@ -180,9 +180,9 @@
RatingsPage.rating1.addRating(rating);
}
});
- add(new RatingPanel("rating2", new PropertyModel(rating2,
"rating"), new Model(new Integer(
- 5)), new PropertyModel(rating2, "nrOfVotes"),
new PropertyModel(this, "hasVoted"),
- true)
+ add(new RatingPanel("rating2", new PropertyModel(rating2,
"rating"),
+ new Model(5), new
PropertyModel(rating2, "nrOfVotes"),
+ new PropertyModel(this,
"hasVoted"), true)
{
protected String getActiveStarUrl(int iteration)
{
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
Sun Dec 16 09:33:29 2007
@@ -40,8 +40,7 @@
"Java.Net" });
/** available numbers for selection. */
- private static final List INTEGERS = Arrays.asList(new Integer[] { new
Integer(1),
- new Integer(2), new Integer(3) });
+ private static final List INTEGERS = Arrays.asList(new Integer[] {1, 2,
3});
/**
* Constructor
@@ -98,7 +97,7 @@
// your business
// object or in a utility.
String stringrep;
- int value = ((Integer)object).intValue();
+ int value = (Integer) object;
switch (value)
{
case 1 :
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
Sun Dec 16 09:33:29 2007
@@ -110,7 +110,7 @@
public String text = "some text";
/** an integer. */
- public Integer integer = new Integer(12);
+ public Integer integer = 12;
/**
* @see java.lang.Object#toString()
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
Sun Dec 16 09:33:29 2007
@@ -80,8 +80,7 @@
{
return "Disable request recording";
}
- };
-
+ }
}));
add(link);
add(new Label("totalSessions", new Model()
@@ -90,7 +89,7 @@
public Object getObject()
{
- return new
Integer(getRequestLogger().getTotalCreatedSessions());
+ return
getRequestLogger().getTotalCreatedSessions();
}
}));
add(new Label("peakSessions", new Model()
@@ -99,7 +98,7 @@
public Object getObject()
{
- return new
Integer(getRequestLogger().getPeakSessions());
+ return getRequestLogger().getPeakSessions();
}
}));
add(new Label("liveSessions", new Model()
@@ -108,7 +107,7 @@
public Object getObject()
{
- return new
Integer(getRequestLogger().getPeakSessions());
+ return getRequestLogger().getPeakSessions();
}
}));
@@ -145,8 +144,8 @@
link.add(new Label("id", new
Model(sd.getSessionId())));
item.add(link);
item.add(new Label("lastRequestTime", new
Model(sdf.format(sd.getLastActive()))));
- item.add(new Label("requestCount", new
Model(new Long(sd.getNumberOfRequests()))));
- item.add(new Label("requestsTime", new
Model(new Long(sd.getTotalTimeTaken()))));
+ item.add(new Label("requestCount", new
Model(sd.getNumberOfRequests())));
+ item.add(new Label("requestsTime", new
Model(sd.getTotalTimeTaken())));
item.add(new Label("sessionSize", new
Model(Bytes.bytes(sd.getSessionSize()))));
}
};
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
Sun Dec 16 09:33:29 2007
@@ -73,8 +73,8 @@
add(new Label("startDate", new
Model(sdf.format(sessionData.getStartDate()))));
add(new Label("lastRequestTime", new
Model(sdf.format(sessionData.getLastActive()))));
add(new Label("numberOfRequests",
- new Model(new
Long(sessionData.getNumberOfRequests()))));
- add(new Label("totalTimeTaken", new Model(new
Long(sessionData.getTotalTimeTaken()))));
+ new
Model(sessionData.getNumberOfRequests())));
+ add(new Label("totalTimeTaken", new
Model(sessionData.getTotalTimeTaken())));
add(new Label("size", new
Model(Bytes.bytes(sessionData.getSessionSize()))));
add(new
WebMarkupContainer("sessionid").setVisible(false));
}
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
Sun Dec 16 09:33:29 2007
@@ -81,11 +81,11 @@
}
private Boolean booleanProperty;
- private Double doubleProperty = new Double(20.5);
- private Integer integerInRangeProperty = new Integer(50);
- private Integer integerProperty = new Integer(100);
+ private Double doubleProperty = 20.5;
+ private Integer integerInRangeProperty = 50;
+ private Integer integerProperty = 100;
private List lines = new ArrayList();
- private Integer multiply = new Integer(0);
+ private Integer multiply = 0;
private String numberRadioChoice = (String)FormInput.NUMBERS.get(0);
private List numbersCheckGroup = new ArrayList();
private String numbersGroup;
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
Sun Dec 16 09:33:29 2007
@@ -112,7 +112,7 @@
if (hit == false)
{
- idToBook.put(new Long(book.id), book);
+ idToBook.put(book.id, book);
}
}
@@ -123,7 +123,7 @@
*/
public static Book get(final long id)
{
- return (Book)idToBook.get(new Long(id));
+ return (Book)idToBook.get(id);
}
/**
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
Sun Dec 16 09:33:29 2007
@@ -155,7 +155,7 @@
final RequestCycle cycle = getRequestCycle();
PageParameters parameters = new PageParameters();
final Book book = (Book)getModelObject();
- parameters.put("id", new Long(book.getId()));
+ parameters.put("id", book.getId());
cycle.setResponsePage(getPageFactory().newPage(BookDetails.class, parameters));
cycle.setRedirect(true);
}
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
Sun Dec 16 09:33:29 2007
@@ -60,7 +60,7 @@
*/
public Contact get(long id)
{
- Contact c = (Contact)map.get(new Long(id));
+ Contact c = (Contact)map.get(id);
if (c == null)
{
throw new RuntimeException("contact with id [" + id +
"] not found in the database");
@@ -70,7 +70,7 @@
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);
@@ -145,7 +145,7 @@
*/
public void delete(final Contact contact)
{
- Contact c = (Contact)map.remove(new Long(contact.getId()));
+ Contact c = (Contact)map.remove(contact.getId());
fnameIdx.remove(contact);
lnameIdx.remove(contact);
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java
Sun Dec 16 09:33:29 2007
@@ -58,7 +58,7 @@
*/
public int hashCode()
{
- return new Long(id).hashCode();
+ return Long.valueOf(id).hashCode();
}
/**
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java?rev=604658&r1=604657&r2=604658&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
Sun Dec 16 09:33:29 2007
@@ -67,7 +67,7 @@
*/
public Contact get(long id)
{
- Contact c = (Contact)map.get(new Long(id));
+ Contact c = (Contact)map.get(id);
if (c == null)
throw new RuntimeException("contact with id [" + id +
"] not found in the database");
return c;
@@ -75,7 +75,7 @@
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);
@@ -149,7 +149,7 @@
*/
public void delete(final Contact contact)
{
- map.remove(new Long(contact.getId()));
+ map.remove(contact.getId());
fnameIdx.remove(contact);
lnameIdx.remove(contact);
