Changeset 1271 for trunk

Timestamp:

03/25/19 15:41:36 (5 years ago)

Author:

bln4

Message:

 

Location:

trunk/src/org/expeditee

Files:

• auth/Actions.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (1 diff)

trunk/src/org/expeditee/auth/Actions.java

@@ -54 +54 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.io.ExpReader;
 import org.expeditee.items.Item;
 import org.expeditee.items.PermissionPair;
@@ -465 +466 @@
                 //      migrate credentials frame
                 Frame credentialsFrame = FrameIO.LoadFrame(username + Authenticator.CREDENTIALS_FRAME);
-                FrameIO.migrateFrame(credentialsFrame, Paths.get(credentialsDir.getAbsolutePath()).resolve(Authenticator.CREDENTIALS_FRAME + ".exp"));
+                Path destinationDirectory = Paths.get(credentialsDir.getAbsolutePath());
+                Path destinationFile = destinationDirectory.resolve(Authenticator.CREDENTIALS_FRAME + ExpReader.EXTENTION);
+                FrameIO.migrateFrame(credentialsFrame, destinationFile);
                 //      outbox
                 Connection c = DriverManager.getConnection("jdbc:sqlite:" + credentialsDir.getAbsolutePath() + File.separator + "expmail.db");

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

@@ -1950 +1950 @@
                 String destination = source.relativize(destinationDirectory).toString().substring(3).replace(File.separator, "/");
                 try {
-                        copyFileTree(source, destinationDirectory);
+                        Files.move(source, destinationDirectory);
                 } catch (IOException e) {
                         System.err.println("FrameIO::migrateFrame: failed to migrate from to new location.  Message: " + e.getMessage());