Author: jdonnerstag
Date: Wed Apr 16 14:01:14 2008
New Revision: 648846

URL: http://svn.apache.org/viewvc?rev=648846&view=rev
Log:
generics

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java?rev=648846&r1=648845&r2=648846&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
 Wed Apr 16 14:01:14 2008
@@ -63,6 +63,8 @@
  * </pre>
  * 
  * @author Jonathan Locke
+ * @param <T>
+ *            The model object type
  */
 public class Label<T> extends WebComponent<T>
 {

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java?rev=648846&r1=648845&r2=648846&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/body/BodyTagAttributeModifier.java
 Wed Apr 16 14:01:14 2008
@@ -48,7 +48,7 @@
        /**
         * Make sure we don't keep a reference to the component longer than 
really needed.
         */
-       private transient WeakReference componentReference;
+       private transient WeakReference<Component< ? >> componentReference;
 
        /**
         * Create a new attribute modifier with the given attribute name and 
model to replace with. The
@@ -64,7 +64,7 @@
         *            The component which created (owns) the modifier
         */
        public BodyTagAttributeModifier(final String attribute, final boolean 
addAttributeIfNotPresent,
-                       final IModel replaceModel, final Component 
behaviorOwner)
+               final IModel< ? > replaceModel, final Component< ? > 
behaviorOwner)
        {
                super(attribute, addAttributeIfNotPresent, replaceModel);
                init(behaviorOwner);
@@ -81,8 +81,8 @@
         * @param behaviorOwner
         *            The component which created (owns) the modifier
         */
-       public BodyTagAttributeModifier(final String attribute, final IModel 
replaceModel,
-                       final Component behaviorOwner)
+       public BodyTagAttributeModifier(final String attribute, final IModel< ? 
> replaceModel,
+               final Component< ? > behaviorOwner)
        {
                super(attribute, replaceModel);
                init(behaviorOwner);
@@ -107,8 +107,8 @@
         *            The component which created (owns) the modifier
         */
        public BodyTagAttributeModifier(final String attribute, final String 
pattern,
-                       final boolean addAttributeIfNotPresent, final IModel 
replaceModel,
-                       final Component behaviorOwner)
+               final boolean addAttributeIfNotPresent, final IModel< ? > 
replaceModel,
+               final Component< ? > behaviorOwner)
        {
                super(attribute, pattern, addAttributeIfNotPresent, 
replaceModel);
                init(behaviorOwner);
@@ -129,7 +129,7 @@
         *            The component which created (owns) the modifier
         */
        public BodyTagAttributeModifier(final String attribute, final String 
pattern,
-                       final IModel replaceModel, final Component 
behaviorOwner)
+               final IModel< ? > replaceModel, final Component< ? > 
behaviorOwner)
        {
                super(attribute, pattern, replaceModel);
                init(behaviorOwner);
@@ -141,17 +141,18 @@
         * @param behaviorOwner
         *            The component which creates (owns) the modifier
         */
-       private void init(final Component behaviorOwner)
+       private void init(final Component< ? > behaviorOwner)
        {
                if (behaviorOwner != null)
                {
-                       componentReference = new WeakReference(behaviorOwner);
+                       componentReference = new WeakReference<Component< ? 
>>(behaviorOwner);
                }
        }
 
        /**
         * @see org.apache.wicket.AttributeModifier#newValue(java.lang.String, 
java.lang.String)
         */
+       @Override
        protected String newValue(final String currentValue, final String 
replacementValue)
        {
                // If no behavior owner has been provided, than behave as if 
this
@@ -160,7 +161,7 @@
                {
                        // Get the owner of the attribute modifier (e.g. the 
Panel, not the
                        // Body)
-                       final Component behaviorOwner = 
(Component)componentReference.get();
+                       final Component< ? > behaviorOwner = 
componentReference.get();
 
                        // If case the components memory has been GCed already, 
than disable
                        // the attribute modifier and return the attribute 
value unchanged.
@@ -208,14 +209,14 @@
         * @throws ClassNotFoundException
         */
        private void readObject(final ObjectInputStream inputStream) throws 
IOException,
-                       ClassNotFoundException
+               ClassNotFoundException
        {
                inputStream.defaultReadObject();
 
                final Object object = inputStream.readObject();
                if (object != null)
                {
-                       componentReference = new WeakReference(object);
+                       componentReference = new WeakReference<Component< ? 
>>((Component< ? >)object);
                }
        }
 

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java?rev=648846&r1=648845&r2=648846&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
 Wed Apr 16 14:01:14 2008
@@ -49,8 +49,10 @@
  * </pre>
  * 
  * @author Juergen Donnerstag
+ * @param <T>
+ *            The model object type
  */
-public final class PageView extends Panel
+public final class PageView<T> extends Panel<T>
 {
        /**
         * El cheapo data holder.
@@ -97,10 +99,10 @@
                super(id);
 
                // Create an empty list. It'll be filled later
-               final List data = new ArrayList();
+               final List<ComponentData> data = new ArrayList<ComponentData>();
 
                // Name of page
-               add(new Label("info", page == null ? "[Stateless Page]" : 
page.toString()));
+               add(new Label<String>("info", page == null ? "[Stateless Page]" 
: page.toString()));
 
                // Get the components data and fill and sort the list
                data.clear();
@@ -108,31 +110,32 @@
                {
                        data.addAll(getComponentData(page));
                }
-               Collections.sort(data, new Comparator()
+               Collections.sort(data, new Comparator<ComponentData>()
                {
-                       public int compare(Object o1, Object o2)
+                       public int compare(ComponentData o1, ComponentData o2)
                        {
-                               return 
((ComponentData)o1).path.compareTo(((ComponentData)o2).path);
+                               return (o1).path.compareTo((o2).path);
                        }
                });
 
                // Create the table containing the list the components
-               add(new ListView("components", data)
+               add(new ListView<ComponentData>("components", data)
                {
                        private static final long serialVersionUID = 1L;
 
                        /**
                         * Populate the table with Wicket elements
                         */
-                       protected void populateItem(final ListItem listItem)
+                       @Override
+                       protected void populateItem(final 
ListItem<ComponentData> listItem)
                        {
-                               final ComponentData componentData = 
(ComponentData)listItem.getModelObject();
+                               final ComponentData componentData = 
listItem.getModelObject();
 
-                               listItem.add(new Label("row", 
Integer.toString(listItem.getIndex() + 1)));
-                               listItem.add(new Label("path", 
componentData.path));
-                               listItem.add(new Label("size", 
Bytes.bytes(componentData.size).toString()));
-                               listItem.add(new Label("type", 
componentData.type));
-                               listItem.add(new Label("model", 
componentData.value));
+                               listItem.add(new Label<String>("row", 
Integer.toString(listItem.getIndex() + 1)));
+                               listItem.add(new Label<String>("path", 
componentData.path));
+                               listItem.add(new Label<String>("size", 
Bytes.bytes(componentData.size).toString()));
+                               listItem.add(new Label<String>("type", 
componentData.type));
+                               listItem.add(new Label<String>("model", 
componentData.value));
                        }
                });
        }
@@ -144,13 +147,13 @@
         * @param page
         * @return List of component data objects
         */
-       private List getComponentData(final Page page)
+       private List<ComponentData> getComponentData(final Page page)
        {
-               final List data = new ArrayList();
+               final List<ComponentData> data = new ArrayList<ComponentData>();
 
-               page.visitChildren(new IVisitor()
+               page.visitChildren(new IVisitor<Component< ? >>()
                {
-                       public Object component(final Component component)
+                       public Object component(final Component< ? > component)
                        {
                                if 
(!component.getPath().startsWith(PageView.this.getPath()))
                                {
@@ -167,7 +170,7 @@
                                        name = Strings.lastPathComponent(name, 
Component.PATH_SEPARATOR);
 
                                        componentData = new 
ComponentData(component.getPageRelativePath(), name,
-                                                       
component.getSizeInBytes());
+                                               component.getSizeInBytes());
 
                                        try
                                        {

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java?rev=648846&r1=648845&r2=648846&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
 Wed Apr 16 14:01:14 2008
@@ -18,7 +18,6 @@
 
 import java.text.ParseException;
 
-import org.apache.wicket.Component;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupElement;
 import org.apache.wicket.markup.WicketTag;
@@ -54,7 +53,7 @@
         * @param markupFileClass
         *            Used to generated the a common prefix for the id
         */
-       public HeadForceTagIdHandler(final Class< ? extends Component> 
markupFileClass)
+       public HeadForceTagIdHandler(final Class< ? > markupFileClass)
        {
                // generate the prefix from class name
                final AppendingStringBuffer buffer = new 
AppendingStringBuffer(markupFileClass.getName());


Reply via email to