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/29 20:44:24 UTC
svn commit: r1040248 - in /wicket/trunk:
wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
Author: pete
Date: Mon Nov 29 19:44:24 2010
New Revision: 1040248
URL: http://svn.apache.org/viewvc?rev=1040248&view=rev
Log:
let IObjectSizeOfStrategy#sizeOf() only accept java.io.Serializable instead of java.lang.Object as all our implementations rely on serialization anyway
Modified:
wicket/trunk/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
Modified: wicket/trunk/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java?rev=1040248&r1=1040247&r2=1040248&view=diff
==============================================================================
--- wicket/trunk/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java (original)
+++ wicket/trunk/wicket-objectssizeof-agent/src/main/java/org/apache/wicket/util/instrument/InstrumentationObjectSizeOfStrategy.java Mon Nov 29 19:44:24 2010
@@ -19,6 +19,7 @@ package org.apache.wicket.util.instrumen
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import java.io.Serializable;
import java.lang.instrument.Instrumentation;
import org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy;
@@ -103,9 +104,9 @@ public class InstrumentationObjectSizeOf
* object to calculate size of
* @return object size
*
- * @see org.apache.wicket.util.lang.Objects.IObjectSizeOfStrategy#sizeOf(java.lang.Object)
+ * @see org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy#sizeOf(java.io.Serializable)
*/
- public long sizeOf(Object obj)
+ public long sizeOf(Serializable obj)
{
if (obj == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java?rev=1040248&r1=1040247&r2=1040248&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/WicketObjects.java Mon Nov 29 19:44:24 2010
@@ -24,6 +24,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.io.OutputStream;
+import java.io.Serializable;
import java.util.HashMap;
import org.apache.wicket.Application;
@@ -91,10 +92,10 @@ public class WicketObjects
* size.
*
* @param object
- * Object to compute size of
+ * The serializable object to compute size of
* @return The size of the object in bytes.
*/
- long sizeOf(Object object);
+ long sizeOf(Serializable object);
}
/**
@@ -107,9 +108,9 @@ public class WicketObjects
public static final class SerializingObjectSizeOfStrategy implements IObjectSizeOfStrategy
{
/**
- * @see org.apache.wicket.util.lang.Objects.IObjectSizeOfStrategy#sizeOf(java.lang.Object)
+ * @see org.apache.wicket.util.lang.WicketObjects.IObjectSizeOfStrategy#sizeOf(java.io.Serializable)
*/
- public long sizeOf(Object object)
+ public long sizeOf(Serializable object)
{
if (object == null)
{
@@ -596,7 +597,7 @@ public class WicketObjects
* Object to compute size of
* @return The size of the object in bytes
*/
- public static long sizeof(final Object object)
+ public static long sizeof(final Serializable object)
{
return objectSizeOfStrategy.sizeOf(object);
}