Changeset 1304
- Timestamp:
- 04/11/19 16:19:58 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/Debug.java
r1280 r1304 131 131 132 132 public static void FrameCreatorTest() { 133 FrameCreator creator = new FrameCreator("testFrameset", FrameIO.FRAME_PATH, "TestFrameset", FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false );133 FrameCreator creator = new FrameCreator("testFrameset", FrameIO.FRAME_PATH, "TestFrameset", FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false, null); 134 134 creator.addText("Test1", Colour.CYAN, null, null, true); 135 135 136 creator = new FrameCreator("testFrameset", FrameIO.FRAME_PATH, "TestFrameset", FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false );136 creator = new FrameCreator("testFrameset", FrameIO.FRAME_PATH, "TestFrameset", FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false, null); 137 137 creator.addText("Test2", Colour.CYAN, null, null, true); 138 138 139 creator = new FrameCreator("testFrameset", FrameIO.FRAME_PATH, "TestFrameset", FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, false );139 creator = new FrameCreator("testFrameset", FrameIO.FRAME_PATH, "TestFrameset", FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, false, null); 140 140 creator.addText("Test3", Colour.CYAN, null, null, true); 141 141 } -
trunk/src/org/expeditee/agents/SearchAgent.java
r1280 r1304 98 98 + "]"+getResultsTitleSuffix(); 99 99 _results = new FrameCreator(resultsFrameset, FrameIO.FRAME_PATH, title, 100 FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, true );100 FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, true, null); 101 101 // Set the frame to be displayed after running the agent 102 102 _end = _results.getFirstFrame(); -
trunk/src/org/expeditee/agents/mail/MailSession.java
r1280 r1304 527 527 final FrameCreator frames = new FrameCreator(frame 528 528 .getFramesetName(), frame.getPath(), subject, 529 FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false );529 FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false, null); 530 530 531 531 frames.addText("@date: " + message.getSentDate(), null, -
trunk/src/org/expeditee/auth/Actions.java
r1303 r1304 174 174 175 175 createAccount(userData); 176 login(userData);176 Authenticate.login(userData); 177 177 AuthenticatorBrowser.Authenticated = true; 178 178 } else { … … 439 439 f.setChanged(true); 440 440 if (f.getNumber() != AuthenticatorBrowser.CREDENTIALS_FRAME) { 441 f.setEncryptionLabel( "Profile");441 f.setEncryptionLabel(AuthenticatorBrowser.PROFILEENCRYPTIONLABEL); 442 442 } 443 443 Collection<Item> secretsLink = getByContent(f, "Secrets"); -
trunk/src/org/expeditee/auth/AuthenticatorBrowser.java
r1303 r1304 74 74 public static int CREDENTIALS_FRAME = -1; 75 75 public static final String ADMINACCOUNT = "authadmin"; 76 public static final String PROFILEENCRYPTIONLABEL = "Profile"; 76 77 77 78 public static boolean Authenticated = false; -
trunk/src/org/expeditee/auth/gui/MailBay.java
r1303 r1304 5 5 import java.util.Map; 6 6 7 import org.expeditee.auth.AuthenticatorBrowser; 7 8 import org.expeditee.core.Clip; 8 9 import org.expeditee.core.Colour; … … 100 101 if (_creator == null || _forUser != UserSettings.UserName.get()) { 101 102 _forUser = UserSettings.UserName.get(); 102 _creator = new FrameCreator(EXPEDITEE_MAIL_FRAMESET_NAME, FrameIO.MAIL_PATH, EXPEDITEE_MAIL_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.AppendAfterLastItem, false );103 _creator = new FrameCreator(EXPEDITEE_MAIL_FRAMESET_NAME, FrameIO.MAIL_PATH, EXPEDITEE_MAIL_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.AppendAfterLastItem, false, AuthenticatorBrowser.PROFILEENCRYPTIONLABEL); 103 104 } 104 105 -
trunk/src/org/expeditee/gui/FrameCreator.java
r1293 r1304 81 81 private final List<Frame> framesCreated = new LinkedList<Frame>(); 82 82 83 private String encryptionLabel; 84 83 85 public FrameCreator(String frameTitle) { 84 86 this(DisplayController.getCurrentFrame().getFramesetName(), DisplayController.getCurrentFrame().getPath(), 85 frameTitle, ExistingFramesetOptions.AppendSegregatedFrames, false); 86 } 87 88 public FrameCreator(String framesetName, String path, String frameTitle, ExistingFramesetOptions establishState, boolean multiColumn) { 87 frameTitle, ExistingFramesetOptions.AppendSegregatedFrames, false, null); 88 } 89 90 public FrameCreator(String framesetName, String path, String frameTitle, ExistingFramesetOptions establishState, boolean multiColumn, String encryptionLabel) { 91 this.encryptionLabel = encryptionLabel; 89 92 switch (establishState) { 90 93 case OverrideExistingFrames: … … 168 171 toUse = FrameIO.CreateFrameset(framesetName, path.toAbsolutePath().toString() + File.separator, true); 169 172 } 173 174 if (encryptionLabel != null && encryptionLabel.length() > 0) { 175 toUse.setEncryptionLabel(encryptionLabel); 176 } 170 177 171 178 this.framesCreated.add(toUse); … … 243 250 // add link to new frame 244 251 addFirstButton(newFrame, _firstFrame.getName()); 252 253 if (encryptionLabel != null && encryptionLabel.length() > 0) { 254 newFrame.setEncryptionLabel(encryptionLabel); 255 } 245 256 246 257 FrameIO.SaveFrame(_current, false); -
trunk/src/org/expeditee/gui/MessageBay.java
r1303 r1304 227 227 public static void updateFramesetLocation() { 228 228 if (_forUser != UserSettings.UserName.get()) { 229 _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, 230 false); 229 if (AuthenticatorBrowser.isAuthenticated()) { 230 _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, 231 false, AuthenticatorBrowser.PROFILEENCRYPTIONLABEL); 232 } else { 233 _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, 234 false, null); 235 } 231 236 _forUser = UserSettings.UserName.get(); 232 237 } … … 277 282 278 283 if (_creator == null) { 279 _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, 280 false); 284 if (AuthenticatorBrowser.isAuthenticated()) { 285 _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, 286 false, AuthenticatorBrowser.PROFILEENCRYPTIONLABEL); 287 } else { 288 _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames, 289 false, null); 290 } 281 291 _forUser = UserSettings.UserName.get(); 282 292 } -
trunk/src/org/expeditee/settings/Settings.java
r1303 r1304 238 238 private static void generateSettingsTree(String page, Text text) { 239 239 Frame parent = text.getParentOrCurrentFrame(); 240 FrameCreator frames = new FrameCreator(parent.getFramesetName(), parent.getPath(), page, FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false );240 FrameCreator frames = new FrameCreator(parent.getFramesetName(), parent.getPath(), page, FrameCreator.ExistingFramesetOptions.AppendSegregatedFrames, false, null); 241 241 text.setLink(frames.getName()); 242 242
Note:
See TracChangeset
for help on using the changeset viewer.