Changeset 1280 for trunk/src/org/expeditee/gui/FrameIO.java

Timestamp:

04/04/19 14:41:47 (5 years ago)

Author:

bln4

Message:

Renamed MailMode action to ToggleBay
Renamed FrameCreator enums to more desirable names (David request)
Created test for altered functionality of FrameCreator as documented below.

FrameCreator now more cleanly obeys the specification of the enum parameter to its constructor. For example, override existing frameset ensures that the old frameset has been deleted (moved to trash).

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -1579 +1579 @@
          * @return
          */
-        public static Boolean canAccessFrameset(String framesetName) {
+        public static boolean canAccessFrameset(String framesetName) {
                 framesetName = framesetName.toLowerCase();
                 for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
-                        if ((new File(path + framesetName)).exists()) {
+                        if (canAccessFrameset(framesetName, Paths.get(path))) {
                                 return true;
                         }
                 }
                 return false;
+        }
+        
+        public static boolean canAccessFrameset(String framesetName, Path path) {
+                File framesetDir = path.resolve(framesetName).toFile();
+                if (framesetDir.exists() && framesetDir.isDirectory()) {
+                        return true;
+                } else {
+                        return false;
+                }
         }
 
@@ -1723 +1732 @@
                 // Search all the available directories for the directory
                 for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
-                        String source = path + framesetName.toLowerCase() + File.separator;
-                        File framesetDirectory = new File(source);
-                        // Once we have found the directory move it
-                        if (framesetDirectory.exists()) {
-                                String destPath = destinationFolder
-                                                + framesetName.toLowerCase();
-                                int copyNumber = 1;
-                                File dest = new File(destPath + File.separator);
-                                // Create the destination folder if it doesnt already exist
-                                if (!dest.getParentFile().exists()) {
-                                        dest.mkdirs();
+                        return moveFrameset(framesetName, path, destinationFolder);
+                }
+                return false;
+        }
+
+        public static boolean moveFrameset(String framesetName, String path, String destinationFolder) {
+                String source = path + framesetName.toLowerCase() + File.separator;
+                File framesetDirectory = new File(source);
+                // Once we have found the directory move it
+                if (framesetDirectory.exists()) {
+                        String destPath = destinationFolder
+                                        + framesetName.toLowerCase();
+                        int copyNumber = 1;
+                        File dest = new File(destPath + File.separator);
+                        // Create the destination folder if it doesnt already exist
+                        if (!dest.getParentFile().exists()) {
+                                dest.mkdirs();
+                        }
+                        // If a frameset with the same name is already in the
+                        // destination add
+                        // a number to the end
+                        while (dest.exists()) {
+                                dest = new File(destPath + ++copyNumber + File.separator);
+                        }
+                        try {
+                                copyFileTree(framesetDirectory.toPath(), dest.toPath());        
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                                return false;
+                        }
+                        
+                        for (File f : framesetDirectory.listFiles()) {
+                                if (!f.delete()) {
+                                        return false;
                                 }
-                                // If a frameset with the same name is already in the
-                                // destination add
-                                // a number to the end
-                                while (dest.exists()) {
-                                        dest = new File(destPath + ++copyNumber + File.separator);
-                                }
-                                if (!framesetDirectory.renameTo(dest)) {
-                                        for (File f : framesetDirectory.listFiles()) {
-                                                if (!f.delete()) {
-                                                        return false;
-                                                }
-                                        }
-                                        if (!framesetDirectory.delete()) {
-                                                return false;
-                                        }
-                                }
-                                return true;
-                        }
-                }
-                return false;
+                        }
+                        if (!framesetDirectory.delete()) {
+                                return false;
+                        }
+                        return true;
+                } else {
+                        return false;
+                }
         }