Changeset 11080

Timestamp:

2006-01-23T13:24:35+13:00 (18 years ago)

Author:

mdewsnip

Message:

Removed the "progress" parameter from copyFile, as part of the FileQueue rewrite.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (3 diffs)
• collection/LegacyCollectionImporter.java (modified) (1 diff)
• file/FileQueue.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -473 +473 @@
             try {
                 File collection_image_file = new File(images_folder, file.getName());
-                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, false, null);
+                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, false);
 
                 // If we're using a remote Greenstone server, upload the image

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -290 +290 @@
         
         // copy the contents over
-        Gatherer.f_man.getQueue().copyDirectoryContents(base_coll_images, new_coll_images, null);
+        Gatherer.f_man.getQueue().copyDirectoryContents(base_coll_images, new_coll_images);
         }
     }
@@ -305 +305 @@
         
         // copy the contents over
-        Gatherer.f_man.getQueue().copyDirectoryContents(base_coll_macros, new_coll_macros, null);
+        Gatherer.f_man.getQueue().copyDirectoryContents(base_coll_macros, new_coll_macros);
         } 
     }
@@ -742 +742 @@
     if (!metadata_set_file.exists()) {
         try {
-        Gatherer.f_man.getQueue().copyFile(external_metadata_set_file, metadata_set_file, false, null);
+        Gatherer.f_man.getQueue().copyFile(external_metadata_set_file, metadata_set_file, false);
 
         // If we're using a remote Greenstone server, upload the metadata file

trunk/gli/src/org/greenstone/gatherer/collection/LegacyCollectionImporter.java

@@ -53 +53 @@
         try {
         backup_dir.mkdirs();
-        Gatherer.f_man.getQueue().copyFile(metadata_xml_file_file, new_metadata_xml_file_file, false, null);
+        Gatherer.f_man.getQueue().copyFile(metadata_xml_file_file, new_metadata_xml_file_file, false);
         if (!new_metadata_xml_file_file.exists()) {
             throw new Exception("");

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -336 +336 @@
                     // copy the file. If anything goes wrong the copy file should throw the appropriate exception. No matter what exception is thrown (bar an IOException) we display some message, perhaps take some action, then cancel the remainder of the pending file jobs. No point in being told your out of hard drive space for each one of six thousand files eh?
                     try {
-                    copyFile(source_file, target_file, false, progress);
+                    copyFile(source_file, target_file, false);
+                    progress.addValue(source_file.length());
                     }
                     // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
@@ -583 +584 @@
      * @see org.greenstone.gatherer.Gatherer
      */
-    public void copyDirectoryContents(File source, File destination, GProgressBar progress) 
+    public void copyDirectoryContents(File source, File destination) 
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException
     {
@@ -597 +598 @@
         File new_file = new File(destination, f_name);
         if (f.isDirectory()) {
-        copyDirectoryContents(f, new_file, progress);
+        copyDirectoryContents(f, new_file);
         } else if (f.isFile()) {
-        copyFile(f, new_file, false, progress);
+        copyFile(f, new_file, false);
         }
     }
-    
-    }
+    }
+
     
     /** Copy a file from the source location to the destination location.
@@ -610 +611 @@
      * @see org.greenstone.gatherer.Gatherer
      */
-    public void copyFile(File source, File destination, boolean overwrite, GProgressBar progress)
+    public void copyFile(File source, File destination, boolean overwrite)
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException
     {
@@ -674 +675 @@
         }
         }
-        if (progress != null) {
-        progress.addValue(data_size);
-        }
     }