Changeset 6391


Ignore:
Timestamp:
05/26/10 10:49:05 (10 years ago)
Author:
callan
Message:

Merging r6382,r6390 from Trunk

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

Legend:

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

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8282    p.put("^\\s*FSM\\s*", "FSM"); 
    8383    p.put("^\\s*LCM\\s*", "LCM"); 
     84    p.put("^\\s*Other\\s*", "Other"); 
    8485    return p; 
    8586  } 
     
    9091  public Enumeration getEnumeration(String value) 
    9192    throws EnumerationException { 
    92     for (String pattern : patterns.keySet()) { 
    93       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    94         String v = patterns.get(pattern); 
    95         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        } 
    9699      } 
    97100    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ArcTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6666    p.put("^\\s*Xe\\s*", "Xe"); 
    6767    p.put("^\\s*HgXe\\s*", "HgXe"); 
     68    p.put("^\\s*Other\\s*", "Other"); 
    6869    return p; 
    6970  } 
     
    7475  public Enumeration getEnumeration(String value) 
    7576    throws EnumerationException { 
    76     for (String pattern : patterns.keySet()) { 
    77       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    78         String v = patterns.get(pattern); 
    79         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        } 
    8083      } 
    8184    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/BinningEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6767    p.put("^\\s*4x4\\s*", "4x4"); 
    6868    p.put("^\\s*8x8\\s*", "8x8"); 
     69    p.put("^\\s*Other\\s*", "Other"); 
    6970    return p; 
    7071  } 
     
    7576  public Enumeration getEnumeration(String value) 
    7677    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         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        } 
    8184      } 
    8285    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/CompressionEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ContrastMethodEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7171    p.put("^\\s*Darkfield\\s*", "Darkfield"); 
    7272    p.put("^\\s*Fluorescence\\s*", "Fluorescence"); 
     73    p.put("^\\s*Other\\s*", "Other"); 
    7374    return p; 
    7475  } 
     
    7980  public Enumeration getEnumeration(String value) 
    8081    throws EnumerationException { 
    81     for (String pattern : patterns.keySet()) { 
    82       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    83         String v = patterns.get(pattern); 
    84         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        } 
    8588      } 
    8689    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/CorrectionEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7777    p.put("^\\s*Apo\\s*", "Apo"); 
    7878    p.put("^\\s*PlanNeofluar\\s*", "PlanNeofluar"); 
     79    p.put("^\\s*Other\\s*", "Other"); 
    7980    // BEGIN custom enumeration mappings 
    80     p.put("^\\s*Pl.*Apo.*", "PlanApo"); 
    81     p.put("^\\s*Pl.*Flu.*", "PlanFluor"); 
    82     p.put("^\\s*Sup.*Flu.*", "SuperFluor"); 
     81    p.put(".*Pl.*Apo.*", "PlanApo"); 
     82    p.put(".*Pl.*Flu.*", "PlanFluor"); 
    8383    p.put("^\\s*Vio.*Corr.*", "VioletCorrected"); 
    84     p.put("^\\s*Neo.*flu.*", "Neofluar"); 
     84    p.put(".*S.*Flu.*", "SuperFluor"); 
     85    p.put(".*Neo.*flu.*", "Neofluar"); 
     86    p.put(".*Flu.*tar.*", "Fluotar"); 
     87    p.put(".*Fluo.*", "Fluor"); 
     88    p.put(".*Flua.*", "Fluar"); 
    8589    p.put("^\\s*Apo.*", "Apo"); 
    8690    return p; 
     
    9296  public Enumeration getEnumeration(String value) 
    9397    throws EnumerationException { 
    94     for (String pattern : patterns.keySet()) { 
    95       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    96         String v = patterns.get(pattern); 
    97         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        } 
    98104      } 
    99105    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/DetectorTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7676    p.put("^\\s*CMOS\\s*", "CMOS"); 
    7777    p.put("^\\s*EBCCD\\s*", "EBCCD"); 
     78    p.put("^\\s*Other\\s*", "Other"); 
    7879    // BEGIN custom enumeration mappings 
    7980    p.put(".*EM.*CCD.*", "EM-CCD"); 
     
    8889  public Enumeration getEnumeration(String value) 
    8990    throws EnumerationException { 
    90     for (String pattern : patterns.keySet()) { 
    91       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    92         String v = patterns.get(pattern); 
    93         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        } 
    9497      } 
    9598    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/DimensionOrderEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ExperimentTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7878    p.put("^\\s*SpectralImaging\\s*", "SpectralImaging"); 
    7979    p.put("^\\s*Photobleaching\\s*", "Photobleaching"); 
     80    p.put("^\\s*Other\\s*", "Other"); 
    8081    return p; 
    8182  } 
     
    8687  public Enumeration getEnumeration(String value) 
    8788    throws EnumerationException { 
    88     for (String pattern : patterns.keySet()) { 
    89       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    90         String v = patterns.get(pattern); 
    91         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        } 
    9295      } 
    9396    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FilamentTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6565    p.put("^\\s*Incandescent\\s*", "Incandescent"); 
    6666    p.put("^\\s*Halogen\\s*", "Halogen"); 
     67    p.put("^\\s*Other\\s*", "Other"); 
    6768    return p; 
    6869  } 
     
    7374  public Enumeration getEnumeration(String value) 
    7475    throws EnumerationException { 
    75     for (String pattern : patterns.keySet()) { 
    76       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    77         String v = patterns.get(pattern); 
    78         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        } 
    7982      } 
    8083    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FillRuleEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FilterTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6969    p.put("^\\s*MultiPass\\s*", "MultiPass"); 
    7070    p.put("^\\s*NeutralDensity\\s*", "NeutralDensity"); 
     71    p.put("^\\s*Other\\s*", "Other"); 
    7172    return p; 
    7273  } 
     
    7778  public Enumeration getEnumeration(String value) 
    7879    throws EnumerationException { 
    79     for (String pattern : patterns.keySet()) { 
    80       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    81         String v = patterns.get(pattern); 
    82         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        } 
    8386      } 
    8487    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FontFamilyEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/FontStyleEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/IlluminationTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6767    p.put("^\\s*Oblique\\s*", "Oblique"); 
    6868    p.put("^\\s*NonLinear\\s*", "NonLinear"); 
     69    p.put("^\\s*Other\\s*", "Other"); 
    6970    return p; 
    7071  } 
     
    7576  public Enumeration getEnumeration(String value) 
    7677    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         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        } 
    8184      } 
    8285    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/ImmersionEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6969    p.put("^\\s*Multi\\s*", "Multi"); 
    7070    p.put("^\\s*Glycerol\\s*", "Glycerol"); 
     71    p.put("^\\s*Other\\s*", "Other"); 
    7172    // BEGIN custom enumeration mappings 
    72     p.put("^\\s*Oil.*", "Oil"); 
    73     p.put("^\\s*W", "Water"); 
     73    p.put("^\\s*OI\\s*", "Oil"); 
     74    p.put(".*Oil.*", "Oil"); 
     75    p.put(".*Oel.*", "Oil"); 
     76    p.put(".*Wasser.*", "Water"); 
     77    p.put(".*Gly.*", "Glycerol"); 
     78    p.put("^\\s*Wl\\s*", "Water"); 
     79    p.put("^\\s*W\\s*", "Water"); 
    7480    return p; 
    7581  } 
     
    8086  public Enumeration getEnumeration(String value) 
    8187    throws EnumerationException { 
    82     for (String pattern : patterns.keySet()) { 
    83       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    84         String v = patterns.get(pattern); 
    85         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        } 
    8694      } 
    8795    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/LaserMediumEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9696    p.put("^\\s*GaAlAs\\s*", "GaAlAs"); 
    9797    p.put("^\\s*EMinus\\s*", "EMinus"); 
     98    p.put("^\\s*Other\\s*", "Other"); 
    9899    return p; 
    99100  } 
     
    104105  public Enumeration getEnumeration(String value) 
    105106    throws EnumerationException { 
    106     for (String pattern : patterns.keySet()) { 
    107       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    108         String v = patterns.get(pattern); 
    109         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        } 
    110113      } 
    111114    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/LaserTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7070    p.put("^\\s*Semiconductor\\s*", "Semiconductor"); 
    7171    p.put("^\\s*FreeElectron\\s*", "FreeElectron"); 
     72    p.put("^\\s*Other\\s*", "Other"); 
    7273    return p; 
    7374  } 
     
    7879  public Enumeration getEnumeration(String value) 
    7980    throws EnumerationException { 
    80     for (String pattern : patterns.keySet()) { 
    81       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    82         String v = patterns.get(pattern); 
    83         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        } 
    8487      } 
    8588    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/LineCapEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MarkerEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MediumEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6767    p.put("^\\s*Water\\s*", "Water"); 
    6868    p.put("^\\s*Glycerol\\s*", "Glycerol"); 
     69    p.put("^\\s*Other\\s*", "Other"); 
    6970    return p; 
    7071  } 
     
    7576  public Enumeration getEnumeration(String value) 
    7677    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         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        } 
    8184      } 
    8285    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MicrobeamManipulationTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    7070    p.put("^\\s*Uncaging\\s*", "Uncaging"); 
    7171    p.put("^\\s*OpticalTrapping\\s*", "OpticalTrapping"); 
     72    p.put("^\\s*Other\\s*", "Other"); 
    7273    return p; 
    7374  } 
     
    7879  public Enumeration getEnumeration(String value) 
    7980    throws EnumerationException { 
    80     for (String pattern : patterns.keySet()) { 
    81       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    82         String v = patterns.get(pattern); 
    83         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        } 
    8487      } 
    8588    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/MicroscopeTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6767    p.put("^\\s*Dissection\\s*", "Dissection"); 
    6868    p.put("^\\s*Electrophysiology\\s*", "Electrophysiology"); 
     69    p.put("^\\s*Other\\s*", "Other"); 
    6970    return p; 
    7071  } 
     
    7576  public Enumeration getEnumeration(String value) 
    7677    throws EnumerationException { 
    77     for (String pattern : patterns.keySet()) { 
    78       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    79         String v = patterns.get(pattern); 
    80         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        } 
    8184      } 
    8285    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/NamingConventionEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/PixelTypeEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     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    } 
  • branches/4.2/components/ome-xml/src/ome/xml/r201004/enums/handlers/PulseEnumHandler.java

    r6380 r6391  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-05-25 16:07:53.011910 
     34 * Created by callan via xsd-fu on 2010-05-26 16:31:31.789920 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6868    p.put("^\\s*Repetitive\\s*", "Repetitive"); 
    6969    p.put("^\\s*ModeLocked\\s*", "ModeLocked"); 
     70    p.put("^\\s*Other\\s*", "Other"); 
    7071    return p; 
    7172  } 
     
    7677  public Enumeration getEnumeration(String value) 
    7778    throws EnumerationException { 
    78     for (String pattern : patterns.keySet()) { 
    79       if (value.toLowerCase().matches(pattern.toLowerCase())) { 
    80         String v = patterns.get(pattern); 
    81         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        } 
    8285      } 
    8386    } 
Note: See TracChangeset for help on using the changeset viewer.