Changeset 6644
- Timestamp:
- 07/05/10 09:48:12 (9 years ago)
- 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 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 110 110 } 111 111 } 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()); 114 114 return AcquisitionMode.OTHER; 115 115 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ArcTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 92 92 } 93 93 } 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()); 96 96 return ArcType.OTHER; 97 97 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/BinningEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 98 98 } 99 99 } 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()); 102 102 return Binning.OTHER; 103 103 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/CompressionEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 91 91 } 92 92 } 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()); 95 95 throw new EnumerationException(this.getClass().getName() + 96 96 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ContrastMethodEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 97 97 } 98 98 } 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()); 101 101 return ContrastMethod.OTHER; 102 102 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/CorrectionEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 113 113 } 114 114 } 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()); 117 117 return Correction.OTHER; 118 118 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/DetectorTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 106 106 } 107 107 } 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()); 110 110 return DetectorType.OTHER; 111 111 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/DimensionOrderEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 94 94 } 95 95 } 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()); 98 98 throw new EnumerationException(this.getClass().getName() + 99 99 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ExperimentTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 105 105 } 106 106 } 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()); 109 109 return ExperimentType.OTHER; 110 110 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FilamentTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 91 91 } 92 92 } 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()); 95 95 return FilamentType.OTHER; 96 96 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FillRuleEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 90 90 } 91 91 } 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()); 94 94 throw new EnumerationException(this.getClass().getName() + 95 95 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FilterTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 95 95 } 96 96 } 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()); 99 99 return FilterType.OTHER; 100 100 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FontFamilyEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 92 92 } 93 93 } 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()); 96 96 throw new EnumerationException(this.getClass().getName() + 97 97 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/FontStyleEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 92 92 } 93 93 } 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()); 96 96 throw new EnumerationException(this.getClass().getName() + 97 97 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/IlluminationTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 93 93 } 94 94 } 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()); 97 97 return IlluminationType.OTHER; 98 98 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/ImmersionEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 80 80 p.put("^\\s*Other\\s*", "Other"); 81 81 // BEGIN custom enumeration mappings 82 p.put("^\\s*Dry\\s*", "Air"); 82 83 p.put("^\\s*OI\\s*", "Oil"); 83 84 p.put(".*Oil.*", "Oil"); … … 103 104 } 104 105 } 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()); 107 108 return Immersion.OTHER; 108 109 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/LaserMediumEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 122 122 } 123 123 } 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()); 126 126 return LaserMedium.OTHER; 127 127 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/LaserTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 96 96 } 97 97 } 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()); 100 100 return LaserType.OTHER; 101 101 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/LineCapEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 91 91 } 92 92 } 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()); 95 95 throw new EnumerationException(this.getClass().getName() + 96 96 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MarkerEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 91 91 } 92 92 } 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()); 95 95 throw new EnumerationException(this.getClass().getName() + 96 96 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MediumEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 93 93 } 94 94 } 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()); 97 97 return Medium.OTHER; 98 98 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MicrobeamManipulationTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 96 96 } 97 97 } 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()); 100 100 return MicrobeamManipulationType.OTHER; 101 101 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/MicroscopeTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 93 93 } 94 94 } 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()); 97 97 return MicroscopeType.OTHER; 98 98 } -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/NamingConventionEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 90 90 } 91 91 } 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()); 94 94 throw new EnumerationException(this.getClass().getName() + 95 95 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/PixelTypeEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 99 99 } 100 100 } 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()); 103 103 throw new EnumerationException(this.getClass().getName() + 104 104 " could not find enumeration for " + value); -
trunk/components/ome-xml/src/ome/xml/model/enums/handlers/PulseEnumHandler.java
r6632 r6644 32 32 * 33 33 * THIS IS AUTOMATICALLY GENERATED CODE. DO NOT MODIFY. 34 * Created by melissa via xsd-fu on 2010-07-02 09:43:24.06622334 * Created by callan via xsd-fu on 2010-07-05 15:46:32+0100 35 35 * 36 36 *----------------------------------------------------------------------------- … … 94 94 } 95 95 } 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()); 98 98 return Pulse.OTHER; 99 99 } -
trunk/components/ome-xml/test/ome/xml/utests/EnumHandlerTest.java
r6531 r6644 71 71 72 72 @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 73 87 public void testImmersionWl() throws EnumerationException { 74 88 ImmersionEnumHandler handler = new ImmersionEnumHandler();
Note: See TracChangeset
for help on using the changeset viewer.