X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fdialogs%2FCmsMessageDialog.java;h=eb881c6bd03cf60fb7e9b7181465f57055b24228;hb=93989c5786472b5fad58aec868fcfd1cd07059da;hp=e076a11086d5270657ccca1a1615316bc8f8102c;hpb=70d8216b289cb08f69d842fad324bb8f26bf03ca;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java index e076a1108..eb881c6bd 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsMessageDialog.java @@ -4,7 +4,6 @@ import org.argeo.cms.CmsMsg; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.Selected; -import org.argeo.eclipse.ui.dialogs.LightweightDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; @@ -60,12 +59,13 @@ public class CmsMessageDialog extends LightweightDialog { body.setLayout(bodyGridLayout); body.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - Label messageLbl = new Label(body, SWT.WRAP); - CmsUiUtils.markup(messageLbl); - messageLbl.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - messageLbl.setFont(EclipseUiUtils.getBoldFont(parent)); - if (message != null) + if (message != null) { + Label messageLbl = new Label(body, SWT.WRAP); + CmsUiUtils.markup(messageLbl); + messageLbl.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); + messageLbl.setFont(EclipseUiUtils.getBoldFont(parent)); messageLbl.setText(message); + } // buttons Composite buttons = new Composite(parent, SWT.NONE); @@ -131,6 +131,10 @@ public class CmsMessageDialog extends LightweightDialog { closeShell(CANCEL); } + protected void cancel() { + closeShell(CANCEL); + } + protected Point getInitialSize() { return new Point(400, 200); }