remove pattern string from DateElement when no data are available

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 09c4f55bb1cd1a26902dc2075f5b09c1d279270f..4c856c384bd4912b80907d5e25def1bfbeeb41ea 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
@@ -58,7 +58,7 @@ public class DateElement extends AbstractCdmComposite<DateElementController>  {
     private Text textDate;
     private final Button openDateDialog;
     
-    private static final String pattern = "yyyy-MM-dd HH:mm:ss";
+    private static final String pattern = "yyyy-MM-dd HH:mm";
    
 
     /**
@@ -94,17 +94,16 @@ public class DateElement extends AbstractCdmComposite<DateElementController>  {
        layout.numColumns = 2;
                
        composite.setLayout(layout);
-       composite.setSize(400, composite.getSize().y);
-       int width = composite.getSize().x;
        
-       // textDate = new Text(composite, SWT.BORDER|SWT.FILL);
-       textDate = toolkit.createText(composite, "yyyy-mm-dd HH:mm:ss", style);
+       
+       // textDate = new Text(composite, SWT.BORDER|SWT.FILL);new Text(parent, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
+       textDate = toolkit.createText(composite, null, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
+       
         textDate.setEditable(editableText);
        
-        GridData gridData = new GridData();
-        gridData.minimumWidth = 200;
-     
-        
+        GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+        gridData.minimumWidth = 100;
+                       
         textDate.setLayoutData(gridData);
         openDateDialog = new Button (composite, SWT.PUSH);
         Image image = ImageResources.getImage(ImageResources.DATE);
@@ -192,6 +191,7 @@ public class DateElement extends AbstractCdmComposite<DateElementController>  {
                        this.controller.setDateTime(data);
                        this.textDate.setText(initialDateTime.toString(pattern));
                        
+                       
                }
 
                

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java
index 825d4f7022d4024a0cdbfa547b9e6bcb902450ed..35ae31381dd9c3fd24c973a9cfbbca4164ed8773 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java
@@ -42,7 +42,10 @@ public class DateElementController extends AbstractCdmFormElement implements IEn
     public DateElementController(DateElement dateTimeElement, CdmFormFactory formFactory, ICdmFormElement parentElement, DateTime initialDateTime) {
         super(formFactory, parentElement);
         this.textDate = dateTimeElement.getTextDate();
-        this.textDate.setText(initialDateTime!=null?initialDateTime.toString("yyyy-MM-dd HH:mm:ss"):"yyyy-mm-dd HH:mm:ss");
+       if (initialDateTime != null){
+          this.textDate.setText(initialDateTime.toString("yyyy-MM-dd HH:mm"));
+       }
+       // this.textDate.setText(initialDateTime!=null?initialDateTime.toString("yyyy-MM-dd HH:mm"):null);
         addControl(textDate);
         dateTime = initialDateTime;
         textDate.addModifyListener(this);