Changeset 5079

Timestamp:

2003-08-04T11:32:49+12:00 (21 years ago)

Author:

jmt12

Message:

A file permission error is now correctly shown when you attempt to copy a file to a read-only folder (rather than a source file not found one)

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (9 diffs)

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

@@ -1 @@
-package org.greenstone.gatherer.file;
 /**
  *#########################################################################
@@ -7 +6 @@
  * University of Waikato, New Zealand.
  *
- * <BR><BR>
- *
  * Author: John Thompson, Greenstone Digital Library, University of Waikato
  *
- * <BR><BR>
- *
  * Copyright (C) 1999 New Zealand Digital Library Project
- *
- * <BR><BR>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22 +15 @@
  * (at your option) any later version.
  *
- * <BR><BR>
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * <BR><BR>
  *
  * You should have received a copy of the GNU General Public License
@@ -36 +25 @@
  *########################################################################
  */
+package org.greenstone.gatherer.file;
+
 import java.io.*;
 import java.util.*;
@@ -327 +318 @@
                     // Nothing else we can do.
                 }
+                catch(WriteNotPermittedException wnp_exception) {
+                    Gatherer.printStackTrace(wnp_exception);
+                    cancel_action = true;
+                    // Show warning
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("Write_Not_Permitted_Message", target_file.getAbsolutePath()), get("Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else we can do.
+                }
                 catch(IOException exception) {
                     // Can't really do much about this.
@@ -669 +667 @@
       */
     public void copyFile(File source, File destination, LongProgressBar progress)
-    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException {
+    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException, WriteNotPermittedException {
     if(source.isDirectory()) {
         destination.mkdirs();
@@ -676 +674 @@
                 // Check if the origin file exists.
         if(!source.exists()) {
+        System.err.println("Couldn't find the source file.");
         throw(new FileNotFoundException());
         }
@@ -686 +685 @@
                 // Copy the file.
         FileInputStream f_in = new FileInputStream(source);
-        FileOutputStream f_out = new FileOutputStream(destination);
+        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) {
+        throw new WriteNotPermittedException(exception.toString());
+        }
         byte data[] = new byte[Utility.BUFFER_SIZE];
         int data_size = 0;
@@ -711 +717 @@
         }
         }
-                // Flush and close the streams to ensure all bytes are written.
+        // Flush and close the streams to ensure all bytes are written.
         f_in.close();
         f_out.close();
-                // We have now, in theory, produced an exact copy of the source file. Check this by comparing sizes.
-        if(!cancel_action && source.length() != destination.length()) {
+        // We have now, in theory, produced an exact copy of the source file. Check this by comparing sizes.
+        if(!destination.exists() || (!cancel_action && source.length() != destination.length())) {
         throw(new UnknownFileErrorException());
         }
-                // If we were cancelled, ensure that none of the destination file exists.
+        // If we were cancelled, ensure that none of the destination file exists.
         if(cancel_action) {
         destination.delete();