MessageBox: title removal & method chaining

Title of message box was removed because not required/supported anymore
Multi args constructors / static convenience methods were removed,
method chaining is now supported instead.
Renamed intro text to header
Renamed info / actionText to body

13 files changed, 232 insertions, 263 deletions

diff --git a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/form/fields/button/ButtonTest.java b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/form/fields/button/ButtonTest.java
index 7db149f12a..2a73d60ed7 100644
--- a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/form/fields/button/ButtonTest.java
+++ b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/form/fields/button/ButtonTest.java
@@ -87,7 +87,7 @@ public class ButtonTest {
 
           @Override
           protected void execAction() throws ProcessingException {
-            MessageBox.showOkMessage("test", "click", "it");
+            MessageBox.createOk().header("click").body("it").start();
           }
         }
 
@@ -105,7 +105,7 @@ public class ButtonTest {
 
           @Override
           protected void execAction() throws ProcessingException {
-            MessageBox.showOkMessage("test", "click", "it");
+            MessageBox.createOk().header("click").body("it").start();
           }
         }
       }
diff --git a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxTest.java b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxTest.java
index d978f1a11a..4ab0f08dc5 100644
--- a/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxTest.java
+++ b/org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxTest.java
@@ -233,12 +233,11 @@ public class MessageBoxTest {
     Mockito.verify(m_desktopSpy).addMessageBox(argument.capture());
 
     MessageBox messageBox = argument.getValue();
-    assertEquals("Title", TEXTS.get("DeleteConfirmationTitle"), messageBox.getTitle());
-    assertEquals("Intro text", expectedIntro, messageBox.getIntroText());
-    assertEquals("Action text", expectedAction, messageBox.getActionText());
-    assertEquals("Yes button text", TEXTS.get("YesButton"), messageBox.getYesButtonText());
-    assertEquals("No button text", TEXTS.get("NoButton"), messageBox.getNoButtonText());
-    assertEquals("Cancel button text", null, messageBox.getCancelButtonText());
+    assertEquals("Intro text", expectedIntro, messageBox.header());
+    assertEquals("Action text", expectedAction, messageBox.body());
+    assertEquals("Yes button text", TEXTS.get("YesButton"), messageBox.yesButtonText());
+    assertEquals("No button text", TEXTS.get("NoButton"), messageBox.noButtonText());
+    assertEquals("Cancel button text", null, messageBox.cancelButtonText());
   }
 
 }
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorPopup.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorPopup.java
index 1105f2e3e9..975db68e33 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorPopup.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorPopup.java
@@ -51,18 +51,13 @@ public class ErrorPopup {
   public void showMessageBox(Throwable error) {
     ensureErrorParsed(error);
 
-    MessageBox mbox = new MessageBox(
-        m_title,
-        m_text,
-        m_detail,
-        m_acceptText,
-        null,
-        null,
-        m_copyPasteText,
-        null
-        );
-    mbox.setSeverity(m_cause.getStatus().getSeverity());
-    mbox.startMessageBox();
+    MessageBox.create().
+        header(m_text).
+        body(m_detail).
+        yesButtonText(m_acceptText).
+        hiddenText(m_copyPasteText).
+        severity(m_cause.getStatus().getSeverity()).
+        start();
   }
 
   @Internal
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/pwd/PasswordPolicyVerifier.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/pwd/PasswordPolicyVerifier.java
index 9e63340672..beabcd9ff4 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/pwd/PasswordPolicyVerifier.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/pwd/PasswordPolicyVerifier.java
@@ -67,15 +67,18 @@ public class PasswordPolicyVerifier {
         // not expired
         long remainDays = (expiryDate.getTime() - now.getTime()) / 3600000L / 24L;
         if (remainDays < warnInAdvanceDays) {
-          int answer = MessageBox.showYesNoCancelMessage(
-              ScoutTexts.get("PasswordWillExpireTitle"),
-              remainDays == 0 ?
-                  ScoutTexts.get("PasswordWillExpireHeaderX", ScoutTexts.get("Today")) :
-                  remainDays == 1 ?
-                      ScoutTexts.get("PasswordWillExpireHeaderX", ScoutTexts.get("Tomorrow")) :
-                      ScoutTexts.get("PasswordWillExpireHeaderX", ScoutTexts.get("InDaysX", "" + remainDays)),
-              ScoutTexts.get("PasswordWillExpireInfo")
-              );
+          String header;
+          if (remainDays == 0) {
+            header = ScoutTexts.get("PasswordWillExpireHeaderX", ScoutTexts.get("Today"));
+          }
+          else if (remainDays == 1) {
+            header = ScoutTexts.get("PasswordWillExpireHeaderX", ScoutTexts.get("Tomorrow"));
+          }
+          else {
+            header = ScoutTexts.get("PasswordWillExpireHeaderX", ScoutTexts.get("InDaysX", "" + remainDays));
+          }
+
+          int answer = MessageBox.createYesNoCancel().header(header).body(ScoutTexts.get("PasswordWillExpireInfo")).start();
           if (answer == MessageBox.YES_OPTION) {
             changeNow = true;
           }
@@ -83,7 +86,7 @@ public class PasswordPolicyVerifier {
       }
       else {
         // has expired
-        MessageBox.showOkMessage(ScoutTexts.get("PasswordHasExpiredTitle"), ScoutTexts.get("PasswordHasExpiredHeader"), null);
+        MessageBox.createOk().header(ScoutTexts.get("PasswordHasExpiredTitle")).body(ScoutTexts.get("PasswordHasExpiredHeader")).start();
         changeNow = true;
       }
       //
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/DesktopEvent.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/DesktopEvent.java
index 12c6b8c8dd..63ddce9580 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/DesktopEvent.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/DesktopEvent.java
@@ -304,7 +304,7 @@ public class DesktopEvent extends EventObject implements IModelEvent {
       buf.append(" " + m_form.getTitle());
     }
     if (m_messageBox != null) {
-      buf.append(" " + m_messageBox.getTitle());
+      buf.append(" " + m_messageBox.header());
     }
     if (m_outline != null) {
       buf.append(" " + m_outline.getRootNode().getCell().getText());
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/UnsavedFormChangesForm.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/UnsavedFormChangesForm.java
index 9576ed77eb..396b1f8291 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/UnsavedFormChangesForm.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/UnsavedFormChangesForm.java
@@ -219,7 +219,7 @@ public class UnsavedFormChangesForm extends AbstractForm {
         for (IForm f : invalidForms) {
           msg.append("- ").append(getFormDisplayName(f)).append("\n");
         }
-        MessageBox.showOkMessage(TEXTS.get("NotAllCheckedFormsCanBeSaved"), TEXTS.get("NotAllCheckedFormsCanBeSaved"), msg.toString());
+        MessageBox.createOk().header(TEXTS.get("NotAllCheckedFormsCanBeSaved")).body(msg.toString()).start();
         return false;
       }
       return true;
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/bookmark/AbstractBookmarkTreeField.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/bookmark/AbstractBookmarkTreeField.java
index f25eda7e02..6530d4099e 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/bookmark/AbstractBookmarkTreeField.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/bookmark/AbstractBookmarkTreeField.java
@@ -946,7 +946,7 @@ public abstract class AbstractBookmarkTreeField extends AbstractTreeField {
           }
         }
         if (success != null && !success) {
-          MessageBox.showOkMessage(null, null, ScoutTexts.get("ApplyBookmarkToSearchFailedMessage"));
+          MessageBox.createOk().body(ScoutTexts.get("ApplyBookmarkToSearchFailedMessage")).start();
         }
       }
     }
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/form/AbstractForm.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/form/AbstractForm.java
index 2aa0ff37fb..5dea2db091 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/form/AbstractForm.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/form/AbstractForm.java
@@ -1812,16 +1812,11 @@ public abstract class AbstractForm extends AbstractPropertyObserver implements I
       };
       visitFields(collector);
       if (collector.getCollectionCount() > 0 && isAskIfNeedSave()) {
-        MessageBox messageBox = new MessageBox(
-            null,
-            getCancelVerificationText(),
-            null,
-            TEXTS.get("YesButton"),
-            TEXTS.get("NoButton"),
-            TEXTS.get("CancelButton")
-            );
-        messageBox.setSeverity(IStatus.INFO);
-        int result = messageBox.startMessageBox();
+        int result = MessageBox.createYesNoCancel().
+            header(getCancelVerificationText()).
+            severity(IStatus.INFO).
+            start();
+
         if (result == IMessageBox.YES_OPTION) {
           doOk();
           return;
@@ -2371,13 +2366,9 @@ public abstract class AbstractForm extends AbstractPropertyObserver implements I
         }
         catch (Exception e) {
           LOG.warn("loading: " + newPath + " Exception: " + e);
-          new MessageBox(
-              null,
-              TEXTS.get("LoadFormXmlFailedText"),
-              null,
-              TEXTS.get("OkButton"),
-              null,
-              null).startMessageBox();
+          MessageBox.createOk().
+              header(TEXTS.get("LoadFormXmlFailedText")).
+              start();
         }
       }
     }
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/IMessageBox.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/IMessageBox.java
index abe9864785..6f30fac3c1 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/IMessageBox.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/IMessageBox.java
@@ -39,57 +39,53 @@ public interface IMessageBox extends IPropertyObserver {
    */
   IMessageBoxUIFacade getUIFacade();
 
-  String getTitle();
+  String iconId();
 
-  void setTitle(String s);
+  IMessageBox iconId(String iconId);
 
-  String getIconId();
+  int severity();
 
-  void setIconId(String iconId);
+  IMessageBox severity(int severity);
 
-  int getSeverity();
+  String header();
 
-  void setSeverity(int severity);
+  IMessageBox header(String header);
 
-  String getIntroText();
+  String body();
 
-  void setIntroText(String s);
+  IMessageBox body(String body);
 
-  String getActionText();
+  String hiddenText();
 
-  void setActionText(String s);
+  IMessageBox hiddenText(String hiddenText);
 
-  String getHiddenText();
+  String yesButtonText();
 
-  void setHiddenText(String s);
+  IMessageBox yesButtonText(String yesButtonText);
 
-  String getYesButtonText();
+  String noButtonText();
 
-  void setYesButtonText(String s);
+  IMessageBox noButtonText(String noButtonText);
 
-  String getNoButtonText();
+  String cancelButtonText();
 
-  void setNoButtonText(String s);
+  IMessageBox cancelButtonText(String cancelButtonText);
 
-  String getCancelButtonText();
-
-  void setCancelButtonText(String s);
-
-  long getAutoCloseMillis();
+  long autoCloseMillis();
 
   /**
    * To close the message box automatically after the specified period of time. By default, the result
-   * {@link #CANCEL_OPTION} is returned after being closed. This can be changed by using {@link #startMessageBox(int)}
-   * to construct the message box.
+   * {@link #CANCEL_OPTION} is returned after being closed. This can be changed by using {@link #start(int)} to
+   * construct the message box.
    *
-   * @param millis
+   * @param autoCloseMillis
    *          timeout [ms]
    */
-  void setAutoCloseMillis(long millis);
+  IMessageBox autoCloseMillis(long autoCloseMillis);
 
-  String getCopyPasteText();
+  String copyPasteText();
 
-  void setCopyPasteText(String s);
+  IMessageBox copyPasteText(String copyPasteText);
 
   /**
    * To query whether the message box is open or closed.
@@ -103,7 +99,7 @@ public interface IMessageBox extends IPropertyObserver {
    *
    * @return The close result ({@link #YES_OPTION}, {@link #NO_OPTION}, {@link #CANCEL_OPTION}).
    */
-  int startMessageBox();
+  int start();
 
   /**
    * Opens a message box. This call blocks until the message box is closed.
@@ -112,5 +108,5 @@ public interface IMessageBox extends IPropertyObserver {
    *          default result to return if not closed by the user (e.g. by auto-close timer).
    * @return The close result ({@link #YES_OPTION}, {@link #NO_OPTION}, {@link #CANCEL_OPTION}).
    */
-  int startMessageBox(int defaultResult);
+  int start(int defaultResult);
 }
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBox.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBox.java
index a74fb7aaf3..be421d46d4 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBox.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBox.java
@@ -27,6 +27,8 @@ import org.eclipse.scout.rt.client.context.ClientRunContexts;
 import org.eclipse.scout.rt.client.job.ClientJobs;
 import org.eclipse.scout.rt.client.session.ClientSessionProvider;
 import org.eclipse.scout.rt.client.ui.desktop.IDesktop;
