svn commit: r670415 - /wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java

[th...@apache.org]

Author: thrantal
Date: Sun Jun 22 14:22:04 2008
New Revision: 670415

URL: http://svn.apache.org/viewvc?rev=670415&view=rev
Log:
Added type parameters to a couple of raw type usages

Modified:
    wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java

Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java?rev=670415&r1=670414&r2=670415&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java Sun Jun 22 14:22:04 2008
@@ -723,7 +723,7 @@
 		{
 			return 0;
 		}
-		else if (data instanceof Object[] && !(data instanceof MetaDataEntry[]))
+		else if (data instanceof Object[] && !(data instanceof MetaDataEntry<?>[]))
 		{
 			return ((Object[])data).length;
 		}
@@ -739,7 +739,7 @@
 		{
 			return null;
 		}
-		else if (data instanceof Object[] && !(data instanceof MetaDataEntry[]))
+		else if (data instanceof Object[] && !(data instanceof MetaDataEntry<?>[]))
 		{
 			Object[] array = (Object[])data;
 			return index < array.length ? array[index] : null;
@@ -760,7 +760,7 @@
 		{
 			throw new IndexOutOfBoundsException();
 		}
-		else if (index == 0 && !(data instanceof Object[] && !(data instanceof MetaDataEntry[])))
+		else if (index == 0 && !(data instanceof Object[] && !(data instanceof MetaDataEntry<?>[])))
 		{
 			Object old = data;
 			data = object;
@@ -1557,9 +1557,9 @@
 		if (index < length)
 		{
 			Object object = data_get(index);
-			if (object instanceof MetaDataEntry[])
+			if (object instanceof MetaDataEntry<?>[])
 			{
-				metaData = (MetaDataEntry[])object;
+				metaData = (MetaDataEntry<?>[])object;
 			}
 			else if (object instanceof MetaDataEntry)
 			{
@@ -1647,7 +1647,7 @@
 			// Get converter
 			final Class<?> objectClass = modelObject.getClass();
 
-			final IConverter converter = getConverter(objectClass);
+			final IConverter<Object> converter = (IConverter<Object>) getConverter(objectClass);
 
 			// Model string from property
 			final String modelString = converter.convertToString(modelObject, getLocale());
@@ -2859,7 +2859,7 @@
 			prevModel.detach();
 		}
 
-		IModel wrappedModel = prevModel;
+		IModel<?> wrappedModel = prevModel;
 		if (prevModel instanceof IWrapModel)
 		{
 			wrappedModel = ((IWrapModel<?>)prevModel).getWrappedModel();
@@ -2935,7 +2935,7 @@
 	@SuppressWarnings("unchecked")
 	public final Component setDefaultModelObject(final Object object)
 	{
-		final IModel model = getDefaultModel();
+		final IModel<Object> model = (IModel<Object>) getDefaultModel();
 
 		// Check whether anything can be set at all
 		if (model == null)
@@ -4058,7 +4058,7 @@
 	{
 		if (model instanceof IComponentAssignedModel)
 		{
-			return ((IComponentAssignedModel)model).wrapOnAssignment(this);
+			return ((IComponentAssignedModel<V>)model).wrapOnAssignment(this);
 		}
 		return model;
 	}