fix #7728 Fix initialisation of form toolkit in DateElement

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 4f3e6ffd4ac0f98b6d0839e92fe33dc0003e1b2e..00679c99350153d116cad7300c725419e220ed84 100644 (file)
--- 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 d517ef76e1c7afa2027f169f37f1c032ad9be8fa..1681223d0d9a9cdd3fb153bff08234102a783fca 100644 (file)
--- 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<DateElementController>  {
 
-    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<DateElementController>  {
      * @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);
         }