Author: ivaynberg
Date: Wed May 28 20:19:55 2008
New Revision: 661196
URL: http://svn.apache.org/viewvc?rev=661196&view=rev
Log:
generics cleanup and model.of factories fix
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java?rev=661196&r1=661195&r2=661196&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
Wed May 28 20:19:55 2008
@@ -64,7 +64,7 @@
defaultValue.append("s, Client parsetime: ' + (new
Date().getTime() - clientTimeVariable)/1000 + 's");
String txt =
Application.get().getResourceSettings().getLocalizer().getString(
- "ServerAndClientTimeFilter.statustext", null,
Model.valueOf(map),
+ "ServerAndClientTimeFilter.statustext", null,
Model.of(map),
defaultValue.toString());
AppendingStringBuffer endScript = new
AppendingStringBuffer(150);
endScript.append("\n").append(JavascriptUtils.SCRIPT_OPEN_TAG);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=661196&r1=661195&r2=661196&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
Wed May 28 20:19:55 2008
@@ -49,6 +49,9 @@
/**
* Constructor.
*
+ * @param <C>
+ * type of page
+ *
* @param id
* The name of this component
* @param pageClass
@@ -59,11 +62,12 @@
this(id, pageClass, null);
}
- private MiniMap pageParametersToMiniMap(PageParameters parameters)
+ private MiniMap<String, Object> pageParametersToMiniMap(PageParameters
parameters)
{
if (parameters != null)
{
- MiniMap map = new MiniMap(parameters,
parameters.keySet().size());
+ MiniMap<String, Object> map = new MiniMap<String,
Object>(parameters,
+ parameters.keySet().size());
return map;
}
else
@@ -73,6 +77,9 @@
}
+ /**
+ * @return page parameters
+ */
public PageParameters getPageParameters()
{
PageParameters result = new PageParameters();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=661196&r1=661195&r2=661196&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
Wed May 28 20:19:55 2008
@@ -161,7 +161,7 @@
*/
public ListView(final String id, final List<T> list)
{
- this(id, new Model((Serializable)list));
+ this(id, Model.of(list));
}
/**
@@ -429,7 +429,7 @@
*/
public ListView<T> setList(List<T> list)
{
- setModel(new Model((Serializable)list));
+ setModel(Model.of(list));
return this;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java?rev=661196&r1=661195&r2=661196&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java Wed
May 28 20:19:55 2008
@@ -18,6 +18,7 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -71,6 +72,7 @@
* @deprecated see [EMAIL PROTECTED] Model#ofMap(Map)}
* @return A Model object wrapping the Map
*/
+ @SuppressWarnings("unchecked")
@Deprecated
public static Model valueOf(final Map map)
{
@@ -83,6 +85,7 @@
* @deprecated see [EMAIL PROTECTED] Model#of(List)}
* @return A Model object wrapping the List
*/
+ @SuppressWarnings("unchecked")
@Deprecated
public static Model valueOf(final List list)
{
@@ -90,6 +93,24 @@
}
/**
+ * Factory method for models that contain lists. This factory method
will automatically rebuild
+ * a nonserializable <code>list</code> into a serializable one.
+ *
+ * @param <V>
+ * value type in list
+ * @param <T>
+ * model type
+ * @param list
+ * The List, which may or may not be Serializable
+ * @return A Model object wrapping the List
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> IModel<List<T>> of(final List<T> list)
+ {
+ return new Model((Serializable)(list instanceof Serializable ?
list : new ArrayList(list)));
+ }
+
+ /**
* Factory method for models that contain maps. This factory method
will automatically rebuild a
* nonserializable <code>map</code> into a serializable one.
*
@@ -104,32 +125,33 @@
* @return A Model object wrapping the Map
*/
@SuppressWarnings("unchecked")
- public static <K, V, T extends Map<K, V> & Serializable> Model<T>
of(final Map<K, V> map)
+ public static <K, V> IModel<Map<K, V>> of(final Map<K, V> map)
{
- return new Model<T>((T)(map instanceof Serializable ? map : new
HashMap<K, V>(map)));
+ return new Model((Serializable)(map instanceof Serializable ?
map : new HashMap<K, V>(map)));
}
+
/**
- * Factory method for models that contain lists. This factory method
will automatically rebuild
- * a nonserializable <code>list</code> into a serializable one.
+ * Factory method for models that contain sets. This factory method
will automatically rebuild a
+ * nonserializable <code>set</code> into a serializable one.
*
* @param <V>
- * value type in list
+ * value type in set
* @param <T>
* model type
- * @param list
- * The List, which may or may not be Serializable
- * @return A Model object wrapping the List
+ * @param set
+ * The Set, which may or may not be Serializable
+ * @return A Model object wrapping the Set
*/
@SuppressWarnings("unchecked")
- public static <V, T extends List<V> & Serializable> Model<T> of(final
List<V> list)
+ public static <T> IModel<Set<T>> of(final Set<T> set)
{
- return new Model<T>((T)(list instanceof Serializable ? list :
new ArrayList<V>(list)));
+ return new Model((Serializable)(set instanceof Serializable ?
set : new HashSet<T>(set)));
}
/**
- * Factory method for models that contain sets. This factory method
will automatically rebuild a
- * nonserializable <code>set</code> into a serializable one.
+ * Factory method for models that contain collections. This factory
method will automatically
+ * rebuild a nonserializable <code>collection</code> into a
serializable [EMAIL PROTECTED] ArrayList}.
*
* @param <V>
* value type in set
@@ -140,9 +162,9 @@
* @return A Model object wrapping the Set
*/
@SuppressWarnings("unchecked")
- public static <V, T extends Set<V> & Serializable> Model<T> of(final
Set<V> set)
+ public static <T> IModel<Collection<T>> of(final Collection<T> set)
{
- return new Model<T>((T)(set instanceof Serializable ? set : new
HashSet<V>(set)));
+ return new Model((Serializable)(set instanceof Serializable ?
set : new ArrayList<T>(set)));
}
