Changeset 1251 for trunk

Timestamp:

03/18/19 12:31:10 (5 years ago)

Author:

bln4

Message:

Use UserSetting.Username instead of user.name system property; as UserSetting.Username gets updated.

File:

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

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

@@ -161 +161 @@
                         AUDIO_PATH = resourcesPublicPath + "audio" + File.separator;
                         FRAME_PATH = resourcesPublicPath + "framesets" + File.separator;
-                }
-                else {
+                } else {
                         FONT_PATH = PARENT_FOLDER + "fonts" + File.separator;
                         DICT_PATH = PARENT_FOLDER + "dict" + File.separator;
@@ -170 +169 @@
                 }
                 
-                if (!UserSettings.PublicAndPrivateResources || System.getProperty("user.name").equals(Browser.USER_NOBODY)) {
+                if (!UserSettings.PublicAndPrivateResources || UserSettings.UserName.get().equals(Browser.USER_NOBODY)) {
                         
                         if (System.getProperty("user.name").equals(Browser.USER_NOBODY)) {
@@ -185 +184 @@
                         AUDIO_PRIVATE_PATH = null;
                         CONTACTS_PATH = null;
-                }
-                else {
+                } else {
                         String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;