Changeset 1274 for trunk/src/org/expeditee/gui/FrameIO.java
- Timestamp:
- 03/29/19 16:46:34 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/FrameIO.java
r1271 r1274 93 93 // The parent path that all others are relative to. Also referred to as Expeditee Home. 94 94 public static String PARENT_FOLDER; 95 96 // The below paths are categorised based on their use in the new/old regime. See UserSettings.appendDefaultFolders for more inforamtion. 97 // Paths used by Both the new regime (multiuser mode) and the old regime. 95 98 96 public static String PROFILE_PATH; 99 97 public static String FRAME_PATH; 100 public static String MESSAGES_PATH;101 98 public static String IMAGES_PATH; 102 99 public static String AUDIO_PATH; 103 100 public static String PUBLIC_PATH; 104 101 public static String TRASH_PATH; 105 106 // Paths used by both the new regime and the old regime, that points to different locations based on regime setting.107 102 public static String FONT_PATH; 108 103 public static String DICT_PATH; 109 public static String EXPORTS_ DIR;110 public static String STATISTICS_ DIR;111 public static String LOGS_ DIR;112 113 // Paths used only by new regime.104 public static String EXPORTS_PATH; 105 public static String STATISTICS_PATH; 106 public static String LOGS_PATH; 107 public static String MESSAGES_PATH; 108 public static String MAIL_PATH; 114 109 public static String SHARED_FRAMESETS_PATH; 115 110 public static String CONTACTS_PATH; 116 public static String RESOURCES_PRIVATE ;111 public static String RESOURCES_PRIVATE_PATH; 117 112 public static String RESOURCES_PATH; 118 113 public static String FRAME_PRIVATE_PATH; … … 120 115 public static String AUDIO_PRIVATE_PATH; 121 116 public static String HELP_PRIVATE_PATH; 122 123 // Paths used only by old regime.124 117 public static String HELP_PATH; 125 118 126 119 // Paths that appear to be unused. 127 120 public static String TEMPLATES_PATH; … … 139 132 public static void changeParentAndSubFolders(String newFolder) { 140 133 // Partial Paths. 141 PARENT_FOLDER = newFolder; 142 134 PARENT_FOLDER = newFolder; 143 135 String resourcesPublicPath = PARENT_FOLDER + "resources-public" + File.separator; 136 String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator; 144 137 145 138 // Standard paths. 146 139 PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator; 147 MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;148 140 TRASH_PATH = PARENT_FOLDER + "trash" + File.separator; 141 //MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator; 149 142 HELP_PATH = PARENT_FOLDER + "documentation" + File.separator; 150 143 PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator; 151 EXPORTS_ DIR= PARENT_FOLDER + "exports" + File.separator;152 STATISTICS_ DIR= PARENT_FOLDER + "statistics" + File.separator;153 LOGS_ DIR= PARENT_FOLDER + "logs" + File.separator;144 EXPORTS_PATH = PARENT_FOLDER + "exports" + File.separator; 145 STATISTICS_PATH = PARENT_FOLDER + "statistics" + File.separator; 146 LOGS_PATH = PARENT_FOLDER + "logs" + File.separator; 154 147 155 148 … … 181 174 RESOURCES_PATH = null; 182 175 SHARED_FRAMESETS_PATH = null; 183 RESOURCES_PRIVATE = null;176 RESOURCES_PRIVATE_PATH = null; 184 177 FRAME_PRIVATE_PATH = null; 185 178 IMAGES_PRIVATE_PATH = null; 186 179 AUDIO_PRIVATE_PATH = null; 187 180 CONTACTS_PATH = null; 181 HELP_PRIVATE_PATH = null; 182 183 if (!UserSettings.PublicAndPrivateResources) { 184 MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator; 185 } else { 186 MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator; 187 } 188 188 189 } else { 189 String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;190 191 190 RESOURCES_PATH = resourcesPublicPath + "documentation" + File.separator; 192 191 SHARED_FRAMESETS_PATH = resourcesPrivateIndividualPath + "framesets-shared" + File.separator; 193 192 194 RESOURCES_PRIVATE = PARENT_FOLDER + "resources-private" + File.separator;193 RESOURCES_PRIVATE_PATH = PARENT_FOLDER + "resources-private" + File.separator; 195 194 FRAME_PRIVATE_PATH = resourcesPrivateIndividualPath + "framesets" + File.separator; 196 195 IMAGES_PRIVATE_PATH = resourcesPrivateIndividualPath + "images" + File.separator; … … 198 197 CONTACTS_PATH = resourcesPrivateIndividualPath + "contacts" + File.separator; 199 198 HELP_PRIVATE_PATH = resourcesPrivateIndividualPath + "documentation" + File.separator; 199 MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator; 200 MAIL_PATH = resourcesPrivateIndividualPath + "mail" + File.separator; 200 201 } 201 202 … … 1928 1929 Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username); 1929 1930 personalResources.toFile().mkdir(); 1930 File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE ).toFile().listFiles();1931 File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE_PATH).toFile().listFiles(); 1931 1932 1932 1933 try {
Note:
See TracChangeset
for help on using the changeset viewer.