Changeset 1280 for trunk/src/org/expeditee/auth

Timestamp:

04/04/19 14:41:47 (5 years ago)

Author:

bln4

Message:

Renamed MailMode action to ToggleBay
Renamed FrameCreator enums to more desirable names (David request)
Created test for altered functionality of FrameCreator as documented below.

FrameCreator now more cleanly obeys the specification of the enum parameter to its constructor. For example, override existing frameset ensures that the old frameset has been deleted (moved to trash).

Location:

trunk/src/org/expeditee/auth

Files:

• Actions.java (modified) (1 diff)
• gui/MailBay.java (modified) (3 diffs)

trunk/src/org/expeditee/auth/Actions.java

@@ -97 +97 @@
          * @throws ParseException 
          */
-        public static void MailMode() throws KeyStoreException, FileNotFoundException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException, IOException, ParseException {
+        public static void ToggleBay() throws KeyStoreException, FileNotFoundException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException, IOException, ParseException {
                 if (!DisplayController.isMailMode()) {
                         Mail.clear();

trunk/src/org/expeditee/auth/gui/MailBay.java

@@ -93 +93 @@
                 if (_creator == null || currentUser != UserSettings.UserName.get()) {
                         currentUser = UserSettings.UserName.get();
-                        _creator = new FrameCreator(EXPEDITEE_MAIL_FRAMESET_NAME, FrameIO.MAIL_PATH, EXPEDITEE_MAIL_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.ReobtainStateFromExistingFrames, false);
+                        _creator = new FrameCreator(EXPEDITEE_MAIL_FRAMESET_NAME, FrameIO.MAIL_PATH, EXPEDITEE_MAIL_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.AppendAfterLastItem, false);
                 }
                                 
@@ -107 +107 @@
                 Mail mail = new Mail(message, message2, options);
                 Text t = mail.getPreviewMessage(true);
-                _previewMessages.add(t);
                 _messages.add(t);
                 _creator.addText(timestamp, Colour.BLACK, null, null, false);
@@ -113 +112 @@
                         _creator.addItem(line.copy(), false);
                 }
+                t.setLink(_creator.getCurrentFrame().getName());
+                _previewMessages.add(t);
                 _creator.addSpace(SPACING);
                 _creator.save();