Changeset 6653


Ignore:
Timestamp:
07/06/10 12:07:06 (9 years ago)
Author:
callan
Message:

Move reference handling until after attribute population for FilterSet conversion.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/meta/MetadataConverter.java

    r6651 r6653  
    925925      for (int filterSetIndex=0; filterSetIndex<filterSetCount; filterSetIndex++) { 
    926926      try { 
     927        String filterSetIDValue = src.getFilterSetID(instrumentIndex, filterSetIndex); 
     928        if (filterSetIDValue != null) dest.setFilterSetID(filterSetIDValue, instrumentIndex, filterSetIndex); 
     929      } catch (NullPointerException e) { } 
     930      try { 
     931        String filterSetLotNumberValue = src.getFilterSetLotNumber(instrumentIndex, filterSetIndex); 
     932        if (filterSetLotNumberValue != null) dest.setFilterSetLotNumber(filterSetLotNumberValue, instrumentIndex, filterSetIndex); 
     933      } catch (NullPointerException e) { } 
     934      try { 
     935        String filterSetManufacturerValue = src.getFilterSetManufacturer(instrumentIndex, filterSetIndex); 
     936        if (filterSetManufacturerValue != null) dest.setFilterSetManufacturer(filterSetManufacturerValue, instrumentIndex, filterSetIndex); 
     937      } catch (NullPointerException e) { } 
     938      try { 
     939        String filterSetModelValue = src.getFilterSetModel(instrumentIndex, filterSetIndex); 
     940        if (filterSetModelValue != null) dest.setFilterSetModel(filterSetModelValue, instrumentIndex, filterSetIndex); 
     941      } catch (NullPointerException e) { } 
     942      try { 
     943        String filterSetSerialNumberValue = src.getFilterSetSerialNumber(instrumentIndex, filterSetIndex); 
     944        if (filterSetSerialNumberValue != null) dest.setFilterSetSerialNumber(filterSetSerialNumberValue, instrumentIndex, filterSetIndex); 
     945      } catch (NullPointerException e) { } 
     946      try { 
    927947        String filterSetDichroicRefValue = src.getFilterSetDichroicRef(instrumentIndex, filterSetIndex); 
    928948        if (filterSetDichroicRefValue != null) dest.setFilterSetDichroicRef(filterSetDichroicRefValue, instrumentIndex, filterSetIndex); 
     
    944964        } 
    945965      } catch (NullPointerException e) { } 
    946       try { 
    947         String filterSetIDValue = src.getFilterSetID(instrumentIndex, filterSetIndex); 
    948         if (filterSetIDValue != null) dest.setFilterSetID(filterSetIDValue, instrumentIndex, filterSetIndex); 
    949       } catch (NullPointerException e) { } 
    950       try { 
    951         String filterSetLotNumberValue = src.getFilterSetLotNumber(instrumentIndex, filterSetIndex); 
    952         if (filterSetLotNumberValue != null) dest.setFilterSetLotNumber(filterSetLotNumberValue, instrumentIndex, filterSetIndex); 
    953       } catch (NullPointerException e) { } 
    954       try { 
    955         String filterSetManufacturerValue = src.getFilterSetManufacturer(instrumentIndex, filterSetIndex); 
    956         if (filterSetManufacturerValue != null) dest.setFilterSetManufacturer(filterSetManufacturerValue, instrumentIndex, filterSetIndex); 
    957       } catch (NullPointerException e) { } 
    958       try { 
    959         String filterSetModelValue = src.getFilterSetModel(instrumentIndex, filterSetIndex); 
    960         if (filterSetModelValue != null) dest.setFilterSetModel(filterSetModelValue, instrumentIndex, filterSetIndex); 
    961       } catch (NullPointerException e) { } 
    962       try { 
    963         String filterSetSerialNumberValue = src.getFilterSetSerialNumber(instrumentIndex, filterSetIndex); 
    964         if (filterSetSerialNumberValue != null) dest.setFilterSetSerialNumber(filterSetSerialNumberValue, instrumentIndex, filterSetIndex); 
    965       } catch (NullPointerException e) { } 
    966966      } 
    967967      } catch (NullPointerException e) { } 
Note: See TracChangeset for help on using the changeset viewer.