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

Timestamp:

03/29/19 16:46:34 (5 years ago)

Author:

bln4

Message:

Consistency of FrameIO path names

File:

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

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

@@ -93 +93 @@
         // The parent path that all others are relative to.  Also referred to as Expeditee Home.
         public static String PARENT_FOLDER;
-        
-        // The below paths are categorised based on their use in the new/old regime.  See UserSettings.appendDefaultFolders for more inforamtion.
-        // Paths used by Both the new regime (multiuser mode) and the old regime.
+
         public static String PROFILE_PATH;
         public static String FRAME_PATH;
-        public static String MESSAGES_PATH;
         public static String IMAGES_PATH;
         public static String AUDIO_PATH;
         public static String PUBLIC_PATH;
         public static String TRASH_PATH;
-        
-        // Paths used by both the new regime and the old regime, that points to different locations based on regime setting.
         public static String FONT_PATH;
         public static String DICT_PATH;
-        public static String EXPORTS_DIR;
-        public static String STATISTICS_DIR;
-        public static String LOGS_DIR;
-        
-        // Paths used only by new regime.
+        public static String EXPORTS_PATH;
+        public static String STATISTICS_PATH;
+        public static String LOGS_PATH;
+        public static String MESSAGES_PATH;
+        public static String MAIL_PATH;
         public static String SHARED_FRAMESETS_PATH;
         public static String CONTACTS_PATH;
-        public static String RESOURCES_PRIVATE;
+        public static String RESOURCES_PRIVATE_PATH;
         public static String RESOURCES_PATH;
         public static String FRAME_PRIVATE_PATH;
@@ -120 +115 @@
         public static String AUDIO_PRIVATE_PATH;
         public static String HELP_PRIVATE_PATH;
-        
-        // Paths used only by old regime.
         public static String HELP_PATH;
-        
+
         // Paths that appear to be unused.
         public static String TEMPLATES_PATH;
@@ -139 +132 @@
         public static void changeParentAndSubFolders(String newFolder) {
                 // Partial Paths.
-                PARENT_FOLDER = newFolder;
-                        
+                PARENT_FOLDER = newFolder;      
                 String resourcesPublicPath = PARENT_FOLDER + "resources-public" + File.separator;
+                String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
 
                 // Standard paths.
                 PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator;
-                MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
                 TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
+                //MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
                 HELP_PATH = PARENT_FOLDER + "documentation" + File.separator;
                 PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator;
-                EXPORTS_DIR = PARENT_FOLDER + "exports" + File.separator;
-                STATISTICS_DIR = PARENT_FOLDER + "statistics" + File.separator;
-                LOGS_DIR = PARENT_FOLDER + "logs" + File.separator;
+                EXPORTS_PATH = PARENT_FOLDER + "exports" + File.separator;
+                STATISTICS_PATH = PARENT_FOLDER + "statistics" + File.separator;
+                LOGS_PATH = PARENT_FOLDER + "logs" + File.separator;
                                 
                 
@@ -181 +174 @@
                         RESOURCES_PATH = null;
                         SHARED_FRAMESETS_PATH = null;
-                        RESOURCES_PRIVATE = null;               
+                        RESOURCES_PRIVATE_PATH = null;          
                         FRAME_PRIVATE_PATH = null;
                         IMAGES_PRIVATE_PATH = null;
                         AUDIO_PRIVATE_PATH = null;
                         CONTACTS_PATH = null;
+                        HELP_PRIVATE_PATH = null;
+                        
+                        if (!UserSettings.PublicAndPrivateResources) {
+                                MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
+                        } else {
+                                MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator;
+                        }
+                        
                 } else {
-                        String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
-                        
                         RESOURCES_PATH = resourcesPublicPath + "documentation" + File.separator;
                         SHARED_FRAMESETS_PATH = resourcesPrivateIndividualPath + "framesets-shared" + File.separator;
                         
-                        RESOURCES_PRIVATE = PARENT_FOLDER + "resources-private" + File.separator;
+                        RESOURCES_PRIVATE_PATH = PARENT_FOLDER + "resources-private" + File.separator;
                         FRAME_PRIVATE_PATH = resourcesPrivateIndividualPath + "framesets" + File.separator;
                         IMAGES_PRIVATE_PATH = resourcesPrivateIndividualPath + "images" + File.separator;
@@ -198 +197 @@
                         CONTACTS_PATH = resourcesPrivateIndividualPath + "contacts" + File.separator;
                         HELP_PRIVATE_PATH = resourcesPrivateIndividualPath + "documentation" + File.separator;
+                        MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator;
+                        MAIL_PATH = resourcesPrivateIndividualPath + "mail" + File.separator;
                 } 
                         
@@ -1928 +1929 @@
                 Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username);
                 personalResources.toFile().mkdir();             
-                File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE).toFile().listFiles();
+                File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE_PATH).toFile().listFiles();
                 
                 try {