Ticket #3741: ie-units.diff

generated-sources/ome/xml/model/ImagingEnvironment.java

@@ -59 +59 @@
 import ome.xml.model.enums.*;
 import ome.xml.model.primitives.*;
 
+import org.unitsofmeasurement.quantity.Pressure;
+import org.unitsofmeasurement.quantity.Temperature;
+import org.unitsofmeasurement.unit.Unit;
+
 public class ImagingEnvironment extends AbstractOMEModelObject
 {
         // Base:  -- Name: ImagingEnvironment -- Type: ImagingEnvironment -- modelBaseType: AbstractOMEModelObject -- langBaseType: Object
@@ -77 +81 @@
         private PercentFraction co2Percent;
 
         // Temperature property
-        private Double temperature;
+        private Unit<Temperature> temperature;
 
         // AirPressure property
-        private Double airPressure;
+        private Unit<Pressure> airPressure;
 
         // Humidity property
         private PercentFraction humidity;
@@ -153 +157 @@
                 if (element.hasAttribute("Temperature"))
                 {
                         // Attribute property Temperature
-                        setTemperature(Double.valueOf(
-                                        element.getAttribute("Temperature")));
+                        TemperatureUnit u = TemperatureUnit.fromString(
+                                        element.getAttribute("TemperatureUnit"));
+                        Unit<Temperature> base = u.unit();
+                        Double value = Double.valueOf(
+                                        element.getAttribute("Temperature"));
+                        setTemperature(base.multiply(value.doubleValue()));
                 }
                 if (element.hasAttribute("AirPressure"))
                 {
                         // Attribute property AirPressure
-                        setAirPressure(Double.valueOf(
-                                        element.getAttribute("AirPressure")));
+                        AirPressureUnit u = PressureUnit.fromString(
+                                        element.getAttribute("AirPressureUnit"));
+                        Unit<Pressure> base = u.unit();
+                        Double value = Double.valueOf(
+                                        element.getAttribute("AirPressure"));
+                        setAirPressure(base.multiply(value.doubleValue()));
                 }
                 if (element.hasAttribute("Humidity"))
                 {
@@ -212 +224 @@
         }
 
         // Property
-        public Double getTemperature()
+        public Unit<Temperature> getTemperature()
         {
                 return temperature;
         }
 
-        public void setTemperature(Double temperature)
+        public void setTemperature(Unit<Temperature> temperature)
         {
                 this.temperature = temperature;
         }
 
         // Property
-        public Double getAirPressure()
+        public Unit<Pressure> getAirPressure()
         {
                 return airPressure;
         }
 
-        public void setAirPressure(Double airPressure)
+        public void setAirPressure(Unit<Pressure> airPressure)
         {
                 this.airPressure = airPressure;
         }
@@ -279 +291 @@
                 if (temperature != null)
                 {
                         // Attribute property Temperature
-                        ImagingEnvironment_element.setAttribute("Temperature", temperature.toString());
+                    ImagingEnvironment_element.setAttribute("Temperature", temperature.value().toString());
+                    ImagingEnvironment_element.setAttribute("TemperatureUnit", TemperatureUnit.fromUnit(temperature.unit()).toString());
                 }
                 if (airPressure != null)
                 {
                         // Attribute property AirPressure
-                        ImagingEnvironment_element.setAttribute("AirPressure", airPressure.toString());
+                    ImagingEnvironment_element.setAttribute("AirPressure", airPressure.value().toString());
+                    ImagingEnvironment_element.setAttribute("AirPressureUnit", AirPressureUnit.fromUnit(airPressure.unit()).toString());
                 }
                 if (humidity != null)
                 {