From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 10 Nov 2015 09:34:26 +0000 (+0100)
Subject: fixing #5319
X-Git-Tag: 3.12.0^2~70
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/cf307878633de55394ad19e22052c77f5b76d73f

fixing #5319
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
index 26e410dfb..72cc267f3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
@@ -64,7 +64,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
 	    if(super.getText()!=null){
 	        String text = super.getText().trim();
 	        try {
-	            return StringUtils.isBlank(text) ? null : new Integer(text);
+	            return StringUtils.isBlank(text) ? 0 : new Integer(text);
 	        } catch (NumberFormatException e) {
 	            exception = e;
 	        }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
index 54c595239..f448fe3c4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
@@ -118,13 +118,27 @@ public class PartialElement extends AbstractCdmFormElement implements ISelectabl
 
 	private void handleEvent(Object eventSource){
 		if(eventSource == number_month){
-			partial = TimePeriod.setPartialField(partial, number_month.getInteger(), TimePeriod.MONTH_TYPE);
+			if (number_month.getInteger() == 0){
+				partial = TimePeriod.setPartialField(partial, null, TimePeriod.MONTH_TYPE);
+			} else{
+				partial = TimePeriod.setPartialField(partial, number_month.getInteger(), TimePeriod.MONTH_TYPE);
+			}
 			
 		}else if(eventSource == number_day){
-			partial = TimePeriod.setPartialField(partial, number_day.getInteger(), TimePeriod.DAY_TYPE);
+			if (number_day.getInteger() == 0){
+				partial = TimePeriod.setPartialField(partial, null, TimePeriod.DAY_TYPE);
+			} else{
+				partial = TimePeriod.setPartialField(partial, number_day.getInteger(), TimePeriod.DAY_TYPE);
+			}
+			
 			
 		}else if(eventSource == number_year){
-			partial = TimePeriod.setPartialField(partial, number_year.getInteger(), TimePeriod.YEAR_TYPE);
+			if (number_year.getInteger() == 0){
+				partial = TimePeriod.setPartialField(partial, null, TimePeriod.YEAR_TYPE);
+			} else{
+				partial = TimePeriod.setPartialField(partial, number_year.getInteger(), TimePeriod.YEAR_TYPE);
+			}
+			
 		}
 		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}