Changeset 4797

Timestamp:

06/09/08 07:21:27 (6 months ago)

Author:

jonas.granvik@…

Message:

Caption is set ok, if mail is read in new window.

Files:

• incubator/imap-portlet/src/com/itmill/toolkit/incubator/imapportlet/ImapPortlet.java (modified) (6 diffs)

incubator/imap-portlet/src/com/itmill/toolkit/incubator/imapportlet/ImapPortlet.java

@@ -99 +99 @@
 
     ExpandLayout mainLayout;
-    Window writeWin;
+    Window writeWin, readMailWin;
 
     // Initializing buttons
@@ -644 +644 @@
     private boolean closeMail() {
         mailLayout.removeAllComponents();
+        if (isPortlet && portletWindowState == WindowState.NORMAL) {
+            main.removeWindow(readMailWin);
+        }
         return true;
     }
@@ -890 +893 @@
                     // if portlet with normal window state, redefine where
                     // mailLayout is. It should be in new window.
-                    Window readMailWin = new Window();
+                    readMailWin = new Window();
+                    readMailWin.setCaption(mailTable.getItem(target)
+                            .getItemProperty(
+                                    ImapPortletConstants.PROPERTY_SUBJECT)
+                            .toString());
                     main.addWindow(readMailWin);
                     readMailWin.addComponent(mailLayout);
@@ -933 +940 @@
     public void buttonClick(ClickEvent event) {
         Component tab = event.getButton().getParent().getParent();
-        // if (closeButtons.contains(event.getButton())) {
-        // // close the tab (and mail)
-        // if (closeMail(tab)) {
-        // // remove close button from list
-        // closeButtons.remove(event.getButton());
-        // // remove reply button from ArrayList
-        // Iterator it = ((OrderedLayout) event.getButton().getParent())
-        // .getComponentIterator();
-        // while (it.hasNext()) {
-        // Object ob = it.next();
-        // if (ob instanceof Button
-        // && ((Button) ob).getCaption().equals("Reply")) {
-        // // if correct component found
-        // replyButtons.remove(ob);
-        // }
-        // }
-        // }
+
         if (event.getButton() == closeButton) {
             closeMail();
@@ -978 +969 @@
                 loggedIn = true;
             }
-            buildFullView();
+            buildView();
 
         } else if (event.getButton() == cancelLoginButton) {
@@ -993 +984 @@
             mailFolder = null;
             buildView();
-            // resetLoginForm();
 
         } else if (event.getButton() == writeButton) {