Changeset 1293

Timestamp:

04/08/19 11:16:39 (5 years ago)

Author:

bln4

Message:

Fixed bug relating to FrameCreator under 'OverrideExistingFrames' mode that was causing multiple unnecessary messages frames from stacking framesets and messages.

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (1 diff)
• gui/Browser.java (modified) (1 diff)
• gui/FrameCreator.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (6 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -1162 +1162 @@
 
         public static void moveToPublic(Frame frame) {
-                FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.PUBLIC_PATH);
+                FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.PUBLIC_PATH, false);
         }
 
         public static void moveToPrivate(Frame frame) {
-                FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.FRAME_PATH);
+                FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.FRAME_PATH, false);
         }
 

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

@@ -427 +427 @@
 
                         // Finally remove the messages frameset
-                        FrameIO.moveFrameset("messages", FrameIO.MESSAGES_PATH);
+                        FrameIO.moveFrameset("messages", FrameIO.MESSAGES_PATH, false);
 
                         /*

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

@@ -95 +95 @@
                                         FrameIO.EnableCache();
                                         FrameIO.deleteFrameset(framesetName);
-                                        FrameIO.moveFrameset(framesetName, framesetDir.toAbsolutePath().toString() + File.separator, path);
+                                        FrameIO.moveFrameset(framesetName, framesetDir.toAbsolutePath().toString() + File.separator, path, true);
                                         _current.setPath(path);
+                                        framesetDir.toFile().deleteOnExit();
                                 } catch (IOException e) {
                                         e.printStackTrace();
@@ -306 +307 @@
 
                         _current.addItem(toAdd);
-                        // _current.addAllItems(items);
+                        
+                        _lastY = toAdd.getY() + toAdd.getBoundsHeight() / 2;
+                        _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);
+                        
                         if (bSave)
                                 save();
-
-                        _lastY = toAdd.getY() + toAdd.getBoundsHeight() / 2;
-                        _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);
 
                         return true;

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

@@ -36 +36 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.sql.Time;
 import java.util.Arrays;
@@ -1724 +1725 @@
 
         public static boolean deleteFrameset(String framesetName) {
-                return moveFrameset(framesetName, FrameIO.TRASH_PATH);
-        }
-
-        public static boolean moveFrameset(String framesetName,
-                        String destinationFolder) {
+                return moveFrameset(framesetName, FrameIO.TRASH_PATH, true);
+        }
+
+        public static boolean moveFrameset(String framesetName, String destinationFolder, boolean override) {
                 if (!FrameIO.canAccessFrameset(framesetName)) {
                         return false;
@@ -1737 +1737 @@
                 // Search all the available directories for the directory
                 for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
-                        return moveFrameset(framesetName, path, destinationFolder);
+                        return moveFrameset(framesetName, path, destinationFolder, override);
                 }
                 return false;
         }
 
-        public static boolean moveFrameset(String framesetName, String path, String destinationFolder) {
+        public static boolean moveFrameset(String framesetName, String path, String destinationFolder, boolean override) {
                 String source = path + framesetName.toLowerCase() + File.separator;
                 File framesetDirectory = new File(source);
@@ -1758 +1758 @@
                         // destination add
                         // a number to the end
-                        while (dest.exists()) {
+                        while (dest.exists() && !override) {
                                 dest = new File(destPath + ++copyNumber + File.separator);
                         }
                         try {
-                                copyFileTree(framesetDirectory.toPath(), dest.toPath());        
+                                moveFileTree(framesetDirectory.toPath(), dest.toPath());        
                         } catch (IOException e) {
                                 e.printStackTrace();
@@ -1962 +1962 @@
                                 Path p = Paths.get(toCopy.getAbsolutePath());
                                 if (!p.getFileName().toString().equals(".res") && !p.getFileName().toString().equals("about")) {
-                                        copyFileTree(p.toAbsolutePath(), personalResources.resolve(p.getFileName()));
+                                        moveFileTree(p.toAbsolutePath(), personalResources.resolve(p.getFileName()));
                                 }
                         }
@@ -1993 +1993 @@
         }
         
-        private static void copyFileTree(Path source, Path target) throws IOException {
-                Files.copy(source, target);
+        private static void moveFileTree(Path source, Path target) throws IOException {
                 if (source.toFile().isDirectory()) {
+                        if (!target.toFile().exists()) {
+                                Files.copy(source, target);
+                        }
                         File[] files = source.toFile().listFiles();
                         for (File file: files) {
                                 Path asPath = Paths.get(file.getAbsolutePath());
-                                copyFileTree(asPath, target.resolve(asPath.getFileName()));
-                        }
+                                moveFileTree(asPath, target.resolve(asPath.getFileName()));
+                        }
+                } else {
+                        Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
                 }
         }