Changeset 1434 for trunk/src/org/expeditee/auth
- Timestamp:
- 10/02/19 14:19:48 (5 years ago)
- Location:
- trunk/src/org/expeditee/auth
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/auth/AuthenticatorBrowser.java
r1389 r1434 81 81 82 82 private KeyStore keyStore = KeyStore.getInstance(KeystoreType); 83 public static String USER_NOBODY = " nobody";83 public static String USER_NOBODY = "${USER.NAME}"; 84 84 85 85 private static final byte[] TRUE = "yes".getBytes(); … … 124 124 g.setWindowSize(new Dimension(UserSettings.InitialWidth.get(), UserSettings.InitialHeight.get())); 125 125 setInputManagerWindowRoutines(); 126 126 127 127 // Load documentation and start pages 128 128 FrameUtils.extractResources(false); … … 133 133 // initialing settings does not require a user profile established 134 134 Settings.Init(); 135 136 // Ensure messages go to public directory whilst we are not logged into an account. 137 FrameIO.MESSAGES_PATH = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-public").resolve("messages").toString() + File.separator; 135 138 136 139 // navigate to authentication frame -
trunk/src/org/expeditee/auth/account/Authenticate.java
r1401 r1434 32 32 import org.expeditee.gui.Frame; 33 33 import org.expeditee.gui.FrameIO; 34 import org.expeditee.gui.FrameUtils; 34 35 import org.expeditee.gui.MessageBay; 35 36 import org.expeditee.items.Item; … … 96 97 97 98 // Parse the users profile to refresh settings. 98 Text settingsLink = new Text("settings"); 99 settingsLink.setLink(oneFrame.getFramesetName() + "2"); 100 Settings.parseSettings(settingsLink); 99 //Text settingsLink = new Text("settings"); 100 //settingsLink.setLink(oneFrame.getFramesetName() + "2"); 101 //Settings.parseSettings(settingsLink); 102 FrameUtils.ParseProfile(oneFrame); 101 103 102 104 // At this point we at least login, but maybe with problems. -
trunk/src/org/expeditee/auth/account/Create.java
r1402 r1434 36 36 import org.expeditee.gui.MessageBay; 37 37 import org.expeditee.gui.MessageBay.Progress; 38 import org.expeditee.gui.management.ProfileManager; 38 39 import org.expeditee.io.ExpReader; 39 40 import org.expeditee.items.Item; … … 85 86 86 87 // Update in memory settings 88 ProfileManager.ensureDefaultProfile(); 87 89 System.setProperty("user.name", username); 88 90 UserSettings.UserName.set(username); … … 119 121 120 122 System.err.println("**** Hardwired call in Apollo's AuthioPathManager"); 121 AudioPathManager.activateAndScanAudioDir (); // ****123 AudioPathManager.activateAndScanAudioDirs(); // **** 122 124 123 125 progress = progress(message + "Done.", progress, step, progressBar);
Note:
See TracChangeset
for help on using the changeset viewer.