svn commit: r1040195 - /wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java

[pe...@apache.org]

Author: pete
Date: Mon Nov 29 17:15:59 2010
New Revision: 1040195

URL: http://svn.apache.org/viewvc?rev=1040195&view=rev
Log:
serialization: user Serializable instead of Object when writing to ObjectOutputStream

Modified:
    wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java

Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java?rev=1040195&r1=1040194&r2=1040195&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java Mon Nov 29 17:15:59 2010
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.net.URI;
 
 import org.apache.wicket.util.io.Streams;
@@ -220,10 +221,9 @@ public class File extends java.io.File i
 	/**
 	 * @param object
 	 *            Object to write to this file
-	 * @throws FileNotFoundException
 	 * @throws IOException
 	 */
-	public void writeObject(final Object object) throws FileNotFoundException, IOException
+	public void writeObject(final Serializable object) throws IOException
 	{
 		new ObjectOutputStream(outputStream()).writeObject(object);
 	}
@@ -269,14 +269,15 @@ public class File extends java.io.File i
 	 * 
 	 * @param file
 	 *            The file to copy
+	 * @returns number of bytes written
 	 * @throws IOException
 	 */
-	public void write(final File file) throws IOException
+	public int write(final File file) throws IOException
 	{
 		final InputStream in = new BufferedInputStream(new FileInputStream(file));
 		try
 		{
-			write(in);
+			return write(in);
 		}
 		finally
 		{