- Timestamp:
- 04/08/19 11:16:39 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/Misc.java
r1274 r1293 1162 1162 1163 1163 public static void moveToPublic(Frame frame) { 1164 FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.PUBLIC_PATH );1164 FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.PUBLIC_PATH, false); 1165 1165 } 1166 1166 1167 1167 public static void moveToPrivate(Frame frame) { 1168 FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.FRAME_PATH );1168 FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.FRAME_PATH, false); 1169 1169 } 1170 1170 -
trunk/src/org/expeditee/gui/Browser.java
r1287 r1293 427 427 428 428 // Finally remove the messages frameset 429 FrameIO.moveFrameset("messages", FrameIO.MESSAGES_PATH );429 FrameIO.moveFrameset("messages", FrameIO.MESSAGES_PATH, false); 430 430 431 431 /* -
trunk/src/org/expeditee/gui/FrameCreator.java
r1288 r1293 95 95 FrameIO.EnableCache(); 96 96 FrameIO.deleteFrameset(framesetName); 97 FrameIO.moveFrameset(framesetName, framesetDir.toAbsolutePath().toString() + File.separator, path );97 FrameIO.moveFrameset(framesetName, framesetDir.toAbsolutePath().toString() + File.separator, path, true); 98 98 _current.setPath(path); 99 framesetDir.toFile().deleteOnExit(); 99 100 } catch (IOException e) { 100 101 e.printStackTrace(); … … 306 307 307 308 _current.addItem(toAdd); 308 // _current.addAllItems(items); 309 310 _lastY = toAdd.getY() + toAdd.getBoundsHeight() / 2; 311 _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX); 312 309 313 if (bSave) 310 314 save(); 311 312 _lastY = toAdd.getY() + toAdd.getBoundsHeight() / 2;313 _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);314 315 315 316 return true; -
trunk/src/org/expeditee/gui/FrameIO.java
r1289 r1293 36 36 import java.nio.file.Path; 37 37 import java.nio.file.Paths; 38 import java.nio.file.StandardCopyOption; 38 39 import java.sql.Time; 39 40 import java.util.Arrays; … … 1724 1725 1725 1726 public static boolean deleteFrameset(String framesetName) { 1726 return moveFrameset(framesetName, FrameIO.TRASH_PATH); 1727 } 1728 1729 public static boolean moveFrameset(String framesetName, 1730 String destinationFolder) { 1727 return moveFrameset(framesetName, FrameIO.TRASH_PATH, true); 1728 } 1729 1730 public static boolean moveFrameset(String framesetName, String destinationFolder, boolean override) { 1731 1731 if (!FrameIO.canAccessFrameset(framesetName)) { 1732 1732 return false; … … 1737 1737 // Search all the available directories for the directory 1738 1738 for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) { 1739 return moveFrameset(framesetName, path, destinationFolder );1739 return moveFrameset(framesetName, path, destinationFolder, override); 1740 1740 } 1741 1741 return false; 1742 1742 } 1743 1743 1744 public static boolean moveFrameset(String framesetName, String path, String destinationFolder ) {1744 public static boolean moveFrameset(String framesetName, String path, String destinationFolder, boolean override) { 1745 1745 String source = path + framesetName.toLowerCase() + File.separator; 1746 1746 File framesetDirectory = new File(source); … … 1758 1758 // destination add 1759 1759 // a number to the end 1760 while (dest.exists() ) {1760 while (dest.exists() && !override) { 1761 1761 dest = new File(destPath + ++copyNumber + File.separator); 1762 1762 } 1763 1763 try { 1764 copyFileTree(framesetDirectory.toPath(), dest.toPath());1764 moveFileTree(framesetDirectory.toPath(), dest.toPath()); 1765 1765 } catch (IOException e) { 1766 1766 e.printStackTrace(); … … 1962 1962 Path p = Paths.get(toCopy.getAbsolutePath()); 1963 1963 if (!p.getFileName().toString().equals(".res") && !p.getFileName().toString().equals("about")) { 1964 copyFileTree(p.toAbsolutePath(), personalResources.resolve(p.getFileName()));1964 moveFileTree(p.toAbsolutePath(), personalResources.resolve(p.getFileName())); 1965 1965 } 1966 1966 } … … 1993 1993 } 1994 1994 1995 private static void copyFileTree(Path source, Path target) throws IOException { 1996 Files.copy(source, target); 1995 private static void moveFileTree(Path source, Path target) throws IOException { 1997 1996 if (source.toFile().isDirectory()) { 1997 if (!target.toFile().exists()) { 1998 Files.copy(source, target); 1999 } 1998 2000 File[] files = source.toFile().listFiles(); 1999 2001 for (File file: files) { 2000 2002 Path asPath = Paths.get(file.getAbsolutePath()); 2001 copyFileTree(asPath, target.resolve(asPath.getFileName())); 2002 } 2003 moveFileTree(asPath, target.resolve(asPath.getFileName())); 2004 } 2005 } else { 2006 Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING); 2003 2007 } 2004 2008 }
Note:
See TracChangeset
for help on using the changeset viewer.