From 656cc90a6ba5dbe24426373b9043fe92413bdcb2 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Thu, 6 Sep 2018 15:53:00 +0200 Subject: [PATCH] fix #7728 Fix initialisation of form toolkit in DateElement --- .../etaxonomy/taxeditor/ui/element/CdmFormFactory.java | 2 +- .../taxeditor/ui/mvc/element/DateElement.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java index 4f3e6ffd4..00679c993 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java @@ -3022,7 +3022,7 @@ public class CdmFormFactory extends FormToolkit { Label label = new Label(formElement.getLayoutComposite(), style); label.setText(labelText); label.setLayoutData(new TableWrapData(TableWrapData.LEFT, TableWrapData.MIDDLE, 1, 1)); - DateElement dateElement = new DateElement(this, formElement.getLayoutComposite(), dateTime, labelText, style, editableText); + DateElement dateElement = new DateElement(formElement.getLayoutComposite(), dateTime, labelText, style, editableText); dateElement.initController(this, formElement); dateElement.setLayoutData(new TableWrapData(TableWrapData.LEFT, TableWrapData.MIDDLE, 1, 1)); return dateElement; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java index d517ef76e..1681223d0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java @@ -22,6 +22,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DateTime; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -40,7 +41,7 @@ import eu.etaxonomy.taxeditor.ui.mvc.AbstractCdmComposite; */ public class DateElement extends AbstractCdmComposite { - private final FormToolkit toolkit; + private final FormToolkit toolkit = new FormToolkit(Display.getCurrent()); private org.joda.time.DateTime initialDateTime; private Text textDate; private final Button openDateDialog; @@ -53,10 +54,9 @@ public class DateElement extends AbstractCdmComposite { * @param parent * @param style */ - public DateElement(CdmFormFactory toolkit, Composite parent, org.joda.time.DateTime initDateTime, String label, int style, boolean editableText) { - super(parent, style); - this.toolkit = toolkit; - if (initDateTime != null){ + public DateElement(Composite parent, org.joda.time.DateTime initDateTime, String label, int style, boolean editableText) { + super(parent, style); + if (initDateTime != null){ this.initialDateTime = initDateTime.toDateTime(DateTimeZone.UTC); } -- 2.34.1