IO-157 revert as this breaks binary compatibility with previous releases

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@744725 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/java/org/apache/commons/io/FileUtils.java

@@ -554,15 +554,14 @@ public static URL[] toURLs(File[] files) throws IOException {
      *
      * @param srcFile  an existing file to copy, must not be <code>null</code>
      * @param destDir  the directory to place the copy in, must not be <code>null</code>
-     * @return the new file
      *
      * @throws NullPointerException if source or destination is null
      * @throws IOException if source or destination is invalid
      * @throws IOException if an IO error occurs during copying
      * @see #copyFile(File, File, boolean)
      */
-    public static File copyFileToDirectory(File srcFile, File destDir) throws IOException {
-        return copyFileToDirectory(srcFile, destDir, true);
+    public static void copyFileToDirectory(File srcFile, File destDir) throws IOException {
+        copyFileToDirectory(srcFile, destDir, true);
     }
 
     /**
@@ -577,15 +576,14 @@ public static File copyFileToDirectory(File srcFile, File destDir) throws IOExce
      * @param destDir  the directory to place the copy in, must not be <code>null</code>
      * @param preserveFileDate  true if the file date of the copy
      *  should be the same as the original
-     * @return the new file
      *
      * @throws NullPointerException if source or destination is <code>null</code>
      * @throws IOException if source or destination is invalid
      * @throws IOException if an IO error occurs during copying
      * @see #copyFile(File, File, boolean)
      * @since Commons IO 1.3
      */
-    public static File copyFileToDirectory(File srcFile, File destDir, boolean preserveFileDate) throws IOException {
+    public static void copyFileToDirectory(File srcFile, File destDir, boolean preserveFileDate) throws IOException {
         if (destDir == null) {
             throw new NullPointerException("Destination must not be null");
         }
@@ -594,7 +592,6 @@ public static File copyFileToDirectory(File srcFile, File destDir, boolean prese
         }
         File destFile = new File(destDir, srcFile.getName());
         copyFile(srcFile, destFile, preserveFileDate);
-        return destFile;
     }
 
     /**

src/test/org/apache/commons/io/FileUtilsTestCase.java

@@ -898,8 +898,7 @@ public void testCopyFile1ToDir() throws Exception {
         //This is to slow things down so we can catch if 
         //the lastModified date is not ok
 
-        File result = FileUtils.copyFileToDirectory(testFile1, directory);
-        assertEquals("Check File", destination, result);
+        FileUtils.copyFileToDirectory(testFile1, directory);
         assertTrue("Check Exist", destination.exists());
         assertTrue("Check Full copy", destination.length() == testFile1Size);
         /* disabled: Thread.sleep doesn't work reliantly for this case