Changeset 5647


Ignore:
Timestamp:
10/28/09 13:49:04 (10 years ago)
Author:
melissa
Message:
  • Added loci.tests.EnumTest for testing enumeration package.
  • Updated enumeration handler regular expressions to ignore case and trailing whitespace.
Location:
trunk/components
Files:
1 added
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/enums/handler/AcquisitionModeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*WideField", "WideField"); 
    65     p.put("^\\s*LaserScanningMicroscopy", "LaserScanningMicroscopy"); 
    66     p.put("^\\s*LaserScanningConfocal", "LaserScanningConfocal"); 
    67     p.put("^\\s*SpinningDiskConfocal", "SpinningDiskConfocal"); 
    68     p.put("^\\s*SlitScanConfocal", "SlitScanConfocal"); 
    69     p.put("^\\s*MultiPhotonMicroscopy", "MultiPhotonMicroscopy"); 
    70     p.put("^\\s*StructuredIllumination", "StructuredIllumination"); 
    71     p.put("^\\s*SingleMoleculeImaging", "SingleMoleculeImaging"); 
    72     p.put("^\\s*TotalInternalReflection", "TotalInternalReflection"); 
    73     p.put("^\\s*FluorescenceLifetime", "FluorescenceLifetime"); 
    74     p.put("^\\s*SpectralImaging", "SpectralImaging"); 
    75     p.put("^\\s*FluorescenceCorrelationSpectroscopy", "FluorescenceCorrelationSpectroscopy"); 
    76     p.put("^\\s*NearFieldScanningOpticalMicroscopy", "NearFieldScanningOpticalMicroscopy"); 
    77     p.put("^\\s*SecondHarmonicGenerationImaging", "SecondHarmonicGenerationImaging"); 
    78     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*WideField\\s*", "WideField"); 
     65    p.put("^\\s*LaserScanningMicroscopy\\s*", "LaserScanningMicroscopy"); 
     66    p.put("^\\s*LaserScanningConfocal\\s*", "LaserScanningConfocal"); 
     67    p.put("^\\s*SpinningDiskConfocal\\s*", "SpinningDiskConfocal"); 
     68    p.put("^\\s*SlitScanConfocal\\s*", "SlitScanConfocal"); 
     69    p.put("^\\s*MultiPhotonMicroscopy\\s*", "MultiPhotonMicroscopy"); 
     70    p.put("^\\s*StructuredIllumination\\s*", "StructuredIllumination"); 
     71    p.put("^\\s*SingleMoleculeImaging\\s*", "SingleMoleculeImaging"); 
     72    p.put("^\\s*TotalInternalReflection\\s*", "TotalInternalReflection"); 
     73    p.put("^\\s*FluorescenceLifetime\\s*", "FluorescenceLifetime"); 
     74    p.put("^\\s*SpectralImaging\\s*", "SpectralImaging"); 
     75    p.put("^\\s*FluorescenceCorrelationSpectroscopy\\s*", "FluorescenceCorrelationSpectroscopy"); 
     76    p.put("^\\s*NearFieldScanningOpticalMicroscopy\\s*", "NearFieldScanningOpticalMicroscopy"); 
     77    p.put("^\\s*SecondHarmonicGenerationImaging\\s*", "SecondHarmonicGenerationImaging"); 
     78    p.put("^\\s*Other\\s*", "Other"); 
    7979    return p; 
    8080  } 
     
    8787  { 
    8888    for (String pattern : patterns.keySet()) { 
    89       if (value.matches(pattern)) { 
     89      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    9090        String v = patterns.get(pattern); 
    9191        return AcquisitionMode.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ArcTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Hg", "Hg"); 
    65     p.put("^\\s*Xe", "Xe"); 
    66     p.put("^\\s*HgXe", "HgXe"); 
    67     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Hg\\s*", "Hg"); 
     65    p.put("^\\s*Xe\\s*", "Xe"); 
     66    p.put("^\\s*HgXe\\s*", "HgXe"); 
     67    p.put("^\\s*Other\\s*", "Other"); 
    6868    return p; 
    6969  } 
     
    7676  { 
    7777    for (String pattern : patterns.keySet()) { 
    78       if (value.matches(pattern)) { 
     78      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    7979        String v = patterns.get(pattern); 
    8080        return ArcType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/BinningEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*1x1", "1x1"); 
    65     p.put("^\\s*2x2", "2x2"); 
    66     p.put("^\\s*4x4", "4x4"); 
    67     p.put("^\\s*8x8", "8x8"); 
    68     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*1x1\\s*", "1x1"); 
     65    p.put("^\\s*2x2\\s*", "2x2"); 
     66    p.put("^\\s*4x4\\s*", "4x4"); 
     67    p.put("^\\s*8x8\\s*", "8x8"); 
     68    p.put("^\\s*Other\\s*", "Other"); 
    6969    return p; 
    7070  } 
     
    7777  { 
    7878    for (String pattern : patterns.keySet()) { 
    79       if (value.matches(pattern)) { 
     79      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8080        String v = patterns.get(pattern); 
    8181        return Binning.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ContrastMethodEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Brightfield", "Brightfield"); 
    65     p.put("^\\s*Phase", "Phase"); 
    66     p.put("^\\s*DIC", "DIC"); 
    67     p.put("^\\s*HoffmanModulation", "HoffmanModulation"); 
    68     p.put("^\\s*ObliqueIllumination", "ObliqueIllumination"); 
    69     p.put("^\\s*PolarizedLight", "PolarizedLight"); 
    70     p.put("^\\s*Darkfield", "Darkfield"); 
    71     p.put("^\\s*Fluorescence", "Fluorescence"); 
    72     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Brightfield\\s*", "Brightfield"); 
     65    p.put("^\\s*Phase\\s*", "Phase"); 
     66    p.put("^\\s*DIC\\s*", "DIC"); 
     67    p.put("^\\s*HoffmanModulation\\s*", "HoffmanModulation"); 
     68    p.put("^\\s*ObliqueIllumination\\s*", "ObliqueIllumination"); 
     69    p.put("^\\s*PolarizedLight\\s*", "PolarizedLight"); 
     70    p.put("^\\s*Darkfield\\s*", "Darkfield"); 
     71    p.put("^\\s*Fluorescence\\s*", "Fluorescence"); 
     72    p.put("^\\s*Other\\s*", "Other"); 
    7373    return p; 
    7474  } 
     
    8181  { 
    8282    for (String pattern : patterns.keySet()) { 
    83       if (value.matches(pattern)) { 
     83      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8484        String v = patterns.get(pattern); 
    8585        return ContrastMethod.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*UV", "UV"); 
    65     p.put("^\\s*PlanApo", "PlanApo"); 
    66     p.put("^\\s*PlanFluor", "PlanFluor"); 
    67     p.put("^\\s*SuperFluor", "SuperFluor"); 
    68     p.put("^\\s*VioletCorrected", "VioletCorrected"); 
    69     p.put("^\\s*Achro", "Achro"); 
    70     p.put("^\\s*Achromat", "Achromat"); 
    71     p.put("^\\s*Fluor", "Fluor"); 
    72     p.put("^\\s*Fl", "Fl"); 
    73     p.put("^\\s*Fluar", "Fluar"); 
    74     p.put("^\\s*Neofluar", "Neofluar"); 
    75     p.put("^\\s*Fluotar", "Fluotar"); 
    76     p.put("^\\s*Apo", "Apo"); 
    77     p.put("^\\s*PlanNeofluar", "PlanNeofluar"); 
    78     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*UV\\s*", "UV"); 
     65    p.put("^\\s*PlanApo\\s*", "PlanApo"); 
     66    p.put("^\\s*PlanFluor\\s*", "PlanFluor"); 
     67    p.put("^\\s*SuperFluor\\s*", "SuperFluor"); 
     68    p.put("^\\s*VioletCorrected\\s*", "VioletCorrected"); 
     69    p.put("^\\s*Achro\\s*", "Achro"); 
     70    p.put("^\\s*Achromat\\s*", "Achromat"); 
     71    p.put("^\\s*Fluor\\s*", "Fluor"); 
     72    p.put("^\\s*Fl\\s*", "Fl"); 
     73    p.put("^\\s*Fluar\\s*", "Fluar"); 
     74    p.put("^\\s*Neofluar\\s*", "Neofluar"); 
     75    p.put("^\\s*Fluotar\\s*", "Fluotar"); 
     76    p.put("^\\s*Apo\\s*", "Apo"); 
     77    p.put("^\\s*PlanNeofluar\\s*", "PlanNeofluar"); 
     78    p.put("^\\s*Other\\s*", "Other"); 
    7979    return p; 
    8080  } 
     
    8787  { 
    8888    for (String pattern : patterns.keySet()) { 
    89       if (value.matches(pattern)) { 
     89      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    9090        String v = patterns.get(pattern); 
    9191        return Correction.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/DetectorTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*CCD", "CCD"); 
    65     p.put("^\\s*IntensifiedCCD", "IntensifiedCCD"); 
    66     p.put("^\\s*AnalogVideo", "AnalogVideo"); 
    67     p.put("^\\s*PMT", "PMT"); 
    68     p.put("^\\s*Photodiode", "Photodiode"); 
    69     p.put("^\\s*Spectroscopy", "Spectroscopy"); 
    70     p.put("^\\s*LifetimeImaging", "LifetimeImaging"); 
    71     p.put("^\\s*CorrelationSpectroscopy", "CorrelationSpectroscopy"); 
    72     p.put("^\\s*FTIR", "FTIR"); 
    73     p.put("^\\s*EMCCD", "EMCCD"); 
    74     p.put("^\\s*APD", "APD"); 
    75     p.put("^\\s*CMOS", "CMOS"); 
    76     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*CCD\\s*", "CCD"); 
     65    p.put("^\\s*IntensifiedCCD\\s*", "IntensifiedCCD"); 
     66    p.put("^\\s*AnalogVideo\\s*", "AnalogVideo"); 
     67    p.put("^\\s*PMT\\s*", "PMT"); 
     68    p.put("^\\s*Photodiode\\s*", "Photodiode"); 
     69    p.put("^\\s*Spectroscopy\\s*", "Spectroscopy"); 
     70    p.put("^\\s*LifetimeImaging\\s*", "LifetimeImaging"); 
     71    p.put("^\\s*CorrelationSpectroscopy\\s*", "CorrelationSpectroscopy"); 
     72    p.put("^\\s*FTIR\\s*", "FTIR"); 
     73    p.put("^\\s*EMCCD\\s*", "EMCCD"); 
     74    p.put("^\\s*APD\\s*", "APD"); 
     75    p.put("^\\s*CMOS\\s*", "CMOS"); 
     76    p.put("^\\s*Other\\s*", "Other"); 
    7777    return p; 
    7878  } 
     
    8585  { 
    8686    for (String pattern : patterns.keySet()) { 
    87       if (value.matches(pattern)) { 
     87      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8888        String v = patterns.get(pattern); 
    8989        return DetectorType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/DimensionOrderEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*XYZCT", "XYZCT"); 
    65     p.put("^\\s*XYZTC", "XYZTC"); 
    66     p.put("^\\s*XYCTZ", "XYCTZ"); 
    67     p.put("^\\s*XYCZT", "XYCZT"); 
    68     p.put("^\\s*XYTCZ", "XYTCZ"); 
    69     p.put("^\\s*XYTZC", "XYTZC"); 
     64    p.put("^\\s*XYZCT\\s*", "XYZCT"); 
     65    p.put("^\\s*XYZTC\\s*", "XYZTC"); 
     66    p.put("^\\s*XYCTZ\\s*", "XYCTZ"); 
     67    p.put("^\\s*XYCZT\\s*", "XYCZT"); 
     68    p.put("^\\s*XYTCZ\\s*", "XYTCZ"); 
     69    p.put("^\\s*XYTZC\\s*", "XYTZC"); 
    7070    return p; 
    7171  } 
     
    7878  { 
    7979    for (String pattern : patterns.keySet()) { 
    80       if (value.matches(pattern)) { 
     80      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8181        String v = patterns.get(pattern); 
    8282        return DimensionOrder.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ExperimentTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*FP", "FP"); 
    65     p.put("^\\s*FRET", "FRET"); 
    66     p.put("^\\s*TimeLapse", "TimeLapse"); 
    67     p.put("^\\s*FourDPlus", "FourDPlus"); 
    68     p.put("^\\s*Screen", "Screen"); 
    69     p.put("^\\s*Immunocytochemistry", "Immunocytochemistry"); 
    70     p.put("^\\s*Immunofluorescence", "Immunofluorescence"); 
    71     p.put("^\\s*FISH", "FISH"); 
    72     p.put("^\\s*Electrophysiology", "Electrophysiology"); 
    73     p.put("^\\s*IonImaging", "IonImaging"); 
    74     p.put("^\\s*Colocalization", "Colocalization"); 
    75     p.put("^\\s*PGIDocumentation", "PGIDocumentation"); 
    76     p.put("^\\s*FluorescenceLifetime", "FluorescenceLifetime"); 
    77     p.put("^\\s*SpectralImaging", "SpectralImaging"); 
    78     p.put("^\\s*Photobleaching", "Photobleaching"); 
    79     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*FP\\s*", "FP"); 
     65    p.put("^\\s*FRET\\s*", "FRET"); 
     66    p.put("^\\s*TimeLapse\\s*", "TimeLapse"); 
     67    p.put("^\\s*FourDPlus\\s*", "FourDPlus"); 
     68    p.put("^\\s*Screen\\s*", "Screen"); 
     69    p.put("^\\s*Immunocytochemistry\\s*", "Immunocytochemistry"); 
     70    p.put("^\\s*Immunofluorescence\\s*", "Immunofluorescence"); 
     71    p.put("^\\s*FISH\\s*", "FISH"); 
     72    p.put("^\\s*Electrophysiology\\s*", "Electrophysiology"); 
     73    p.put("^\\s*IonImaging\\s*", "IonImaging"); 
     74    p.put("^\\s*Colocalization\\s*", "Colocalization"); 
     75    p.put("^\\s*PGIDocumentation\\s*", "PGIDocumentation"); 
     76    p.put("^\\s*FluorescenceLifetime\\s*", "FluorescenceLifetime"); 
     77    p.put("^\\s*SpectralImaging\\s*", "SpectralImaging"); 
     78    p.put("^\\s*Photobleaching\\s*", "Photobleaching"); 
     79    p.put("^\\s*Other\\s*", "Other"); 
    8080    return p; 
    8181  } 
     
    8888  { 
    8989    for (String pattern : patterns.keySet()) { 
    90       if (value.matches(pattern)) { 
     90      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    9191        String v = patterns.get(pattern); 
    9292        return ExperimentType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FilamentTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Incandescent", "Incandescent"); 
    65     p.put("^\\s*Halogen", "Halogen"); 
    66     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Incandescent\\s*", "Incandescent"); 
     65    p.put("^\\s*Halogen\\s*", "Halogen"); 
     66    p.put("^\\s*Other\\s*", "Other"); 
    6767    return p; 
    6868  } 
     
    7575  { 
    7676    for (String pattern : patterns.keySet()) { 
    77       if (value.matches(pattern)) { 
     77      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    7878        String v = patterns.get(pattern); 
    7979        return FilamentType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FilterTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*LongPass", "LongPass"); 
    65     p.put("^\\s*ShortPass", "ShortPass"); 
    66     p.put("^\\s*BandPass", "BandPass"); 
    67     p.put("^\\s*MultiPass", "MultiPass"); 
    68     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*LongPass\\s*", "LongPass"); 
     65    p.put("^\\s*ShortPass\\s*", "ShortPass"); 
     66    p.put("^\\s*BandPass\\s*", "BandPass"); 
     67    p.put("^\\s*MultiPass\\s*", "MultiPass"); 
     68    p.put("^\\s*Other\\s*", "Other"); 
    6969    return p; 
    7070  } 
     
    7777  { 
    7878    for (String pattern : patterns.keySet()) { 
    79       if (value.matches(pattern)) { 
     79      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8080        String v = patterns.get(pattern); 
    8181        return FilterType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/IlluminationTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Transmitted", "Transmitted"); 
    65     p.put("^\\s*Epifluorescence", "Epifluorescence"); 
    66     p.put("^\\s*Oblique", "Oblique"); 
    67     p.put("^\\s*NonLinear", "NonLinear"); 
    68     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Transmitted\\s*", "Transmitted"); 
     65    p.put("^\\s*Epifluorescence\\s*", "Epifluorescence"); 
     66    p.put("^\\s*Oblique\\s*", "Oblique"); 
     67    p.put("^\\s*NonLinear\\s*", "NonLinear"); 
     68    p.put("^\\s*Other\\s*", "Other"); 
    6969    return p; 
    7070  } 
     
    7777  { 
    7878    for (String pattern : patterns.keySet()) { 
    79       if (value.matches(pattern)) { 
     79      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8080        String v = patterns.get(pattern); 
    8181        return IlluminationType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ImmersionEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Oil", "Oil"); 
    65     p.put("^\\s*Water", "Water"); 
    66     p.put("^\\s*WaterDipping", "WaterDipping"); 
    67     p.put("^\\s*Air", "Air"); 
    68     p.put("^\\s*Multi", "Multi"); 
    69     p.put("^\\s*Glycerol", "Glycerol"); 
    70     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Oil\\s*", "Oil"); 
     65    p.put("^\\s*Water\\s*", "Water"); 
     66    p.put("^\\s*WaterDipping\\s*", "WaterDipping"); 
     67    p.put("^\\s*Air\\s*", "Air"); 
     68    p.put("^\\s*Multi\\s*", "Multi"); 
     69    p.put("^\\s*Glycerol\\s*", "Glycerol"); 
     70    p.put("^\\s*Other\\s*", "Other"); 
    7171    return p; 
    7272  } 
     
    7979  { 
    8080    for (String pattern : patterns.keySet()) { 
    81       if (value.matches(pattern)) { 
     81      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8282        String v = patterns.get(pattern); 
    8383        return Immersion.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LaserMediumEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Cu", "Cu"); 
    65     p.put("^\\s*Ag", "Ag"); 
    66     p.put("^\\s*ArFl", "ArFl"); 
    67     p.put("^\\s*ArCl", "ArCl"); 
    68     p.put("^\\s*KrFl", "KrFl"); 
    69     p.put("^\\s*KrCl", "KrCl"); 
    70     p.put("^\\s*XeFl", "XeFl"); 
    71     p.put("^\\s*XeCl", "XeCl"); 
    72     p.put("^\\s*XeBr", "XeBr"); 
    73     p.put("^\\s*N", "N"); 
    74     p.put("^\\s*Ar", "Ar"); 
    75     p.put("^\\s*Kr", "Kr"); 
    76     p.put("^\\s*Xe", "Xe"); 
    77     p.put("^\\s*HeNe", "HeNe"); 
    78     p.put("^\\s*HeCd", "HeCd"); 
    79     p.put("^\\s*CO", "CO"); 
    80     p.put("^\\s*CO2", "CO2"); 
    81     p.put("^\\s*H2O", "H2O"); 
    82     p.put("^\\s*HFl", "HFl"); 
    83     p.put("^\\s*NdGlass", "NdGlass"); 
    84     p.put("^\\s*NdYAG", "NdYAG"); 
    85     p.put("^\\s*ErGlass", "ErGlass"); 
    86     p.put("^\\s*ErYAG", "ErYAG"); 
    87     p.put("^\\s*HoYLF", "HoYLF"); 
    88     p.put("^\\s*HoYAG", "HoYAG"); 
    89     p.put("^\\s*Ruby", "Ruby"); 
    90     p.put("^\\s*TiSapphire", "TiSapphire"); 
    91     p.put("^\\s*Alexandrite", "Alexandrite"); 
    92     p.put("^\\s*Rhodamine6G", "Rhodamine6G"); 
    93     p.put("^\\s*CoumarinC30", "CoumarinC30"); 
    94     p.put("^\\s*GaAs", "GaAs"); 
    95     p.put("^\\s*GaAlAs", "GaAlAs"); 
    96     p.put("^\\s*EMinus", "EMinus"); 
    97     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Cu\\s*", "Cu"); 
     65    p.put("^\\s*Ag\\s*", "Ag"); 
     66    p.put("^\\s*ArFl\\s*", "ArFl"); 
     67    p.put("^\\s*ArCl\\s*", "ArCl"); 
     68    p.put("^\\s*KrFl\\s*", "KrFl"); 
     69    p.put("^\\s*KrCl\\s*", "KrCl"); 
     70    p.put("^\\s*XeFl\\s*", "XeFl"); 
     71    p.put("^\\s*XeCl\\s*", "XeCl"); 
     72    p.put("^\\s*XeBr\\s*", "XeBr"); 
     73    p.put("^\\s*N\\s*", "N"); 
     74    p.put("^\\s*Ar\\s*", "Ar"); 
     75    p.put("^\\s*Kr\\s*", "Kr"); 
     76    p.put("^\\s*Xe\\s*", "Xe"); 
     77    p.put("^\\s*HeNe\\s*", "HeNe"); 
     78    p.put("^\\s*HeCd\\s*", "HeCd"); 
     79    p.put("^\\s*CO\\s*", "CO"); 
     80    p.put("^\\s*CO2\\s*", "CO2"); 
     81    p.put("^\\s*H2O\\s*", "H2O"); 
     82    p.put("^\\s*HFl\\s*", "HFl"); 
     83    p.put("^\\s*NdGlass\\s*", "NdGlass"); 
     84    p.put("^\\s*NdYAG\\s*", "NdYAG"); 
     85    p.put("^\\s*ErGlass\\s*", "ErGlass"); 
     86    p.put("^\\s*ErYAG\\s*", "ErYAG"); 
     87    p.put("^\\s*HoYLF\\s*", "HoYLF"); 
     88    p.put("^\\s*HoYAG\\s*", "HoYAG"); 
     89    p.put("^\\s*Ruby\\s*", "Ruby"); 
     90    p.put("^\\s*TiSapphire\\s*", "TiSapphire"); 
     91    p.put("^\\s*Alexandrite\\s*", "Alexandrite"); 
     92    p.put("^\\s*Rhodamine6G\\s*", "Rhodamine6G"); 
     93    p.put("^\\s*CoumarinC30\\s*", "CoumarinC30"); 
     94    p.put("^\\s*GaAs\\s*", "GaAs"); 
     95    p.put("^\\s*GaAlAs\\s*", "GaAlAs"); 
     96    p.put("^\\s*EMinus\\s*", "EMinus"); 
     97    p.put("^\\s*Other\\s*", "Other"); 
    9898    return p; 
    9999  } 
     
    106106  { 
    107107    for (String pattern : patterns.keySet()) { 
    108       if (value.matches(pattern)) { 
     108      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    109109        String v = patterns.get(pattern); 
    110110        return LaserMedium.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LaserTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Excimer", "Excimer"); 
    65     p.put("^\\s*Gas", "Gas"); 
    66     p.put("^\\s*MetalVapor", "MetalVapor"); 
    67     p.put("^\\s*SolidState", "SolidState"); 
    68     p.put("^\\s*Dye", "Dye"); 
    69     p.put("^\\s*Semiconductor", "Semiconductor"); 
    70     p.put("^\\s*FreeElectron", "FreeElectron"); 
    71     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Excimer\\s*", "Excimer"); 
     65    p.put("^\\s*Gas\\s*", "Gas"); 
     66    p.put("^\\s*MetalVapor\\s*", "MetalVapor"); 
     67    p.put("^\\s*SolidState\\s*", "SolidState"); 
     68    p.put("^\\s*Dye\\s*", "Dye"); 
     69    p.put("^\\s*Semiconductor\\s*", "Semiconductor"); 
     70    p.put("^\\s*FreeElectron\\s*", "FreeElectron"); 
     71    p.put("^\\s*Other\\s*", "Other"); 
    7272    return p; 
    7373  } 
     
    8080  { 
    8181    for (String pattern : patterns.keySet()) { 
    82       if (value.matches(pattern)) { 
     82      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8383        String v = patterns.get(pattern); 
    8484        return LaserType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MediumEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Air", "Air"); 
    65     p.put("^\\s*Oil", "Oil"); 
    66     p.put("^\\s*Water", "Water"); 
    67     p.put("^\\s*Glycerol", "Glycerol"); 
    68     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Air\\s*", "Air"); 
     65    p.put("^\\s*Oil\\s*", "Oil"); 
     66    p.put("^\\s*Water\\s*", "Water"); 
     67    p.put("^\\s*Glycerol\\s*", "Glycerol"); 
     68    p.put("^\\s*Other\\s*", "Other"); 
    6969    return p; 
    7070  } 
     
    7777  { 
    7878    for (String pattern : patterns.keySet()) { 
    79       if (value.matches(pattern)) { 
     79      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8080        String v = patterns.get(pattern); 
    8181        return Medium.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MicrobeamManipulationTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*FRAP", "FRAP"); 
    65     p.put("^\\s*Photoablation", "Photoablation"); 
    66     p.put("^\\s*Photoactivation", "Photoactivation"); 
    67     p.put("^\\s*Uncaging", "Uncaging"); 
    68     p.put("^\\s*OpticalTrapping", "OpticalTrapping"); 
    69     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*FRAP\\s*", "FRAP"); 
     65    p.put("^\\s*Photoablation\\s*", "Photoablation"); 
     66    p.put("^\\s*Photoactivation\\s*", "Photoactivation"); 
     67    p.put("^\\s*Uncaging\\s*", "Uncaging"); 
     68    p.put("^\\s*OpticalTrapping\\s*", "OpticalTrapping"); 
     69    p.put("^\\s*Other\\s*", "Other"); 
    7070    return p; 
    7171  } 
     
    7878  { 
    7979    for (String pattern : patterns.keySet()) { 
    80       if (value.matches(pattern)) { 
     80      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8181        String v = patterns.get(pattern); 
    8282        return MicrobeamManipulationType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MicroscopeTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*Upright", "Upright"); 
    65     p.put("^\\s*Inverted", "Inverted"); 
    66     p.put("^\\s*Dissection", "Dissection"); 
    67     p.put("^\\s*Electrophysiology", "Electrophysiology"); 
    68     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*Upright\\s*", "Upright"); 
     65    p.put("^\\s*Inverted\\s*", "Inverted"); 
     66    p.put("^\\s*Dissection\\s*", "Dissection"); 
     67    p.put("^\\s*Electrophysiology\\s*", "Electrophysiology"); 
     68    p.put("^\\s*Other\\s*", "Other"); 
    6969    return p; 
    7070  } 
     
    7777  { 
    7878    for (String pattern : patterns.keySet()) { 
    79       if (value.matches(pattern)) { 
     79      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8080        String v = patterns.get(pattern); 
    8181        return MicroscopeType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/PixelTypeEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*int8", "int8"); 
    65     p.put("^\\s*int16", "int16"); 
    66     p.put("^\\s*int32", "int32"); 
    67     p.put("^\\s*uint8", "uint8"); 
    68     p.put("^\\s*uint16", "uint16"); 
    69     p.put("^\\s*uint32", "uint32"); 
    70     p.put("^\\s*float", "float"); 
    71     p.put("^\\s*bit", "bit"); 
    72     p.put("^\\s*double", "double"); 
    73     p.put("^\\s*complex", "complex"); 
    74     p.put("^\\s*double-complex", "double-complex"); 
     64    p.put("^\\s*int8\\s*", "int8"); 
     65    p.put("^\\s*int16\\s*", "int16"); 
     66    p.put("^\\s*int32\\s*", "int32"); 
     67    p.put("^\\s*uint8\\s*", "uint8"); 
     68    p.put("^\\s*uint16\\s*", "uint16"); 
     69    p.put("^\\s*uint32\\s*", "uint32"); 
     70    p.put("^\\s*float\\s*", "float"); 
     71    p.put("^\\s*bit\\s*", "bit"); 
     72    p.put("^\\s*double\\s*", "double"); 
     73    p.put("^\\s*complex\\s*", "complex"); 
     74    p.put("^\\s*double-complex\\s*", "double-complex"); 
    7575    return p; 
    7676  } 
     
    8383  { 
    8484    for (String pattern : patterns.keySet()) { 
    85       if (value.matches(pattern)) { 
     85      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8686        String v = patterns.get(pattern); 
    8787        return PixelType.fromString(v); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/PulseEnumHandler.java

    r5642 r5647  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     34 * Created by melissa via xsd-fu on 2009-10-28 13:34:08.990768 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6262  private static Hashtable<String, String> makePatterns() { 
    6363    Hashtable<String, String> p = new Hashtable<String, String>(); 
    64     p.put("^\\s*CW", "CW"); 
    65     p.put("^\\s*Single", "Single"); 
    66     p.put("^\\s*QSwitched", "QSwitched"); 
    67     p.put("^\\s*Repetitive", "Repetitive"); 
    68     p.put("^\\s*ModeLocked", "ModeLocked"); 
    69     p.put("^\\s*Other", "Other"); 
     64    p.put("^\\s*CW\\s*", "CW"); 
     65    p.put("^\\s*Single\\s*", "Single"); 
     66    p.put("^\\s*QSwitched\\s*", "QSwitched"); 
     67    p.put("^\\s*Repetitive\\s*", "Repetitive"); 
     68    p.put("^\\s*ModeLocked\\s*", "ModeLocked"); 
     69    p.put("^\\s*Other\\s*", "Other"); 
    7070    return p; 
    7171  } 
     
    7878  { 
    7979    for (String pattern : patterns.keySet()) { 
    80       if (value.matches(pattern)) { 
     80      if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    8181        String v = patterns.get(pattern); 
    8282        return Pulse.fromString(v); 
Note: See TracChangeset for help on using the changeset viewer.