Commit 3d15d844 authored by Robert Butora's avatar Robert Butora
Browse files

output: fixes warnings about deprecated NumeType constructor (use NumType.valueOf())

parent 26f67e95
Loading
Loading
Loading
Loading
+22 −20
Original line number Diff line number Diff line
@@ -133,48 +133,50 @@ public final class XmlSerializer
                  {
                     // ObsCore
                     dataset.obsCore.dataproduct_type,//dataset.dataType, 
                        new Integer( dataset.obsCore.calib_level ),
                        Integer.valueOf( dataset.obsCore.calib_level ),
                        dataset.obsCore.obs_collection,
                        dataset.obsCore.obs_id,
                        dataset.obsCore.obs_publisher_did,

                        dataset.obsCore.access_url,//dataset.access.accessCutoutUrl,
                        dataset.obsCore.access_format,
                        new Long( dataset.obsCore.access_estsize ),
                        Long.valueOf( dataset.obsCore.access_estsize ),

                        dataset.obsCore.target_name,

                        new Double(dataset.obsCore.s_ra),new Double(dataset.obsCore.s_dec),new Double(dataset.obsCore.s_fov),
                        Double.valueOf(dataset.obsCore.s_ra),Double.valueOf(dataset.obsCore.s_dec),
                        Double.valueOf(dataset.obsCore.s_fov),

                        dataset.obsCore.s_region,
                        new Long( dataset.obsCore.s_xel1 ), new Long( dataset.obsCore.s_xel2 ),
                        new Double(dataset.obsCore.s_resolution),
                        Long.valueOf( dataset.obsCore.s_xel1 ), Long.valueOf( dataset.obsCore.s_xel2 ),
                        Double.valueOf(dataset.obsCore.s_resolution),

                        new Double(dataset.obsCore.t_min), new Double(dataset.obsCore.t_max),
                        new Double(dataset.obsCore.t_exptime), new Double(dataset.obsCore.t_resolution),
                        new Long( dataset.obsCore.t_xel ),
                        Double.valueOf(dataset.obsCore.t_min), Double.valueOf(dataset.obsCore.t_max),
                        Double.valueOf(dataset.obsCore.t_exptime), Double.valueOf(dataset.obsCore.t_resolution),
                        Long.valueOf( dataset.obsCore.t_xel ),

                        new Double(dataset.obsCore.em_min), new Double(dataset.obsCore.em_max),
                        new Double(dataset.obsCore.em_res_power),
                        new Long( dataset.obsCore.em_xel ),
                        Double.valueOf(dataset.obsCore.em_min), Double.valueOf(dataset.obsCore.em_max),
                        Double.valueOf(dataset.obsCore.em_res_power),
                        Long.valueOf( dataset.obsCore.em_xel ),

                        dataset.obsCore.o_ucd,

                        dataset.obsCore.pol_states,
                        new Long( dataset.obsCore.pol_xel ),
                        Long.valueOf( dataset.obsCore.pol_xel ),

                        dataset.obsCore.facility_name,
                        dataset.obsCore.instrument_name,


                        // VLKB extensions
                        new Integer( dataset.overlapCode ),
                        new Integer( dataset.overlapCodeSky ),
                        new Integer( dataset.overlapCodeVel ),

                        new Double(dataset.vertices_deg.lon[0]), new Double(dataset.vertices_deg.lat[0]),
                        new Double(dataset.vertices_deg.lon[1]), new Double(dataset.vertices_deg.lat[1]),
                        new Double(dataset.vertices_deg.lon[2]), new Double(dataset.vertices_deg.lat[2]),
                        new Double(dataset.vertices_deg.lon[3]), new Double(dataset.vertices_deg.lat[3]),
                        Integer.valueOf( dataset.overlapCode ),
                        Integer.valueOf( dataset.overlapCodeSky ),
                        Integer.valueOf( dataset.overlapCodeVel ),

                        Double.valueOf(dataset.vertices_deg.lon[0]), Double.valueOf(dataset.vertices_deg.lat[0]),
                        Double.valueOf(dataset.vertices_deg.lon[1]), Double.valueOf(dataset.vertices_deg.lat[1]),
                        Double.valueOf(dataset.vertices_deg.lon[2]), Double.valueOf(dataset.vertices_deg.lat[2]),
                        Double.valueOf(dataset.vertices_deg.lon[3]), Double.valueOf(dataset.vertices_deg.lat[3]),

                        dataset.access.accessFileUrl,
                        dataset.access.accessCutoutUrl,