Changeset 1270 for trunk/src/org/expeditee/gui

Timestamp:

03/25/19 14:33:31 (5 years ago)

Author:

bln4

Message:

On profile creation a new parameter has been introducted. By passing a map, the user is able to nominate settings frames for which to be notified of their construction.

The above functionalty has been used to programmatically establish the frame number for a users credentials frame.

On user account creation, the users credential frame is migrated to the <username>-credentials folder and a redirect is setup. Functionality for doing this has been generisised and placed in FrameIO.

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (1 diff)
• FrameIO.java (modified) (4 diffs)
• FrameUtils.java (modified) (6 diffs)

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

@@ -553 +553 @@
                 if (profile == null) {
                         try {
-                                profile = FrameIO.CreateNewProfile(userName, null);
+                                profile = FrameIO.CreateNewProfile(userName, null, null);
                         } catch (Exception e) {
                                 // TODO tell the user that there was a problem creating the

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

@@ -43 +43 @@
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -1349 +1350 @@
         }
 
-        public static Frame CreateNewProfile(String username, Map<String, Setting> initialSettings) throws InvalidFramesetNameException, ExistingFramesetException  {
+        public static Frame CreateNewProfile(String username, Map<String, Setting> initialSettings, Map<String, Consumer<Frame>> toNotifyOnSet) throws InvalidFramesetNameException, ExistingFramesetException  {
                 Frame profile = CreateFrameset(username, PROFILE_PATH, true);
-                FrameUtils.CreateDefaultProfile(username, profile, initialSettings);
+                FrameUtils.CreateDefaultProfile(username, profile, initialSettings, toNotifyOnSet);
                 return profile;
         }
@@ -1924 +1925 @@
         }
         
-        public static Path setupPersonalResources(String username)
-        {
+        public static Path setupPersonalResources(String username) {
                 Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username);
                 personalResources.toFile().mkdir();             
@@ -1944 +1944 @@
                 
                 return personalResources;
+        }
+        
+        public static void migrateFrame(Frame toMigrate, Path destinationDirectory) {
+                Path source = Paths.get(toMigrate.getFramePathReal());
+                String destination = source.relativize(destinationDirectory).toString().substring(3).replace(File.separator, "/");
+                try {
+                        copyFileTree(source, destinationDirectory);
+                } catch (IOException e) {
+                        System.err.println("FrameIO::migrateFrame: failed to migrate from to new location.  Message: " + e.getMessage());
+                        return;
+                }
+                try {
+                        FileWriter out = new FileWriter(source.toFile());
+                        out.write("REDIRECT:" + destination);
+                        out.flush();
+                        out.close();
+                } catch (IOException e) {
+                        System.err.println("FrameIO::migrateFrame: failed to update file [" + source + "] to redirect to  [" + destination + "] following migration.  Message: " + e.getMessage());
+                }
         }
         

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

@@ -41 +41 @@
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -1514 +1515 @@
         
         public static void CreateDefaultProfile(String profileFor, Frame profile) {
-                CreateDefaultProfile(profileFor, profile, null);
+                CreateDefaultProfile(profileFor, profile, null, null);
         }
 
@@ -1525 +1526 @@
          */
         public static void CreateDefaultProfile(String profileFor, Frame profile, 
-                        Map<String, Setting> specifiedSettings) {
+                        Map<String, Setting> specifiedSettings, Map<String, Consumer<Frame>> notifyWhenGenerated) {
                 // If this is already the default profile then nothing (other than setting
                 // title) needs to be done.
@@ -1539 +1540 @@
                                 try {
                                         // If we do not have a default to copy, create one.
-                                        defaultFrame = FrameIO.CreateNewProfile(UserSettings.DEFAULT_PROFILE_NAME, null);
+                                        defaultFrame = FrameIO.CreateNewProfile(UserSettings.DEFAULT_PROFILE_NAME, null, null);
                                 } catch (InvalidFramesetNameException invalidNameEx) {
                                         MessageBay.errorMessage("Failed to create default profile named: "
@@ -1608 +1609 @@
                                         }
                                 }
+                                if (notifyWhenGenerated != null && notifyWhenGenerated.containsKey(category)) {
+                                        notifyWhenGenerated.get(category).accept(profile);
+                                }
                                 FrameIO.SaveFrame(profile);
                         }
@@ -1714 +1718 @@
                         t.setColor(Colour.GREY);
                         Settings.generateSettingsTree(t);
+                        System.out.println("@Settings: Default settings generation complete.");
 
                         FrameIO.SaveFrame(profile);