Project

General

Profile

« Previous | Next » 

Revision e61edee4

Added by Andreas Müller almost 4 years ago

ref #8978 adapt app-import to StatisticalMeasurementValue.value as BigDecimal

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/util/TestDatabase.java
6 6

  
7 7
package eu.etaxonomy.cdm.app.util;
8 8

  
9
import java.math.BigDecimal;
9 10
import java.util.ArrayList;
10 11
import java.util.GregorianCalendar;
11 12
import java.util.List;
......
120 121
	    QuantitativeData element = QuantitativeData.NewInstance();
121 122
	    StatisticalMeasurementValue statisticalValue = StatisticalMeasurementValue.NewInstance();
122 123
	    statisticalValue.setType(StatisticalMeasure.MAX());
123
	    statisticalValue.setValue((float) 2.1);
124
	    statisticalValue.setValue(new BigDecimal("2.1"));
124 125
	    element.addStatisticalValue(statisticalValue);
125 126
	    taxNameDescription.addElement(element);
126 127

  
app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraEcoFactImport.java
9 9

  
10 10
package eu.etaxonomy.cdm.io.algaterra;
11 11

  
12
import java.math.BigDecimal;
12 13
import java.sql.ResultSet;
13 14
import java.sql.SQLException;
14 15
import java.util.HashMap;
......
289 290
				quantData.setUnit(unit);
290 291
				try {
291 292

  
292
					Set<DefinedTerm> valueModifier = new HashSet<DefinedTerm>();
293
					Set<DefinedTerm> valueModifier = new HashSet<>();
293 294
					valueStr = normalizeAndModifyValue(state, valueStr, valueModifier);
294 295
					//value
295
					Float valueFlt = Float.valueOf(valueStr);  //TODO maybe change model to Double ??
296
					BigDecimal valueDec = new BigDecimal(valueStr);
296 297

  
297 298
					StatisticalMeasure measureSingleValue = getStatisticalMeasure(state, uuidStatMeasureSingleValue, "Value", "Single measurement value", null, null);
298
					StatisticalMeasurementValue value = StatisticalMeasurementValue.NewInstance(measureSingleValue, valueFlt);
299
					StatisticalMeasurementValue value = StatisticalMeasurementValue.NewInstance(measureSingleValue, valueDec);
299 300
					quantData.addStatisticalValue(value);
300 301
					descriptionBase.addElement(quantData);
301 302

  
app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraMorphologyImport.java
9 9

  
10 10
package eu.etaxonomy.cdm.io.algaterra;
11 11

  
12
import java.math.BigDecimal;
12 13
import java.net.URI;
13 14
import java.sql.ResultSet;
14 15
import java.sql.SQLException;
......
508 509
					Set<DefinedTerm> valueModifier = new HashSet<DefinedTerm>();
509 510
					valueStr = normalizeAndModifyValue(state, valueStr, valueModifier);
510 511
					//value
511
					Float valueFlt = Float.valueOf(valueStr);  //TODO maybe change model to Double ??
512
	                BigDecimal valueDec = new BigDecimal(valueStr);
512 513

  
513 514
					StatisticalMeasure measureSingleValue = getStatisticalMeasure(state, uuidStatMeasureSingleValue, "Value", "Single measurement value", null, null);
514
					StatisticalMeasurementValue value = StatisticalMeasurementValue.NewInstance(measureSingleValue, valueFlt);
515
					StatisticalMeasurementValue value = StatisticalMeasurementValue.NewInstance(measureSingleValue, valueDec);
515 516
					quantData.addStatisticalValue(value);
516 517
					descriptionBase.addElement(quantData);
517 518

  

Also available in: Unified diff