+import org.eclipse.scout.rt.platform.BEANS;
+import org.eclipse.scout.rt.platform.Bean;
 import org.eclipse.scout.rt.platform.job.IBlockingCondition;
 import org.eclipse.scout.rt.platform.job.IFuture;
 import org.eclipse.scout.rt.platform.job.JobException;
@@ -34,52 +36,75 @@ import org.eclipse.scout.rt.platform.job.Jobs;
 import org.eclipse.scout.rt.shared.OfficialVersion;
 import org.eclipse.scout.rt.shared.ScoutTexts;
 
+@Bean
 public class MessageBox extends AbstractPropertyObserver implements IMessageBox {
   private static final IScoutLogger LOG = ScoutLogManager.getLogger(MessageBox.class);
 
   /**
-   * Convenience function for simple info message box
+   * Do not use, use {@link #create()} instead.
    */
-  public static int showOkMessage(String title, String header, String info) {
-    MessageBox mbox = new MessageBox(
-        title,
-        header,
-        info,
-        ScoutTexts.get("OkButton"),
-        null,
-        null
-        );
-    return mbox.startMessageBox();
+  public MessageBox() {
+  }
+
+  public static IMessageBox create() {
+    return BEANS.get(IMessageBox.class);
+  }
+
+  /**
+   * Creates a message box with one button labeled OK.
+   * <p>
+   * Do not forget to call {@link #start()} at the end.
+   */
+  public static IMessageBox createOk() {
+    return create().
+        yesButtonText(ScoutTexts.get("OkButton"));
+  }
+
+  /**
+   * Creates e message box with yes and not buttons.
+   */
+  public static IMessageBox createYesNo() {
+    return create().
+        yesButtonText(ScoutTexts.get("YesButton")).
+        noButtonText(ScoutTexts.get("NoButton"));
+  }
+
+  /**
+   * Creates a message box with yes, no and cancel buttons.
+   */
+  public static IMessageBox createYesNoCancel() {
+    return createYesNo().
+        cancelButtonText(ScoutTexts.get("CancelButton"));
+  }
+
+  /**
+   * Convenience function for simple info message box.
+   *
+   * @deprecated use createOk().header(header).body(body).start() instead. Will be removed in the "N" release.
+   */
+  @Deprecated
+  public static int showOkMessage(String title, String header, String body) {
+    return createOk().header(header).body(body).start();
   }
 
   /**
    * Convenience function for simple yes/no message box
+   *
+   * @deprecated use createYesNo().header(header).body(body).start() instead. Will be removed in the "N" release.
    */
-  public static int showYesNoMessage(String title, String header, String info) {
-    MessageBox mbox = new MessageBox(
-        title,
-        header,
-        info,
-        ScoutTexts.get("YesButton"),
-        ScoutTexts.get("NoButton"),
-        null
-        );
-    return mbox.startMessageBox();
+  @Deprecated
+  public static int showYesNoMessage(String title, String header, String body) {
+    return createYesNo().header(header).body(body).start();
   }
 
   /**
    * Convenience function for simple yes/no/cancel message box
+   *
+   * @deprecated use createYesNoCancel().header(header).body(body).start() instead. Will be removed in the "N" release.
    */
-  public static int showYesNoCancelMessage(String title, String header, String info) {
-    MessageBox mbox = new MessageBox(
-        title,
-        header,
-        info,
-        ScoutTexts.get("YesButton"),
-        ScoutTexts.get("NoButton"),
-        ScoutTexts.get("CancelButton")
-        );
-    return mbox.startMessageBox();
+  @Deprecated
+  public static int showYesNoCancelMessage(String title, String header, String body) {
+    return createYesNoCancel().header(header).body(body).start();
   }
 
   /**
@@ -159,80 +184,50 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
       }
     }
     //
-    String intro = null;
-    String action = null;
+    String header = null;
+    String body = null;
     if (itemType != null) {
-      intro = (n > 0 ? ScoutTexts.get("DeleteConfirmationTextX", itemType) : ScoutTexts.get("DeleteConfirmationTextNoItemListX", itemType));
-      action = (n > 0 ? t.toString() : null);
+      header = (n > 0 ? ScoutTexts.get("DeleteConfirmationTextX", itemType) : ScoutTexts.get("DeleteConfirmationTextNoItemListX", itemType));
+      body = (n > 0 ? t.toString() : null);
     }
     else {
-      intro = (n > 0 ? ScoutTexts.get("DeleteConfirmationText") : ScoutTexts.get("DeleteConfirmationTextNoItemList"));
-      action = (n > 0 ? t.toString() : null);
+      header = (n > 0 ? ScoutTexts.get("DeleteConfirmationText") : ScoutTexts.get("DeleteConfirmationTextNoItemList"));
+      body = (n > 0 ? t.toString() : null);
     }
-    MessageBox mbox = new MessageBox(
-        ScoutTexts.get("DeleteConfirmationTitle"),
-        intro,
-        action,
-        ScoutTexts.get("YesButton"),
-        ScoutTexts.get("NoButton"),
-        null
-        );
-    return mbox.startMessageBox() == IMessageBox.YES_OPTION;
+
+    int result = createYesNo().header(header).body(body).start();
+    return result == IMessageBox.YES_OPTION;
   }
 
   /**
    * Instance
    */
   private final EventListenerList m_listenerList = new EventListenerList();
-  private final IMessageBoxUIFacade m_uiFacade;
-  private long m_autoCloseMillis;
-  private String m_title;
+  private final IMessageBoxUIFacade m_uiFacade = new P_UIFacade();
+
+  private long m_autoCloseMillis = -1;
+
   private String m_iconId;
-  private String m_introText;
-  private String m_actionText;
+
+  private String m_header;
+  private String m_body;
+
   private String m_yesButtonText;
   private String m_noButtonText;
   private String m_cancelButtonText;
+
   private String m_hiddenText;
   private String m_copyPasteText;
   // cached
   private String m_copyPasteTextInternal;
   // modality
-  private final IBlockingCondition m_blockingCondition;
+  private final IBlockingCondition m_blockingCondition = Jobs.getJobManager().createBlockingCondition("block", false);
   private IFuture<Void> m_autoCloseJob;
   // result
   private int m_answer;
   private boolean m_answerSet;
   private int m_severity;
 
-  public MessageBox(String title, String introText, String okButtonText) {
-    this(title, introText, null, okButtonText, null, null);
-  }
-
-  public MessageBox(String title, String introText, String actionText, String yesButtonText, String noButtonText, String cancelButtonText) {
-    this(title, introText, actionText, yesButtonText, noButtonText, cancelButtonText, null, null);
-  }
-
-  public MessageBox(String title, String introText, String actionText, String yesButtonText, String noButtonText, String cancelButtonText, String hiddenText, String iconId) {
-    m_uiFacade = new P_UIFacade();
-    m_title = title;
-    m_introText = introText;
-    m_actionText = actionText;
-    m_hiddenText = hiddenText;
-    m_yesButtonText = yesButtonText;
-    m_noButtonText = noButtonText;
-    m_cancelButtonText = cancelButtonText;
-    m_iconId = iconId;
-    m_autoCloseMillis = -1;
-    m_blockingCondition = Jobs.getJobManager().createBlockingCondition("block", false);
-    if (m_title == null) {
-      IDesktop desktop = ClientSessionProvider.currentSession().getDesktop();
-      if (desktop != null) {
-        m_title = desktop.getTitle();
-      }
-    }
-  }
-
   @Override
   public void addPropertyChangeListener(PropertyChangeListener listener) {
     propertySupport.addPropertyChangeListener(listener);
@@ -254,111 +249,109 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
   }
 
   @Override
-  public String getTitle() {
-    return m_title;
+  public String header() {
+    return m_header;
   }
 
   @Override
-  public void setTitle(String s) {
-    m_title = s;
+  public MessageBox header(String header) {
+    m_header = header;
     m_copyPasteTextInternal = null;
+    return this;
   }
 
   @Override
-  public String getIntroText() {
-    return m_introText;
+  public String body() {
+    return m_body;
   }
 
   @Override
-  public void setIntroText(String s) {
-    m_introText = s;
+  public MessageBox body(String body) {
+    m_body = body;
     m_copyPasteTextInternal = null;
+    return this;
   }
 
   @Override
-  public String getActionText() {
-    return m_actionText;
-  }
-
-  @Override
-  public void setActionText(String s) {
-    m_actionText = s;
-    m_copyPasteTextInternal = null;
-  }
-
-  @Override
-  public String getHiddenText() {
+  public String hiddenText() {
     return m_hiddenText;
   }
 
   @Override
-  public void setHiddenText(String s) {
-    m_hiddenText = s;
+  public MessageBox hiddenText(String hiddenText) {
+    m_hiddenText = hiddenText;
     m_copyPasteTextInternal = null;
+    return this;
   }
 
   @Override
-  public String getYesButtonText() {
+  public String yesButtonText() {
     return m_yesButtonText;
   }
 
   @Override
-  public void setYesButtonText(String s) {
-    m_yesButtonText = s;
+  public MessageBox yesButtonText(String yesButtonText) {
+    m_yesButtonText = yesButtonText;
+    return this;
   }
 
   @Override
-  public String getNoButtonText() {
+  public String noButtonText() {
     return m_noButtonText;
   }
 
   @Override
-  public void setNoButtonText(String s) {
-    m_noButtonText = s;
+  public MessageBox noButtonText(String noButtonText) {
+    m_noButtonText = noButtonText;
+    return this;
   }
 
   @Override
-  public String getCancelButtonText() {
+  public String cancelButtonText() {
     return m_cancelButtonText;
   }
 
   @Override
-  public void setCancelButtonText(String s) {
-    m_cancelButtonText = s;
+  public MessageBox cancelButtonText(String cancelButtonText) {
+    m_cancelButtonText = cancelButtonText;
+    return this;
   }
 
   @Override
-  public String getIconId() {
+  public String iconId() {
     return m_iconId;
   }
 
   @Override
-  public void setIconId(String iconId) {
+  public MessageBox iconId(String iconId) {
     m_iconId = iconId;
+    return this;
   }
 
   @Override
-  public int getSeverity() {
+  public int severity() {
     return m_severity;
   }
 
   @Override
-  public void setSeverity(int severity) {
+  public MessageBox severity(int severity) {
     m_severity = severity;
+    return this;
   }
 
   @Override
-  public long getAutoCloseMillis() {
+  public long autoCloseMillis() {
     return m_autoCloseMillis;
   }
 
   @Override
-  public void setAutoCloseMillis(long millis) {
-    m_autoCloseMillis = millis;
+  public MessageBox autoCloseMillis(long autoCloseMillis) {
+    m_autoCloseMillis = autoCloseMillis;
+    return this;
   }
 
   @Override
-  public String getCopyPasteText() {
+  public String copyPasteText() {
     if (m_copyPasteText == null) {
       updateCopyPasteTextInternal();
       return m_copyPasteTextInternal;
@@ -369,8 +362,9 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
   }
 
   @Override
-  public void setCopyPasteText(String s) {
-    m_copyPasteText = s;
+  public MessageBox copyPasteText(String copyPasteText) {
+    m_copyPasteText = copyPasteText;
+    return this;
   }
 
   private void updateCopyPasteTextInternal() {
@@ -386,14 +380,11 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
       buf.append("os.name_version: " + System.getProperty("os.name") + " " + System.getProperty("os.version") + "\n");
       buf.append("user.name: " + System.getProperty("user.name") + "\n");
       buf.append("\n");
-      if (m_title != null) {
-        buf.append(m_title + "\n\n");
-      }
-      if (m_introText != null) {
-        buf.append(m_introText + "\n\n");
+      if (m_header != null) {
+        buf.append(m_header + "\n\n");
       }
-      if (m_actionText != null) {
-        buf.append(m_actionText + "\n\n");
+      if (m_body != null) {
+        buf.append(m_body + "\n\n");
       }
       if (m_hiddenText != null) {
         buf.append(m_hiddenText + "\n\n");
@@ -439,12 +430,12 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
   }
 
   @Override
-  public int startMessageBox() {
-    return startMessageBox(CANCEL_OPTION);
+  public int start() {
+    return start(CANCEL_OPTION);
   }
 
   @Override
-  public int startMessageBox(int defaultResult) {
+  public int start(int defaultResult) {
     m_answerSet = false;
     m_answer = defaultResult;
     if (ClientSessionProvider.currentSession() != null) {
@@ -461,8 +452,8 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
           // request a gui
           desktop.addMessageBox(this);
           // attach auto-cancel timer
-          if (getAutoCloseMillis() > 0) {
-            final long dt = getAutoCloseMillis();
+          if (autoCloseMillis() > 0) {
+            final long dt = autoCloseMillis();
             m_autoCloseJob = ClientJobs.schedule(new IRunnable() {
               @Override
               public void run() throws Exception {
@@ -470,7 +461,7 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
                   closeMessageBox();
                 }
               }
-            }, dt, TimeUnit.MILLISECONDS, ClientJobs.newInput(ClientRunContexts.copyCurrent()).name("Auto-close %s", getTitle()));
+            }, dt, TimeUnit.MILLISECONDS, ClientJobs.newInput(ClientRunContexts.copyCurrent()).name("Auto-close %s", header()));
           }
           // start sub event dispatch thread
           waitFor();
@@ -529,4 +520,5 @@ public class MessageBox extends AbstractPropertyObserver implements IMessageBox
       }
     }
   }
+
 }
diff --git a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxEvent.java b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxEvent.java
index e10e5a90bb..85c990c47f 100644
--- a/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxEvent.java
+++ b/org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/messagebox/MessageBoxEvent.java
@@ -58,7 +58,7 @@ public class MessageBoxEvent extends EventObject implements IModelEvent {
     }
     // messageBox
     if (getMessageBox() != null) {
-      buf.append(" " + getMessageBox().getTitle());
+      buf.append(" " + getMessageBox().header());
     }
     buf.append("]");
     return buf.toString();
diff --git a/org.eclipse.scout.rt.ui.swing.test/src/test/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBoxUiTest.java b/org.eclipse.scout.rt.ui.swing.test/src/test/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBoxUiTest.java
index 82034ca2a9..ccc0576808 100644
--- a/org.eclipse.scout.rt.ui.swing.test/src/test/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBoxUiTest.java
+++ b/org.eclipse.scout.rt.ui.swing.test/src/test/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBoxUiTest.java
@@ -35,69 +35,66 @@ public class SwingScoutMessageBoxUiTest {
 
   @Test
   public void testLabels() {
-    String title = "Title";
-    String introText = "Intro Text";
-    String actionText = "Action Text";
+    String header = "Intro Text";
+    String body = "Action Text";
 
-    SwingScoutMessageBox box = new P_SwingScoutMessageBox(null, title, introText, actionText);
+    SwingScoutMessageBox box = new P_SwingScoutMessageBox(null, header, body);
     box.initializeSwing();
 
     JDialog dialog = box.getSwingDialog();
-    assertEquals(title, dialog.getTitle());
+    assertEquals(header, dialog.getTitle()); // title doesn't exist anymore since N release, header is used instead in Swing
 
     JLabel introLabel = findIntroLabel(dialog);
-    assertEquals(introText, introLabel.getText());
+    assertEquals(header, introLabel.getText());
 
     JLabel actionLabel = findActionLabel(dialog);
-    assertEquals(actionText, actionLabel.getText());
+    assertEquals(body, actionLabel.getText());
   }
 
   /**
-   * In case the introText or actionText is too long, surround the text with html tags to have text wrapping
+   * In case the header or body is too long, surround the text with html tags to have text wrapping
    */
   @Test
   public void testLongWrap() {
-    String title = "Title more text";
-    String introText = "Intro: Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
-    String actionText = "Content: Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
+    String header = "Intro: Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
+    String body = "Content: Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
 
-    SwingScoutMessageBox box = new P_SwingScoutMessageBox(null, title, introText, actionText);
+    SwingScoutMessageBox box = new P_SwingScoutMessageBox(null, header, body);
     box.initializeSwing();
 
     JDialog dialog = box.getSwingDialog();
-    assertEquals(title, dialog.getTitle());
+    assertEquals(header, dialog.getTitle()); // title doesn't exist anymore since N release, header is used instead in Swing
 
     JLabel introLabel = findIntroLabel(dialog);
-    assertEquals("<html>" + introText + "</html>", introLabel.getText());
+    assertEquals("<html>" + header + "</html>", introLabel.getText());
 
     JLabel actionLabel = findActionLabel(dialog);
-    assertEquals("<html>" + actionText + "</html>", actionLabel.getText());
+    assertEquals("<html>" + body + "</html>", actionLabel.getText());
   }
 
   /**
-   * If the introText or actionText is too long and has additional linebreaks, they must be converted to html br tags
+   * If the header or body is too long and has additional linebreaks, they must be converted to html br tags
    */
   @Test
   public void testLongWrapWithLinebreakes() {
-    String title = "Title even more text";
-    String introText = "Intro:\n\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
-    String actionText = "Content:\n\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
+    String header = "Intro:\n\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
+    String body = "Content:\n\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.";
 
-    SwingScoutMessageBox box = new P_SwingScoutMessageBox(null, title, introText, actionText);
+    SwingScoutMessageBox box = new P_SwingScoutMessageBox(null, header, body);
     box.initializeSwing();
 
     JDialog dialog = box.getSwingDialog();
-    assertEquals(title, dialog.getTitle());
+    assertEquals(header, dialog.getTitle()); // title doesn't exist anymore since N release, header is used instead in Swing
 
     JLabel introLabel = findIntroLabel(dialog);
-    assertEquals("<html>" + StringUtility.replaceNewLines(introText, "<br/>") + "</html>", introLabel.getText());
+    assertEquals("<html>" + StringUtility.replaceNewLines(header, "<br/>") + "</html>", introLabel.getText());
 
     JLabel actionLabel = findActionLabel(dialog);
-    assertEquals("<html>" + StringUtility.replaceNewLines(actionText, "<br/>") + "</html>", actionLabel.getText());
+    assertEquals("<html>" + StringUtility.replaceNewLines(body, "<br/>") + "</html>", actionLabel.getText());
   }
 
   /**
-   * Find the intro label in the SwingScoutMessageBox
+   * Find the header label in the SwingScoutMessageBox
    */
   private JLabel findIntroLabel(JDialog dialog) {
     JPanel contentPane = (JPanel) dialog.getContentPane();
@@ -109,7 +106,7 @@ public class SwingScoutMessageBoxUiTest {
   }
 
   /**
-   * Find the action label in the SwingScoutMessageBox
+   * Find the body label in the SwingScoutMessageBox
    */
   private JLabel findActionLabel(JDialog dialog) {
     JPanel contentPane = (JPanel) dialog.getContentPane();
@@ -122,25 +119,21 @@ public class SwingScoutMessageBoxUiTest {
 
   private class P_SwingScoutMessageBox extends SwingScoutMessageBox {
 
-    private String m_title;
-    private String m_introText;
-    private String m_actionText;
+    private String m_header;
+    private String m_body;
 
-    public P_SwingScoutMessageBox(Window swingParent, String title, String introText, String actionText) {
+    public P_SwingScoutMessageBox(Window swingParent, String header, String body) {
       super(swingParent);
-      m_title = title;
-      m_introText = introText;
-      m_actionText = actionText;
+      m_header = header;
+      m_body = body;
     }
 
     @Override
     public IMessageBox getScoutMessageBox() {
       IMessageBox scoutObject = mock(IMessageBox.class);
-      when(scoutObject.getTitle()).thenReturn(m_title);
-      when(scoutObject.getIntroText()).thenReturn(m_introText);
-      when(scoutObject.getActionText()).thenReturn(m_actionText);
+      when(scoutObject.header()).thenReturn(m_header);
+      when(scoutObject.body()).thenReturn(m_body);
       return scoutObject;
     }
-
   }
 }
diff --git a/org.eclipse.scout.rt.ui.swing/src/main/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBox.java b/org.eclipse.scout.rt.ui.swing/src/main/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBox.java
index 995c810f05..ea4e304c9b 100644
--- a/org.eclipse.scout.rt.ui.swing/src/main/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBox.java
+++ b/org.eclipse.scout.rt.ui.swing/src/main/java/org/eclipse/scout/rt/ui/swing/window/messagebox/SwingScoutMessageBox.java
@@ -96,7 +96,7 @@ public class SwingScoutMessageBox extends SwingScoutComposite<IMessageBox> imple
       m_swingDialog = new JDialogEx((Frame) m_swingParent);
     }
     m_swingDialog.setModal(true);
-    String title = getScoutMessageBox().getTitle();
+    String title = getScoutMessageBox().header(); // title doesn't exist anymore since N release
     m_swingDialog.setTitle(title);
     /**
      * WORKAROUND AWT doesn't show a dialog icon if dialog is not resizeable
@@ -107,8 +107,8 @@ public class SwingScoutMessageBox extends SwingScoutComposite<IMessageBox> imple
     JPanel contentPane = (JPanel) m_swingDialog.getContentPane();
     contentPane.setLayout(new P_Layout());
     contentPane.setBackground(new Color(COLOR_LIGHT_GRAY));
-    if (getScoutMessageBox().getIntroText() != null) {
-      String s = getScoutMessageBox().getIntroText();
+    if (getScoutMessageBox().header() != null) {
+      String s = getScoutMessageBox().header();
       JPanel labelPanel = new JPanelEx(new FlowLayoutEx(FlowLayoutEx.LEFT));
       labelPanel.setBorder(new EmptyBorder(VERTICAL_PADDING, HORIZONTAL_PADDING, VERTICAL_PADDING, HORIZONTAL_PADDING));
       labelPanel.setBackground(Color.white);
@@ -119,8 +119,8 @@ public class SwingScoutMessageBox extends SwingScoutComposite<IMessageBox> imple
       labelPanel.add(label);
       contentPane.add(BorderLayout.NORTH, labelPanel);
     }
-    if (getScoutMessageBox().getActionText() != null) {
-      String s = getScoutMessageBox().getActionText();
+    if (getScoutMessageBox().body() != null) {
+      String s = getScoutMessageBox().body();
       JPanel labelPanel = new JPanelEx(new FlowLayoutEx(FlowLayoutEx.LEFT));
       labelPanel.setBorder(new CompoundBorder(new P_TopSeparatorBorder(), new EmptyBorder(VERTICAL_PADDING, HORIZONTAL_PADDING, VERTICAL_PADDING, HORIZONTAL_PADDING)));
       labelPanel.setOpaque(false);
@@ -135,22 +135,22 @@ public class SwingScoutMessageBox extends SwingScoutComposite<IMessageBox> imple
     buttonPanel.setBorder(new CompoundBorder(new P_TopSeparatorBorder(), new EmptyBorder(EMPTY_BORDER_PADDING, EMPTY_BORDER_PADDING, EMPTY_BORDER_PADDING, EMPTY_BORDER_PADDING)));
     buttonPanel.setOpaque(false);
     JButton defaultButton = null;
-    if (getScoutMessageBox().getYesButtonText() != null) {
-      m_swingButtonYes = createButton(getScoutMessageBox().getYesButtonText(), UIManager.getIcon("SystemButton.yesIcon"));
+    if (getScoutMessageBox().yesButtonText() != null) {
+      m_swingButtonYes = createButton(getScoutMessageBox().yesButtonText(), UIManager.getIcon("SystemButton.yesIcon"));
       buttonPanel.add(m_swingButtonYes);
       if (defaultButton == null) {
         defaultButton = m_swingButtonYes;
       }
     }
-    if (getScoutMessageBox().getNoButtonText() != null) {
-      m_swingButtonNo = createButton(getScoutMessageBox().getNoButtonText(), UIManager.getIcon("SystemButton.noIcon"));
+    if (getScoutMessageBox().noButtonText() != null) {
+      m_swingButtonNo = createButton(getScoutMessageBox().noButtonText(), UIManager.getIcon("SystemButton.noIcon"));
       buttonPanel.add(m_swingButtonNo);
       if (defaultButton == null) {
         defaultButton = m_swingButtonNo;
       }
     }
-    if (getScoutMessageBox().getCancelButtonText() != null) {
-      m_swingButtonCancel = createButton(getScoutMessageBox().getCancelButtonText(), UIManager.getIcon("SystemButton.cancelIcon"));
+    if (getScoutMessageBox().cancelButtonText() != null) {
+      m_swingButtonCancel = createButton(getScoutMessageBox().cancelButtonText(), UIManager.getIcon("SystemButton.cancelIcon"));
       buttonPanel.add(m_swingButtonCancel);
       if (defaultButton == null) {
         defaultButton = m_swingButtonCancel;
@@ -177,7 +177,7 @@ public class SwingScoutMessageBox extends SwingScoutComposite<IMessageBox> imple
       addButtonKeyStroke(m_swingButtonYes, "ESCAPE");
     }
     // copy/paste button
-    if (getScoutMessageBox().getHiddenText() != null) {
+    if (getScoutMessageBox().hiddenText() != null) {
       m_swingButtonCopy = createButton(SwingUtility.getNlsText("Copy"), null);
       buttonPanel.add(m_swingButtonCopy);
       addButtonKeyStroke(m_swingButtonCopy, "control C");
@@ -254,7 +254,7 @@ public class SwingScoutMessageBox extends SwingScoutComposite<IMessageBox> imple
     if (b == m_swingButtonCopy) {
       // copy message to clipboard
       Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
-      clip.setContents(new StringSelection(getScoutMessageBox().getHiddenText()), null);
+      clip.setContents(new StringSelection(getScoutMessageBox().hiddenText()), null);
     }
     else {
       int resultOption = -1;