Changeset 6375


Ignore:
Timestamp:
05/25/10 09:05:01 (9 years ago)
Author:
callan
Message:

Merging r6272,r6373,r6374 from Trunk

Location:
branches/4.2/components
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/PrairieReader.java

    r6301 r6375  
    219219    if (tiff == null) { 
    220220      tiff = new TiffReader(); 
    221       tiff.setMetadataStore(getMetadataStore()); 
    222221    } 
    223222 
     
    257256        if (tiff == null) { 
    258257          tiff = new TiffReader(); 
    259           tiff.setMetadataStore(getMetadataStore()); 
    260258        } 
    261259        tiff.setId(files[0]); 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/AcquisitionModeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9696      } 
    9797    } 
    98     throw new EnumerationException(this.getClass().getName() + 
    99      " could not find enumeration for " + value); 
     98    System.err.println("WARN: Could not find enumeration for " + value); 
     99    return AcquisitionMode.OTHER; 
    100100  } 
    101101 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ArcTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8080      } 
    8181    } 
    82     throw new EnumerationException(this.getClass().getName() + 
    83      " could not find enumeration for " + value); 
     82    System.err.println("WARN: Could not find enumeration for " + value); 
     83    return ArcType.OTHER; 
    8484  } 
    8585 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/BinningEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8181      } 
    8282    } 
    83     throw new EnumerationException(this.getClass().getName() + 
    84      " could not find enumeration for " + value); 
     83    System.err.println("WARN: Could not find enumeration for " + value); 
     84    return Binning.OTHER; 
    8585  } 
    8686 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/CompressionEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ContrastMethodEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8585      } 
    8686    } 
    87     throw new EnumerationException(this.getClass().getName() + 
    88      " could not find enumeration for " + value); 
     87    System.err.println("WARN: Could not find enumeration for " + value); 
     88    return ContrastMethod.OTHER; 
    8989  } 
    9090 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/CorrectionEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9191      } 
    9292    } 
    93     throw new EnumerationException(this.getClass().getName() + 
    94      " could not find enumeration for " + value); 
     93    System.err.println("WARN: Could not find enumeration for " + value); 
     94    return Correction.OTHER; 
    9595  } 
    9696 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/DetectorTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9090      } 
    9191    } 
    92     throw new EnumerationException(this.getClass().getName() + 
    93      " could not find enumeration for " + value); 
     92    System.err.println("WARN: Could not find enumeration for " + value); 
     93    return DetectorType.OTHER; 
    9494  } 
    9595 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/DimensionOrderEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ExperimentTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9292      } 
    9393    } 
    94     throw new EnumerationException(this.getClass().getName() + 
    95      " could not find enumeration for " + value); 
     94    System.err.println("WARN: Could not find enumeration for " + value); 
     95    return ExperimentType.OTHER; 
    9696  } 
    9797 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FilamentTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7979      } 
    8080    } 
    81     throw new EnumerationException(this.getClass().getName() + 
    82      " could not find enumeration for " + value); 
     81    System.err.println("WARN: Could not find enumeration for " + value); 
     82    return FilamentType.OTHER; 
    8383  } 
    8484 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FillRuleEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FilterTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8383      } 
    8484    } 
    85     throw new EnumerationException(this.getClass().getName() + 
    86      " could not find enumeration for " + value); 
     85    System.err.println("WARN: Could not find enumeration for " + value); 
     86    return FilterType.OTHER; 
    8787  } 
    8888 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FontFamilyEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FontStyleEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/IlluminationTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8181      } 
    8282    } 
    83     throw new EnumerationException(this.getClass().getName() + 
    84      " could not find enumeration for " + value); 
     83    System.err.println("WARN: Could not find enumeration for " + value); 
     84    return IlluminationType.OTHER; 
    8585  } 
    8686 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ImmersionEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8383      } 
    8484    } 
    85     throw new EnumerationException(this.getClass().getName() + 
    86      " could not find enumeration for " + value); 
     85    System.err.println("WARN: Could not find enumeration for " + value); 
     86    return Immersion.OTHER; 
    8787  } 
    8888 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/LaserMediumEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    110110      } 
    111111    } 
    112     throw new EnumerationException(this.getClass().getName() + 
    113      " could not find enumeration for " + value); 
     112    System.err.println("WARN: Could not find enumeration for " + value); 
     113    return LaserMedium.OTHER; 
    114114  } 
    115115 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/LaserTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8484      } 
    8585    } 
    86     throw new EnumerationException(this.getClass().getName() + 
    87      " could not find enumeration for " + value); 
     86    System.err.println("WARN: Could not find enumeration for " + value); 
     87    return LaserType.OTHER; 
    8888  } 
    8989 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/LineCapEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MarkerEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MediumEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8181      } 
    8282    } 
    83     throw new EnumerationException(this.getClass().getName() + 
    84      " could not find enumeration for " + value); 
     83    System.err.println("WARN: Could not find enumeration for " + value); 
     84    return Medium.OTHER; 
    8585  } 
    8686 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MicrobeamManipulationTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8484      } 
    8585    } 
    86     throw new EnumerationException(this.getClass().getName() + 
    87      " could not find enumeration for " + value); 
     86    System.err.println("WARN: Could not find enumeration for " + value); 
     87    return MicrobeamManipulationType.OTHER; 
    8888  } 
    8989 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MicroscopeTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8181      } 
    8282    } 
    83     throw new EnumerationException(this.getClass().getName() + 
    84      " could not find enumeration for " + value); 
     83    System.err.println("WARN: Could not find enumeration for " + value); 
     84    return MicroscopeType.OTHER; 
    8585  } 
    8686 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/NamingConventionEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/PixelTypeEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/PulseEnumHandler.java

    r6366 r6375  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-24 16:13:00.333355 
     34 * Created by callan via xsd-fu on 2010-05-25 12:10:00.232400 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8282      } 
    8383    } 
    84     throw new EnumerationException(this.getClass().getName() + 
    85      " could not find enumeration for " + value); 
     84    System.err.println("WARN: Could not find enumeration for " + value); 
     85    return Pulse.OTHER; 
    8686  } 
    8787 
Note: See TracChangeset for help on using the changeset viewer.