Changeset 1434 for trunk/src/org/expeditee/gui/Browser.java
- Timestamp:
- 10/02/19 14:19:48 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/Browser.java
r1415 r1434 269 269 Text.InitFonts(); 270 270 271 Settings.Init();272 Frame userProfile = loadProfiles();273 274 271 if (!AuthenticatorBrowser.isAuthenticationRequired() && UserSettings.PublicAndPrivateResources) { 275 String userName = UserSettings.ProfileName.get();272 String userName = System.getProperty("user.name"); //UserSettings.ProfileName.get(); 276 273 if (!FrameIO.personalResourcesExist(userName)) { 277 274 FrameIO.setupPersonalResources(userName); 278 275 } 279 276 } 277 278 Settings.Init(); 279 Frame userProfile = loadInitialProfiles(); 280 FrameIO.changeParentAndSubFolders(FrameIO.PARENT_FOLDER); 281 280 282 // Listen for save status to display during and after runtime 281 283 EntitySaveManager.getInstance().addSaveStateChangedEventListener(this); … … 285 287 286 288 // Go to the start frame if specified, otherwise go to the profile frame 287 Frame start = null;288 289 if (getStartFrame() == null) { 289 290 setStartFrame(UserSettings.StartFrame.get()); … … 293 294 } 294 295 296 Frame start = null; 295 297 if ((start = FrameIO.LoadFrame(getStartFrame())) != null) { 296 298 // Make sure HomeFrame gets set … … 527 529 * @return The user's profile frame. 528 530 */ 529 public static Frame load Profiles()531 public static Frame loadInitialProfiles() 530 532 { 531 533 String defaultProfileName = UserSettings.DEFAULT_PROFILE_NAME; 532 String userName = UserSettings.ProfileName.get(); 533 534 String userName = System.getProperty("user.name"); 535 536 Frame defaultProfile = loadProfile(defaultProfileName); 534 537 Frame userProfile = loadProfile(userName); 535 Frame defaultProfile = loadProfile(defaultProfileName);536 538 537 539 MessageBay.warningMessages(FrameUtils.ParseProfile(defaultProfile)); … … 544 546 } 545 547 546 MessageBay.warningMessages(FrameUtils.ParseProfile(userProfile));548 //MessageBay.warningMessages(FrameUtils.ParseProfile(userProfile)); 547 549 548 550 if (cursor != null && !FreeItems.hasCursor()) { 549 551 FreeItems.setCursor(cursor); 550 552 } 553 554 FrameUtils.ParseProfile(userProfile); 551 555 552 556 return userProfile;
Note:
See TracChangeset
for help on using the changeset viewer.