Changeset 6644


Ignore:
Timestamp:
07/05/10 09:48:12 (9 years ago)
Author:
callan
Message:

Re-run of code generation; DRY as a possible value for AIR immersion. ( ome-xml:r647)

Location:
trunk/components/ome-xml
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/AcquisitionModeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    110110      } 
    111111    } 
    112     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    113       "AcquisitionMode", value); 
     112    LOGGER.warn("Could not find enumeration for '{}'({})", 
     113                value, value == null? -1 : value.length()); 
    114114    return AcquisitionMode.OTHER; 
    115115  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ArcTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9292      } 
    9393    } 
    94     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    95       "ArcType", value); 
     94    LOGGER.warn("Could not find enumeration for '{}'({})", 
     95                value, value == null? -1 : value.length()); 
    9696    return ArcType.OTHER; 
    9797  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/BinningEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9898      } 
    9999    } 
    100     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    101       "Binning", value); 
     100    LOGGER.warn("Could not find enumeration for '{}'({})", 
     101                value, value == null? -1 : value.length()); 
    102102    return Binning.OTHER; 
    103103  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/CompressionEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9191      } 
    9292    } 
    93     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    94       "Compression", value); 
     93    LOGGER.warn("Could not find enumeration for '{}'({})", 
     94                value, value == null? -1 : value.length()); 
    9595    throw new EnumerationException(this.getClass().getName() + 
    9696     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ContrastMethodEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9797      } 
    9898    } 
    99     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    100       "ContrastMethod", value); 
     99    LOGGER.warn("Could not find enumeration for '{}'({})", 
     100                value, value == null? -1 : value.length()); 
    101101    return ContrastMethod.OTHER; 
    102102  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/CorrectionEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    113113      } 
    114114    } 
    115     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    116       "Correction", value); 
     115    LOGGER.warn("Could not find enumeration for '{}'({})", 
     116                value, value == null? -1 : value.length()); 
    117117    return Correction.OTHER; 
    118118  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/DetectorTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    106106      } 
    107107    } 
    108     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    109       "DetectorType", value); 
     108    LOGGER.warn("Could not find enumeration for '{}'({})", 
     109                value, value == null? -1 : value.length()); 
    110110    return DetectorType.OTHER; 
    111111  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/DimensionOrderEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9494      } 
    9595    } 
    96     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    97       "DimensionOrder", value); 
     96    LOGGER.warn("Could not find enumeration for '{}'({})", 
     97                value, value == null? -1 : value.length()); 
    9898    throw new EnumerationException(this.getClass().getName() + 
    9999     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ExperimentTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    105105      } 
    106106    } 
    107     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    108       "ExperimentType", value); 
     107    LOGGER.warn("Could not find enumeration for '{}'({})", 
     108                value, value == null? -1 : value.length()); 
    109109    return ExperimentType.OTHER; 
    110110  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FilamentTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9191      } 
    9292    } 
    93     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    94       "FilamentType", value); 
     93    LOGGER.warn("Could not find enumeration for '{}'({})", 
     94                value, value == null? -1 : value.length()); 
    9595    return FilamentType.OTHER; 
    9696  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FillRuleEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9090      } 
    9191    } 
    92     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    93       "FillRule", value); 
     92    LOGGER.warn("Could not find enumeration for '{}'({})", 
     93                value, value == null? -1 : value.length()); 
    9494    throw new EnumerationException(this.getClass().getName() + 
    9595     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FilterTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9595      } 
    9696    } 
    97     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    98       "FilterType", value); 
     97    LOGGER.warn("Could not find enumeration for '{}'({})", 
     98                value, value == null? -1 : value.length()); 
    9999    return FilterType.OTHER; 
    100100  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FontFamilyEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9292      } 
    9393    } 
    94     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    95       "FontFamily", value); 
     94    LOGGER.warn("Could not find enumeration for '{}'({})", 
     95                value, value == null? -1 : value.length()); 
    9696    throw new EnumerationException(this.getClass().getName() + 
    9797     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FontStyleEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9292      } 
    9393    } 
    94     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    95       "FontStyle", value); 
     94    LOGGER.warn("Could not find enumeration for '{}'({})", 
     95                value, value == null? -1 : value.length()); 
    9696    throw new EnumerationException(this.getClass().getName() + 
    9797     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/IlluminationTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9393      } 
    9494    } 
    95     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    96       "IlluminationType", value); 
     95    LOGGER.warn("Could not find enumeration for '{}'({})", 
     96                value, value == null? -1 : value.length()); 
    9797    return IlluminationType.OTHER; 
    9898  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ImmersionEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    8080    p.put("^\\s*Other\\s*", "Other"); 
    8181    // BEGIN custom enumeration mappings 
     82    p.put("^\\s*Dry\\s*", "Air"); 
    8283    p.put("^\\s*OI\\s*", "Oil"); 
    8384    p.put(".*Oil.*", "Oil"); 
    … …  
    103104      } 
    104105    } 
    105     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    106       "Immersion", value); 
     106    LOGGER.warn("Could not find enumeration for '{}'({})", 
     107                value, value == null? -1 : value.length()); 
    107108    return Immersion.OTHER; 
    108109  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/LaserMediumEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    122122      } 
    123123    } 
    124     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    125       "LaserMedium", value); 
     124    LOGGER.warn("Could not find enumeration for '{}'({})", 
     125                value, value == null? -1 : value.length()); 
    126126    return LaserMedium.OTHER; 
    127127  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/LaserTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9696      } 
    9797    } 
    98     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    99       "LaserType", value); 
     98    LOGGER.warn("Could not find enumeration for '{}'({})", 
     99                value, value == null? -1 : value.length()); 
    100100    return LaserType.OTHER; 
    101101  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/LineCapEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9191      } 
    9292    } 
    93     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    94       "LineCap", value); 
     93    LOGGER.warn("Could not find enumeration for '{}'({})", 
     94                value, value == null? -1 : value.length()); 
    9595    throw new EnumerationException(this.getClass().getName() + 
    9696     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MarkerEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9191      } 
    9292    } 
    93     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    94       "Marker", value); 
     93    LOGGER.warn("Could not find enumeration for '{}'({})", 
     94                value, value == null? -1 : value.length()); 
    9595    throw new EnumerationException(this.getClass().getName() + 
    9696     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MediumEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9393      } 
    9494    } 
    95     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    96       "Medium", value); 
     95    LOGGER.warn("Could not find enumeration for '{}'({})", 
     96                value, value == null? -1 : value.length()); 
    9797    return Medium.OTHER; 
    9898  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MicrobeamManipulationTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9696      } 
    9797    } 
    98     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    99       "MicrobeamManipulationType", value); 
     98    LOGGER.warn("Could not find enumeration for '{}'({})", 
     99                value, value == null? -1 : value.length()); 
    100100    return MicrobeamManipulationType.OTHER; 
    101101  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MicroscopeTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9393      } 
    9494    } 
    95     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    96       "MicroscopeType", value); 
     95    LOGGER.warn("Could not find enumeration for '{}'({})", 
     96                value, value == null? -1 : value.length()); 
    9797    return MicroscopeType.OTHER; 
    9898  } 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/NamingConventionEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9090      } 
    9191    } 
    92     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    93       "NamingConvention", value); 
     92    LOGGER.warn("Could not find enumeration for '{}'({})", 
     93                value, value == null? -1 : value.length()); 
    9494    throw new EnumerationException(this.getClass().getName() + 
    9595     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/PixelTypeEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9999      } 
    100100    } 
    101     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    102       "PixelType", value); 
     101    LOGGER.warn("Could not find enumeration for '{}'({})", 
     102                value, value == null? -1 : value.length()); 
    103103    throw new EnumerationException(this.getClass().getName() + 
    104104     " could not find enumeration for " + value); 

  • trunk/components/ome-xml/src/ome/xml/model/enums/handlers/PulseEnumHandler.java

    r6632 r6644  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by melissa via xsd-fu on 2010-07-02 09:43:24.066223 
     34 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    … …  
    9494      } 
    9595    } 
    96     LOGGER.warn("Unknown {} value '{}' will be stored as \"Other\"", 
    97       "Pulse", value); 
     96    LOGGER.warn("Could not find enumeration for '{}'({})", 
     97                value, value == null? -1 : value.length()); 
    9898    return Pulse.OTHER; 
    9999  } 

  • trunk/components/ome-xml/test/ome/xml/utests/EnumHandlerTest.java

    r6531 r6644  
    7171 
    7272  @Test 
     73  public void testImmersionDRY() throws EnumerationException { 
     74    ImmersionEnumHandler handler = new ImmersionEnumHandler(); 
     75    Immersion v = (Immersion) handler.getEnumeration("DRY"); 
     76    assertEquals(Immersion.AIR, v); 
     77  } 
     78 
     79  @Test 
     80  public void testImmersionDRYWithWhitespace() throws EnumerationException { 
     81    ImmersionEnumHandler handler = new ImmersionEnumHandler(); 
     82    Immersion v = (Immersion) handler.getEnumeration("   DRY  "); 
     83    assertEquals(Immersion.AIR, v); 
     84  } 
     85 
     86  @Test 
    7387  public void testImmersionWl() throws EnumerationException { 
    7488    ImmersionEnumHandler handler = new ImmersionEnumHandler(); 
Note: See TracChangeset for help on using the changeset viewer.