Changeset 8505

Timestamp:

2004-11-10T12:50:45+13:00 (19 years ago)

Author:

mdewsnip

Message:

You now get a sensible error message when attempting to copy a file you don't have permission to read.

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileQueue.java (modified) (5 diffs)
• ReadNotPermittedException.java (added)

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

@@ -342 +342 @@
                     // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
                     }
+                    catch (ReadNotPermittedException rnp_exception) {
+                    if (DebugStream.isDebuggingEnabled()) {
+                        DebugStream.printStackTrace(rnp_exception);
+                    }
+                    cancel_action = true;
+                    // Show warning
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Read_Not_Permitted_Message", source_file.getAbsolutePath()), Dictionary.get("FileActions.Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else we can do.
+                    }
                     catch(UnknownFileErrorException ufe_exception) {
                     DebugStream.printStackTrace(ufe_exception);
@@ -350 +359 @@
                     }
                     catch(WriteNotPermittedException wnp_exception) {
-                    DebugStream.printStackTrace(wnp_exception);
+                    if (DebugStream.isDebuggingEnabled()) {
+                        DebugStream.printStackTrace(wnp_exception);
+                    }
                     cancel_action = true;
                     // Show warning
@@ -632 +643 @@
      */
     public void copyDirectoryContents(File source, File destination, LongProgressBar progress) 
-    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException, WriteNotPermittedException
+    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException
     {
     if (!source.isDirectory()) return;
@@ -659 +670 @@
      */
     public void copyFile(File source, File destination, LongProgressBar progress)
-    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException, WriteNotPermittedException {
+    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException {
     if(source.isDirectory()) {
         destination.mkdirs();
@@ -665 +676 @@
     else {
         // Check if the origin file exists.
-        if(!source.exists()) {
+        if (!source.exists()) {
         DebugStream.println("Couldn't find the source file.");
         throw(new FileNotFoundException());
         }
-        // Check if the destination file does not exist.
-        if(destination.exists()) {
+
+        // Make sure the destination file does not exist.
+        if (destination.exists()) {
         throw(new FileAlreadyExistsException());
         }
+
+        // Open an input stream to the source file
+        FileInputStream f_in = null;
+        try {
+        f_in = new FileInputStream(source);
+        }
+        catch (FileNotFoundException exception) {
+        // A FileNotFoundException translates into a ReadNotPermittedException in this case
+        throw new ReadNotPermittedException(exception.toString());      
+        }
+
+        // Create an necessary directories for the target file
         File dirs = destination.getParentFile();
         dirs.mkdirs();
-        // Copy the file.
-        FileInputStream f_in = new FileInputStream(source);
+
+        // Open an output stream to the target file
         FileOutputStream f_out = null;
-        // This may throw a file not found exception, but this translates to a WriteNotPermittedException, in this case
         try {
         f_out = new FileOutputStream(destination);
         }
         catch (FileNotFoundException exception) {
+        // A FileNotFoundException translates into a WriteNotPermittedException in this case
         throw new WriteNotPermittedException(exception.toString());
         }
+
+        // Copy the file
         byte data[] = new byte[Utility.BUFFER_SIZE];
         int data_size = 0;