Changeset 6390


Ignore:
Timestamp:
05/26/10 10:34:38 (9 years ago)
Author:
callan
Message:

Re-run of code generation. ( ome-xml:r607)

Location:
trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/AcquisitionModeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9191  public Enumeration getEnumeration(String value) 
    9292    throws EnumerationException { 
    93     for (String pattern : patterns.keySet()) { 
    94       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    95         String v = patterns.get(pattern); 
    96         return AcquisitionMode.fromString(v); 
     93    if (value != null) { 
     94      for (String pattern : patterns.keySet()) { 
     95        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     96          String v = patterns.get(pattern); 
     97          return AcquisitionMode.fromString(v); 
     98        } 
    9799      } 
    98100    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/ArcTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7575  public Enumeration getEnumeration(String value) 
    7676    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         return ArcType.fromString(v); 
     77    if (value != null) { 
     78      for (String pattern : patterns.keySet()) { 
     79        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     80          String v = patterns.get(pattern); 
     81          return ArcType.fromString(v); 
     82        } 
    8183      } 
    8284    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/BinningEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7676  public Enumeration getEnumeration(String value) 
    7777    throws EnumerationException { 
    78     for (String pattern : patterns.keySet()) { 
    79       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    80         String v = patterns.get(pattern); 
    81         return Binning.fromString(v); 
     78    if (value != null) { 
     79      for (String pattern : patterns.keySet()) { 
     80        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     81          String v = patterns.get(pattern); 
     82          return Binning.fromString(v); 
     83        } 
    8284      } 
    8385    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/CompressionEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7474  public Enumeration getEnumeration(String value) 
    7575    throws EnumerationException { 
    76     for (String pattern : patterns.keySet()) { 
    77       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    78         String v = patterns.get(pattern); 
    79         return Compression.fromString(v); 
     76    if (value != null) { 
     77      for (String pattern : patterns.keySet()) { 
     78        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     79          String v = patterns.get(pattern); 
     80          return Compression.fromString(v); 
     81        } 
    8082      } 
    8183    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/ContrastMethodEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8080  public Enumeration getEnumeration(String value) 
    8181    throws EnumerationException { 
    82     for (String pattern : patterns.keySet()) { 
    83       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    84         String v = patterns.get(pattern); 
    85         return ContrastMethod.fromString(v); 
     82    if (value != null) { 
     83      for (String pattern : patterns.keySet()) { 
     84        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     85          String v = patterns.get(pattern); 
     86          return ContrastMethod.fromString(v); 
     87        } 
    8688      } 
    8789    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/CorrectionEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9696  public Enumeration getEnumeration(String value) 
    9797    throws EnumerationException { 
    98     for (String pattern : patterns.keySet()) { 
    99       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    100         String v = patterns.get(pattern); 
    101         return Correction.fromString(v); 
     98    if (value != null) { 
     99      for (String pattern : patterns.keySet()) { 
     100        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     101          String v = patterns.get(pattern); 
     102          return Correction.fromString(v); 
     103        } 
    102104      } 
    103105    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/DetectorTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8989  public Enumeration getEnumeration(String value) 
    9090    throws EnumerationException { 
    91     for (String pattern : patterns.keySet()) { 
    92       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    93         String v = patterns.get(pattern); 
    94         return DetectorType.fromString(v); 
     91    if (value != null) { 
     92      for (String pattern : patterns.keySet()) { 
     93        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     94          String v = patterns.get(pattern); 
     95          return DetectorType.fromString(v); 
     96        } 
    9597      } 
    9698    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/DimensionOrderEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7777  public Enumeration getEnumeration(String value) 
    7878    throws EnumerationException { 
    79     for (String pattern : patterns.keySet()) { 
    80       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    81         String v = patterns.get(pattern); 
    82         return DimensionOrder.fromString(v); 
     79    if (value != null) { 
     80      for (String pattern : patterns.keySet()) { 
     81        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     82          String v = patterns.get(pattern); 
     83          return DimensionOrder.fromString(v); 
     84        } 
    8385      } 
    8486    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/ExperimentTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8787  public Enumeration getEnumeration(String value) 
    8888    throws EnumerationException { 
    89     for (String pattern : patterns.keySet()) { 
    90       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    91         String v = patterns.get(pattern); 
    92         return ExperimentType.fromString(v); 
     89    if (value != null) { 
     90      for (String pattern : patterns.keySet()) { 
     91        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     92          String v = patterns.get(pattern); 
     93          return ExperimentType.fromString(v); 
     94        } 
    9395      } 
    9496    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/FilamentTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7474  public Enumeration getEnumeration(String value) 
    7575    throws EnumerationException { 
    76     for (String pattern : patterns.keySet()) { 
    77       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    78         String v = patterns.get(pattern); 
    79         return FilamentType.fromString(v); 
     76    if (value != null) { 
     77      for (String pattern : patterns.keySet()) { 
     78        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     79          String v = patterns.get(pattern); 
     80          return FilamentType.fromString(v); 
     81        } 
    8082      } 
    8183    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/FillRuleEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7373  public Enumeration getEnumeration(String value) 
    7474    throws EnumerationException { 
    75     for (String pattern : patterns.keySet()) { 
    76       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    77         String v = patterns.get(pattern); 
    78         return FillRule.fromString(v); 
     75    if (value != null) { 
     76      for (String pattern : patterns.keySet()) { 
     77        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     78          String v = patterns.get(pattern); 
     79          return FillRule.fromString(v); 
     80        } 
    7981      } 
    8082    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/FilterTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7878  public Enumeration getEnumeration(String value) 
    7979    throws EnumerationException { 
    80     for (String pattern : patterns.keySet()) { 
    81       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    82         String v = patterns.get(pattern); 
    83         return FilterType.fromString(v); 
     80    if (value != null) { 
     81      for (String pattern : patterns.keySet()) { 
     82        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     83          String v = patterns.get(pattern); 
     84          return FilterType.fromString(v); 
     85        } 
    8486      } 
    8587    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/FontFamilyEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7575  public Enumeration getEnumeration(String value) 
    7676    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         return FontFamily.fromString(v); 
     77    if (value != null) { 
     78      for (String pattern : patterns.keySet()) { 
     79        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     80          String v = patterns.get(pattern); 
     81          return FontFamily.fromString(v); 
     82        } 
    8183      } 
    8284    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/FontStyleEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7575  public Enumeration getEnumeration(String value) 
    7676    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         return FontStyle.fromString(v); 
     77    if (value != null) { 
     78      for (String pattern : patterns.keySet()) { 
     79        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     80          String v = patterns.get(pattern); 
     81          return FontStyle.fromString(v); 
     82        } 
    8183      } 
    8284    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/IlluminationTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7676  public Enumeration getEnumeration(String value) 
    7777    throws EnumerationException { 
    78     for (String pattern : patterns.keySet()) { 
    79       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    80         String v = patterns.get(pattern); 
    81         return IlluminationType.fromString(v); 
     78    if (value != null) { 
     79      for (String pattern : patterns.keySet()) { 
     80        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     81          String v = patterns.get(pattern); 
     82          return IlluminationType.fromString(v); 
     83        } 
    8284      } 
    8385    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/ImmersionEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7171    p.put("^\\s*Other\\s*", "Other"); 
    7272    // BEGIN custom enumeration mappings 
     73    p.put("^\\s*OI\\s*", "Oil"); 
    7374    p.put(".*Oil.*", "Oil"); 
    7475    p.put(".*Oel.*", "Oil"); 
     
    8586  public Enumeration getEnumeration(String value) 
    8687    throws EnumerationException { 
    87     for (String pattern : patterns.keySet()) { 
    88       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    89         String v = patterns.get(pattern); 
    90         return Immersion.fromString(v); 
     88    if (value != null) { 
     89      for (String pattern : patterns.keySet()) { 
     90        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     91          String v = patterns.get(pattern); 
     92          return Immersion.fromString(v); 
     93        } 
    9194      } 
    9295    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/LaserMediumEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    105105  public Enumeration getEnumeration(String value) 
    106106    throws EnumerationException { 
    107     for (String pattern : patterns.keySet()) { 
    108       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    109         String v = patterns.get(pattern); 
    110         return LaserMedium.fromString(v); 
     107    if (value != null) { 
     108      for (String pattern : patterns.keySet()) { 
     109        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     110          String v = patterns.get(pattern); 
     111          return LaserMedium.fromString(v); 
     112        } 
    111113      } 
    112114    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/LaserTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7979  public Enumeration getEnumeration(String value) 
    8080    throws EnumerationException { 
    81     for (String pattern : patterns.keySet()) { 
    82       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    83         String v = patterns.get(pattern); 
    84         return LaserType.fromString(v); 
     81    if (value != null) { 
     82      for (String pattern : patterns.keySet()) { 
     83        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     84          String v = patterns.get(pattern); 
     85          return LaserType.fromString(v); 
     86        } 
    8587      } 
    8688    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/LineCapEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7474  public Enumeration getEnumeration(String value) 
    7575    throws EnumerationException { 
    76     for (String pattern : patterns.keySet()) { 
    77       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    78         String v = patterns.get(pattern); 
    79         return LineCap.fromString(v); 
     76    if (value != null) { 
     77      for (String pattern : patterns.keySet()) { 
     78        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     79          String v = patterns.get(pattern); 
     80          return LineCap.fromString(v); 
     81        } 
    8082      } 
    8183    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/MarkerEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7474  public Enumeration getEnumeration(String value) 
    7575    throws EnumerationException { 
    76     for (String pattern : patterns.keySet()) { 
    77       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    78         String v = patterns.get(pattern); 
    79         return Marker.fromString(v); 
     76    if (value != null) { 
     77      for (String pattern : patterns.keySet()) { 
     78        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     79          String v = patterns.get(pattern); 
     80          return Marker.fromString(v); 
     81        } 
    8082      } 
    8183    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/MediumEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7676  public Enumeration getEnumeration(String value) 
    7777    throws EnumerationException { 
    78     for (String pattern : patterns.keySet()) { 
    79       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    80         String v = patterns.get(pattern); 
    81         return Medium.fromString(v); 
     78    if (value != null) { 
     79      for (String pattern : patterns.keySet()) { 
     80        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     81          String v = patterns.get(pattern); 
     82          return Medium.fromString(v); 
     83        } 
    8284      } 
    8385    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/MicrobeamManipulationTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7979  public Enumeration getEnumeration(String value) 
    8080    throws EnumerationException { 
    81     for (String pattern : patterns.keySet()) { 
    82       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    83         String v = patterns.get(pattern); 
    84         return MicrobeamManipulationType.fromString(v); 
     81    if (value != null) { 
     82      for (String pattern : patterns.keySet()) { 
     83        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     84          String v = patterns.get(pattern); 
     85          return MicrobeamManipulationType.fromString(v); 
     86        } 
    8587      } 
    8688    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/MicroscopeTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7676  public Enumeration getEnumeration(String value) 
    7777    throws EnumerationException { 
    78     for (String pattern : patterns.keySet()) { 
    79       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    80         String v = patterns.get(pattern); 
    81         return MicroscopeType.fromString(v); 
     78    if (value != null) { 
     79      for (String pattern : patterns.keySet()) { 
     80        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     81          String v = patterns.get(pattern); 
     82          return MicroscopeType.fromString(v); 
     83        } 
    8284      } 
    8385    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/NamingConventionEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7373  public Enumeration getEnumeration(String value) 
    7474    throws EnumerationException { 
    75     for (String pattern : patterns.keySet()) { 
    76       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    77         String v = patterns.get(pattern); 
    78         return NamingConvention.fromString(v); 
     75    if (value != null) { 
     76      for (String pattern : patterns.keySet()) { 
     77        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     78          String v = patterns.get(pattern); 
     79          return NamingConvention.fromString(v); 
     80        } 
    7981      } 
    8082    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/PixelTypeEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8282  public Enumeration getEnumeration(String value) 
    8383    throws EnumerationException { 
    84     for (String pattern : patterns.keySet()) { 
    85       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    86         String v = patterns.get(pattern); 
    87         return PixelType.fromString(v); 
     84    if (value != null) { 
     85      for (String pattern : patterns.keySet()) { 
     86        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     87          String v = patterns.get(pattern); 
     88          return PixelType.fromString(v); 
     89        } 
    8890      } 
    8991    } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/handlers/PulseEnumHandler.java

    r6382 r6390  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 17:10:17.335358 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7777  public Enumeration getEnumeration(String value) 
    7878    throws EnumerationException { 
    79     for (String pattern : patterns.keySet()) { 
    80       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    81         String v = patterns.get(pattern); 
    82         return Pulse.fromString(v); 
     79    if (value != null) { 
     80      for (String pattern : patterns.keySet()) { 
     81        if (value.toLowerCase().matches(pattern.toLowerCase())) { 
     82          String v = patterns.get(pattern); 
     83          return Pulse.fromString(v); 
     84        } 
    8385      } 
    8486    } 
Note: See TracChangeset for help on using the changeset viewer.