Changeset 6457


Ignore:
Timestamp:
06/03/10 11:40:39 (10 years ago)
Author:
melissa
Message:

Moved ome.xml.r201004.* to ome.xml.model.*.

Location:
branches/4.2/components
Files:
147 added
1 deleted
54 edited
7 copied

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/autogen/src/entities.txt

    r6266 r6457  
    10021002 
    10031003[PixelsBinData] 
     1004countable = true 
    10041005path = Image+/Pixels/BinData+ 
    10051006 
     
    15181519type = String 
    15191520 
     1521[UUID Value] 
     1522type = String 
     1523 
    15201524[Well] 
    15211525countable = true 
  • branches/4.2/components/autogen/src/meta/AggregateMetadata.vm

    r6230 r6457  
    3535import java.util.List; 
    3636 
    37 import ome.xml.r201004.enums.*; 
    38 import ome.xml.r201004.primitives.*; 
     37import ome.xml.model.enums.*; 
     38import ome.xml.model.primitives.*; 
    3939 
    4040/** 
  • branches/4.2/components/autogen/src/meta/DummyMetadata.vm

    r6230 r6457  
    3232package loci.formats.meta; 
    3333 
    34 import ome.xml.r201004.enums.*; 
    35 import ome.xml.r201004.primitives.*; 
     34import ome.xml.model.enums.*; 
     35import ome.xml.model.primitives.*; 
    3636 
    3737/** 
  • branches/4.2/components/autogen/src/meta/FilterMetadata.vm

    r6266 r6457  
    3434import loci.common.DataTools; 
    3535 
    36 import ome.xml.r201004.enums.*; 
    37 import ome.xml.r201004.primitives.*; 
     36import ome.xml.model.enums.*; 
     37import ome.xml.model.primitives.*; 
    3838 
    3939/** 
  • branches/4.2/components/autogen/src/meta/MetadataConverter.vm

    r6230 r6457  
    3232package loci.formats.meta; 
    3333 
    34 import ome.xml.r201004.enums.*; 
    35 import ome.xml.r201004.primitives.*; 
     34import ome.xml.model.enums.*; 
     35import ome.xml.model.primitives.*; 
    3636 
    3737/** 
  • branches/4.2/components/bio-formats/src/loci/formats/FormatReader.java

    r6370 r6457  
    4545import loci.formats.services.OMEXMLService; 
    4646 
    47 import ome.xml.r201004.enums.AcquisitionMode; 
    48 import ome.xml.r201004.enums.ArcType; 
    49 import ome.xml.r201004.enums.Binning; 
    50 import ome.xml.r201004.enums.Compression; 
    51 import ome.xml.r201004.enums.ContrastMethod; 
    52 import ome.xml.r201004.enums.Correction; 
    53 import ome.xml.r201004.enums.DetectorType; 
    54 import ome.xml.r201004.enums.DimensionOrder; 
    55 import ome.xml.r201004.enums.EnumerationException; 
    56 import ome.xml.r201004.enums.ExperimentType; 
    57 import ome.xml.r201004.enums.FilamentType; 
    58 import ome.xml.r201004.enums.FillRule; 
    59 import ome.xml.r201004.enums.FilterType; 
    60 import ome.xml.r201004.enums.FontFamily; 
    61 import ome.xml.r201004.enums.FontStyle; 
    62 import ome.xml.r201004.enums.IlluminationType; 
    63 import ome.xml.r201004.enums.Immersion; 
    64 import ome.xml.r201004.enums.LaserMedium; 
    65 import ome.xml.r201004.enums.LaserType; 
    66 import ome.xml.r201004.enums.LineCap; 
    67 import ome.xml.r201004.enums.Marker; 
    68 import ome.xml.r201004.enums.Medium; 
    69 import ome.xml.r201004.enums.MicrobeamManipulationType; 
    70 import ome.xml.r201004.enums.MicroscopeType; 
    71 import ome.xml.r201004.enums.NamingConvention; 
    72 import ome.xml.r201004.enums.PixelType; 
    73 import ome.xml.r201004.enums.Pulse; 
    74 import ome.xml.r201004.enums.handlers.AcquisitionModeEnumHandler; 
    75 import ome.xml.r201004.enums.handlers.ArcTypeEnumHandler; 
    76 import ome.xml.r201004.enums.handlers.BinningEnumHandler; 
    77 import ome.xml.r201004.enums.handlers.CompressionEnumHandler; 
    78 import ome.xml.r201004.enums.handlers.ContrastMethodEnumHandler; 
    79 import ome.xml.r201004.enums.handlers.CorrectionEnumHandler; 
    80 import ome.xml.r201004.enums.handlers.DetectorTypeEnumHandler; 
    81 import ome.xml.r201004.enums.handlers.DimensionOrderEnumHandler; 
    82 import ome.xml.r201004.enums.handlers.ExperimentTypeEnumHandler; 
    83 import ome.xml.r201004.enums.handlers.FilamentTypeEnumHandler; 
    84 import ome.xml.r201004.enums.handlers.FillRuleEnumHandler; 
    85 import ome.xml.r201004.enums.handlers.FilterTypeEnumHandler; 
    86 import ome.xml.r201004.enums.handlers.FontFamilyEnumHandler; 
    87 import ome.xml.r201004.enums.handlers.FontStyleEnumHandler; 
    88 import ome.xml.r201004.enums.handlers.IlluminationTypeEnumHandler; 
    89 import ome.xml.r201004.enums.handlers.ImmersionEnumHandler; 
    90 import ome.xml.r201004.enums.handlers.LaserMediumEnumHandler; 
    91 import ome.xml.r201004.enums.handlers.LaserTypeEnumHandler; 
    92 import ome.xml.r201004.enums.handlers.LineCapEnumHandler; 
    93 import ome.xml.r201004.enums.handlers.MarkerEnumHandler; 
    94 import ome.xml.r201004.enums.handlers.MediumEnumHandler; 
    95 import ome.xml.r201004.enums.handlers.MicrobeamManipulationTypeEnumHandler; 
    96 import ome.xml.r201004.enums.handlers.MicroscopeTypeEnumHandler; 
    97 import ome.xml.r201004.enums.handlers.NamingConventionEnumHandler; 
    98 import ome.xml.r201004.enums.handlers.PixelTypeEnumHandler; 
    99 import ome.xml.r201004.enums.handlers.PulseEnumHandler; 
     47import ome.xml.model.enums.AcquisitionMode; 
     48import ome.xml.model.enums.ArcType; 
     49import ome.xml.model.enums.Binning; 
     50import ome.xml.model.enums.Compression; 
     51import ome.xml.model.enums.ContrastMethod; 
     52import ome.xml.model.enums.Correction; 
     53import ome.xml.model.enums.DetectorType; 
     54import ome.xml.model.enums.DimensionOrder; 
     55import ome.xml.model.enums.EnumerationException; 
     56import ome.xml.model.enums.ExperimentType; 
     57import ome.xml.model.enums.FilamentType; 
     58import ome.xml.model.enums.FillRule; 
     59import ome.xml.model.enums.FilterType; 
     60import ome.xml.model.enums.FontFamily; 
     61import ome.xml.model.enums.FontStyle; 
     62import ome.xml.model.enums.IlluminationType; 
     63import ome.xml.model.enums.Immersion; 
     64import ome.xml.model.enums.LaserMedium; 
     65import ome.xml.model.enums.LaserType; 
     66import ome.xml.model.enums.LineCap; 
     67import ome.xml.model.enums.Marker; 
     68import ome.xml.model.enums.Medium; 
     69import ome.xml.model.enums.MicrobeamManipulationType; 
     70import ome.xml.model.enums.MicroscopeType; 
     71import ome.xml.model.enums.NamingConvention; 
     72import ome.xml.model.enums.PixelType; 
     73import ome.xml.model.enums.Pulse; 
     74import ome.xml.model.enums.handlers.AcquisitionModeEnumHandler; 
     75import ome.xml.model.enums.handlers.ArcTypeEnumHandler; 
     76import ome.xml.model.enums.handlers.BinningEnumHandler; 
     77import ome.xml.model.enums.handlers.CompressionEnumHandler; 
     78import ome.xml.model.enums.handlers.ContrastMethodEnumHandler; 
     79import ome.xml.model.enums.handlers.CorrectionEnumHandler; 
     80import ome.xml.model.enums.handlers.DetectorTypeEnumHandler; 
     81import ome.xml.model.enums.handlers.DimensionOrderEnumHandler; 
     82import ome.xml.model.enums.handlers.ExperimentTypeEnumHandler; 
     83import ome.xml.model.enums.handlers.FilamentTypeEnumHandler; 
     84import ome.xml.model.enums.handlers.FillRuleEnumHandler; 
     85import ome.xml.model.enums.handlers.FilterTypeEnumHandler; 
     86import ome.xml.model.enums.handlers.FontFamilyEnumHandler; 
     87import ome.xml.model.enums.handlers.FontStyleEnumHandler; 
     88import ome.xml.model.enums.handlers.IlluminationTypeEnumHandler; 
     89import ome.xml.model.enums.handlers.ImmersionEnumHandler; 
     90import ome.xml.model.enums.handlers.LaserMediumEnumHandler; 
     91import ome.xml.model.enums.handlers.LaserTypeEnumHandler; 
     92import ome.xml.model.enums.handlers.LineCapEnumHandler; 
     93import ome.xml.model.enums.handlers.MarkerEnumHandler; 
     94import ome.xml.model.enums.handlers.MediumEnumHandler; 
     95import ome.xml.model.enums.handlers.MicrobeamManipulationTypeEnumHandler; 
     96import ome.xml.model.enums.handlers.MicroscopeTypeEnumHandler; 
     97import ome.xml.model.enums.handlers.NamingConventionEnumHandler; 
     98import ome.xml.model.enums.handlers.PixelTypeEnumHandler; 
     99import ome.xml.model.enums.handlers.PulseEnumHandler; 
    100100 
    101101/** 
     
    10751075 
    10761076  /** 
    1077    * Retrieves an {@link ome.xml.r201004.enums.AcquisitionMode} enumeration 
    1078    * value for the given String. 
    1079    * 
    1080    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1077   * Retrieves an {@link ome.xml.model.enums.AcquisitionMode} enumeration 
     1078   * value for the given String. 
     1079   * 
     1080   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    10811081   *  enumeration value is not found. 
    10821082   */ 
     
    10941094 
    10951095  /** 
    1096    * Retrieves an {@link ome.xml.r201004.enums.ArcType} enumeration 
    1097    * value for the given String. 
    1098    * 
    1099    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1096   * Retrieves an {@link ome.xml.model.enums.ArcType} enumeration 
     1097   * value for the given String. 
     1098   * 
     1099   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11001100   *  enumeration value is not found. 
    11011101   */ 
     
    11111111 
    11121112  /** 
    1113    * Retrieves an {@link ome.xml.r201004.enums.Binning} enumeration 
    1114    * value for the given String. 
    1115    * 
    1116    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1113   * Retrieves an {@link ome.xml.model.enums.Binning} enumeration 
     1114   * value for the given String. 
     1115   * 
     1116   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11171117   *  enumeration value is not found. 
    11181118   */ 
     
    11271127  } 
    11281128  /** 
    1129    * Retrieves an {@link ome.xml.r201004.enums.Compression} enumeration 
    1130    * value for the given String. 
    1131    * 
    1132    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1129   * Retrieves an {@link ome.xml.model.enums.Compression} enumeration 
     1130   * value for the given String. 
     1131   * 
     1132   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11331133   *  enumeration value is not found. 
    11341134   */ 
     
    11431143  } 
    11441144  /** 
    1145    * Retrieves an {@link ome.xml.r201004.enums.ContrastMethod} enumeration 
    1146    * value for the given String. 
    1147    * 
    1148    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1145   * Retrieves an {@link ome.xml.model.enums.ContrastMethod} enumeration 
     1146   * value for the given String. 
     1147   * 
     1148   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11491149   *  enumeration value is not found. 
    11501150   */ 
     
    11611161  } 
    11621162  /** 
    1163    * Retrieves an {@link ome.xml.r201004.enums.Correction} enumeration 
    1164    * value for the given String. 
    1165    * 
    1166    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1163   * Retrieves an {@link ome.xml.model.enums.Correction} enumeration 
     1164   * value for the given String. 
     1165   * 
     1166   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11671167   *  enumeration value is not found. 
    11681168   */ 
     
    11771177  } 
    11781178  /** 
    1179    * Retrieves an {@link ome.xml.r201004.enums.DetectorType} enumeration 
    1180    * value for the given String. 
    1181    * 
    1182    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1179   * Retrieves an {@link ome.xml.model.enums.DetectorType} enumeration 
     1180   * value for the given String. 
     1181   * 
     1182   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11831183   *  enumeration value is not found. 
    11841184   */ 
     
    11931193  } 
    11941194  /** 
    1195    * Retrieves an {@link ome.xml.r201004.enums.DimensionOrder} enumeration 
    1196    * value for the given String. 
    1197    * 
    1198    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1195   * Retrieves an {@link ome.xml.model.enums.DimensionOrder} enumeration 
     1196   * value for the given String. 
     1197   * 
     1198   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    11991199   *  enumeration value is not found. 
    12001200   */ 
     
    12111211  } 
    12121212  /** 
    1213    * Retrieves an {@link ome.xml.r201004.enums.ExperimentType} enumeration 
    1214    * value for the given String. 
    1215    * 
    1216    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1213   * Retrieves an {@link ome.xml.model.enums.ExperimentType} enumeration 
     1214   * value for the given String. 
     1215   * 
     1216   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    12171217   *  enumeration value is not found. 
    12181218   */ 
     
    12291229  } 
    12301230  /** 
    1231    * Retrieves an {@link ome.xml.r201004.enums.FilamentType} enumeration 
    1232    * value for the given String. 
    1233    * 
    1234    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1231   * Retrieves an {@link ome.xml.model.enums.FilamentType} enumeration 
     1232   * value for the given String. 
     1233   * 
     1234   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    12351235   *  enumeration value is not found. 
    12361236   */ 
     
    12451245  } 
    12461246  /** 
    1247    * Retrieves an {@link ome.xml.r201004.enums.FillRule} enumeration 
    1248    * value for the given String. 
    1249    * 
    1250    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1247   * Retrieves an {@link ome.xml.model.enums.FillRule} enumeration 
     1248   * value for the given String. 
     1249   * 
     1250   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    12511251   *  enumeration value is not found. 
    12521252   */ 
     
    12611261  } 
    12621262  /** 
    1263    * Retrieves an {@link ome.xml.r201004.enums.FilterType} enumeration 
    1264    * value for the given String. 
    1265    * 
    1266    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1263   * Retrieves an {@link ome.xml.model.enums.FilterType} enumeration 
     1264   * value for the given String. 
     1265   * 
     1266   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    12671267   *  enumeration value is not found. 
    12681268   */ 
     
    12771277  } 
    12781278  /** 
    1279    * Retrieves an {@link ome.xml.r201004.enums.FontFamily} enumeration 
    1280    * value for the given String. 
    1281    * 
    1282    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1279   * Retrieves an {@link ome.xml.model.enums.FontFamily} enumeration 
     1280   * value for the given String. 
     1281   * 
     1282   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    12831283   *  enumeration value is not found. 
    12841284   */ 
     
    12931293  } 
    12941294  /** 
    1295    * Retrieves an {@link ome.xml.r201004.enums.FontStyle} enumeration 
    1296    * value for the given String. 
    1297    * 
    1298    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1295   * Retrieves an {@link ome.xml.model.enums.FontStyle} enumeration 
     1296   * value for the given String. 
     1297   * 
     1298   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    12991299   *  enumeration value is not found. 
    13001300   */ 
     
    13091309  } 
    13101310  /** 
    1311    * Retrieves an {@link ome.xml.r201004.enums.IlluminationType} enumeration 
    1312    * value for the given String. 
    1313    * 
    1314    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1311   * Retrieves an {@link ome.xml.model.enums.IlluminationType} enumeration 
     1312   * value for the given String. 
     1313   * 
     1314   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    13151315   *  enumeration value is not found. 
    13161316   */ 
     
    13271327  } 
    13281328  /** 
    1329    * Retrieves an {@link ome.xml.r201004.enums.Immersion} enumeration 
    1330    * value for the given String. 
    1331    * 
    1332    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1329   * Retrieves an {@link ome.xml.model.enums.Immersion} enumeration 
     1330   * value for the given String. 
     1331   * 
     1332   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    13331333   *  enumeration value is not found. 
    13341334   */ 
     
    13431343  } 
    13441344  /** 
    1345    * Retrieves an {@link ome.xml.r201004.enums.LaserMedium} enumeration 
    1346    * value for the given String. 
    1347    * 
    1348    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1345   * Retrieves an {@link ome.xml.model.enums.LaserMedium} enumeration 
     1346   * value for the given String. 
     1347   * 
     1348   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    13491349   *  enumeration value is not found. 
    13501350   */ 
     
    13591359  } 
    13601360  /** 
    1361    * Retrieves an {@link ome.xml.r201004.enums.LaserType} enumeration 
    1362    * value for the given String. 
    1363    * 
    1364    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1361   * Retrieves an {@link ome.xml.model.enums.LaserType} enumeration 
     1362   * value for the given String. 
     1363   * 
     1364   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    13651365   *  enumeration value is not found. 
    13661366   */ 
     
    13751375  } 
    13761376  /** 
    1377    * Retrieves an {@link ome.xml.r201004.enums.LineCap} enumeration 
    1378    * value for the given String. 
    1379    * 
    1380    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1377   * Retrieves an {@link ome.xml.model.enums.LineCap} enumeration 
     1378   * value for the given String. 
     1379   * 
     1380   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    13811381   *  enumeration value is not found. 
    13821382   */ 
     
    13911391  } 
    13921392  /** 
    1393    * Retrieves an {@link ome.xml.r201004.enums.Marker} enumeration 
    1394    * value for the given String. 
    1395    * 
    1396    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1393   * Retrieves an {@link ome.xml.model.enums.Marker} enumeration 
     1394   * value for the given String. 
     1395   * 
     1396   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    13971397   *  enumeration value is not found. 
    13981398   */ 
     
    14071407  } 
    14081408  /** 
    1409    * Retrieves an {@link ome.xml.r201004.enums.Medium} enumeration 
    1410    * value for the given String. 
    1411    * 
    1412    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1409   * Retrieves an {@link ome.xml.model.enums.Medium} enumeration 
     1410   * value for the given String. 
     1411   * 
     1412   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    14131413   *  enumeration value is not found. 
    14141414   */ 
     
    14231423  } 
    14241424  /** 
    1425    * Retrieves an {@link ome.xml.r201004.enums.MicrobeamManipulationType} 
     1425   * Retrieves an {@link ome.xml.model.enums.MicrobeamManipulationType} 
    14261426   * enumeration value for the given String. 
    14271427   * 
    1428    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1428   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    14291429   *  enumeration value is not found. 
    14301430   */ 
     
    14421442  } 
    14431443  /** 
    1444    * Retrieves an {@link ome.xml.r201004.enums.MicroscopeType} enumeration 
    1445    * value for the given String. 
    1446    * 
    1447    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1444   * Retrieves an {@link ome.xml.model.enums.MicroscopeType} enumeration 
     1445   * value for the given String. 
     1446   * 
     1447   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    14481448   *  enumeration value is not found. 
    14491449   */ 
     
    14601460  } 
    14611461  /** 
    1462    * Retrieves an {@link ome.xml.r201004.enums.NamingConvention} enumeration 
    1463    * value for the given String. 
    1464    * 
    1465    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1462   * Retrieves an {@link ome.xml.model.enums.NamingConvention} enumeration 
     1463   * value for the given String. 
     1464   * 
     1465   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    14661466   *  enumeration value is not found. 
    14671467   */ 
     
    14781478  } 
    14791479  /** 
    1480    * Retrieves an {@link ome.xml.r201004.enums.PixelType} enumeration 
    1481    * value for the given String. 
    1482    * 
    1483    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1480   * Retrieves an {@link ome.xml.model.enums.PixelType} enumeration 
     1481   * value for the given String. 
     1482   * 
     1483   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    14841484   *  enumeration value is not found. 
    14851485   */ 
     
    14941494  } 
    14951495  /** 
    1496    * Retrieves an {@link ome.xml.r201004.enums.Pulse} enumeration 
    1497    * value for the given String. 
    1498    * 
    1499    * @throws ome.xml.r201004.enums.EnumerationException if an appropriate 
     1496   * Retrieves an {@link ome.xml.model.enums.Pulse} enumeration 
     1497   * value for the given String. 
     1498   * 
     1499   * @throws ome.xml.model.enums.EnumerationException if an appropriate 
    15001500   *  enumeration value is not found. 
    15011501   */ 
  • branches/4.2/components/bio-formats/src/loci/formats/MetadataTools.java

    r6233 r6457  
    3838import loci.formats.services.OMEXMLService; 
    3939 
    40 import ome.xml.r201004.enums.DimensionOrder; 
    41 import ome.xml.r201004.enums.EnumerationException; 
    42 import ome.xml.r201004.enums.PixelType; 
    43 import ome.xml.r201004.primitives.PositiveInteger; 
     40import ome.xml.model.enums.DimensionOrder; 
     41import ome.xml.model.enums.EnumerationException; 
     42import ome.xml.model.enums.PixelType; 
     43import ome.xml.model.primitives.PositiveInteger; 
    4444 
    4545import org.slf4j.Logger; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/BDReader.java

    r6430 r6457  
    4747import loci.formats.tiff.TiffParser; 
    4848 
    49 import ome.xml.r201004.primitives.NonNegativeInteger; 
    50 import ome.xml.r201004.primitives.PositiveInteger; 
     49import ome.xml.model.primitives.NonNegativeInteger; 
     50import ome.xml.model.primitives.PositiveInteger; 
    5151 
    5252/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/DeltavisionReader.java

    r6370 r6457  
    3838import loci.formats.meta.MetadataStore; 
    3939 
    40 import ome.xml.r201004.primitives.PositiveInteger; 
     40import ome.xml.model.primitives.PositiveInteger; 
    4141 
    4242/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/FV1000Reader.java

    r6426 r6457  
    5353import loci.formats.tiff.TiffParser; 
    5454 
    55 import ome.xml.r201004.primitives.PositiveInteger; 
     55import ome.xml.model.primitives.PositiveInteger; 
    5656 
    5757/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/FlexReader.java

    r6370 r6457  
    4747import loci.formats.tiff.TiffParser; 
    4848 
    49 import ome.xml.r201004.primitives.NonNegativeInteger; 
    50 import ome.xml.r201004.primitives.PositiveInteger; 
     49import ome.xml.model.primitives.NonNegativeInteger; 
     50import ome.xml.model.primitives.PositiveInteger; 
    5151 
    5252import org.xml.sax.Attributes; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/ICSReader.java

    r6430 r6457  
    4141import loci.formats.meta.MetadataStore; 
    4242 
    43 import ome.xml.r201004.primitives.PositiveInteger; 
     43import ome.xml.model.primitives.PositiveInteger; 
    4444 
    4545/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/ImarisTiffReader.java

    r6230 r6457  
    3535import loci.formats.tiff.IFDList; 
    3636 
    37 import ome.xml.r201004.primitives.PositiveInteger; 
     37import ome.xml.model.primitives.PositiveInteger; 
    3838 
    3939/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/InCellReader.java

    r6376 r6457  
    3838import loci.formats.meta.MetadataStore; 
    3939 
    40 import ome.xml.r201004.primitives.NonNegativeInteger; 
    41 import ome.xml.r201004.primitives.PositiveInteger; 
     40import ome.xml.model.primitives.NonNegativeInteger; 
     41import ome.xml.model.primitives.PositiveInteger; 
    4242 
    4343import org.xml.sax.Attributes; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/L2DReader.java

    r6376 r6457  
    3838import loci.formats.meta.MetadataStore; 
    3939 
    40 import ome.xml.r201004.primitives.PositiveInteger; 
     40import ome.xml.model.primitives.PositiveInteger; 
    4141 
    4242/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/LeicaHandler.java

    r6388 r6457  
    3636import loci.formats.meta.MetadataStore; 
    3737 
    38 import ome.xml.r201004.enums.Correction; 
    39 import ome.xml.r201004.enums.DetectorType; 
    40 import ome.xml.r201004.enums.EnumerationException; 
    41 import ome.xml.r201004.enums.Immersion; 
    42 import ome.xml.r201004.enums.LaserMedium; 
    43 import ome.xml.r201004.enums.LaserType; 
    44 import ome.xml.r201004.enums.MicroscopeType; 
    45 import ome.xml.r201004.enums.handlers.CorrectionEnumHandler; 
    46 import ome.xml.r201004.enums.handlers.DetectorTypeEnumHandler; 
    47 import ome.xml.r201004.enums.handlers.ImmersionEnumHandler; 
    48 import ome.xml.r201004.enums.handlers.LaserMediumEnumHandler; 
    49 import ome.xml.r201004.enums.handlers.LaserTypeEnumHandler; 
    50 import ome.xml.r201004.enums.handlers.MicroscopeTypeEnumHandler; 
    51 import ome.xml.r201004.primitives.PercentFraction; 
    52 import ome.xml.r201004.primitives.PositiveInteger; 
     38import ome.xml.model.enums.Correction; 
     39import ome.xml.model.enums.DetectorType; 
     40import ome.xml.model.enums.EnumerationException; 
     41import ome.xml.model.enums.Immersion; 
     42import ome.xml.model.enums.LaserMedium; 
     43import ome.xml.model.enums.LaserType; 
     44import ome.xml.model.enums.MicroscopeType; 
     45import ome.xml.model.enums.handlers.CorrectionEnumHandler; 
     46import ome.xml.model.enums.handlers.DetectorTypeEnumHandler; 
     47import ome.xml.model.enums.handlers.ImmersionEnumHandler; 
     48import ome.xml.model.enums.handlers.LaserMediumEnumHandler; 
     49import ome.xml.model.enums.handlers.LaserTypeEnumHandler; 
     50import ome.xml.model.enums.handlers.MicroscopeTypeEnumHandler; 
     51import ome.xml.model.primitives.PercentFraction; 
     52import ome.xml.model.primitives.PositiveInteger; 
    5353 
    5454import org.xml.sax.Attributes; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/LeicaReader.java

    r6416 r6457  
    4848import loci.formats.tiff.TiffParser; 
    4949 
    50 import ome.xml.r201004.primitives.PositiveInteger; 
     50import ome.xml.model.primitives.PositiveInteger; 
    5151 
    5252import org.slf4j.Logger; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/MIASReader.java

    r6376 r6457  
    4949import loci.formats.tiff.TiffParser; 
    5050 
    51 import ome.xml.r201004.primitives.NonNegativeInteger; 
     51import ome.xml.model.primitives.NonNegativeInteger; 
    5252 
    5353/** 
     
    681681 
    682682      String imageID = MetadataTools.createLSID("Image", well); 
    683       store.setWellSampleImageRef(imageID, 0, well, 0); 
    684683      store.setWellSampleIndex(new NonNegativeInteger(well), 0, well, 0); 
    685684 
    686685      store.setImageID(imageID, well); 
    687686      store.setImageName("Well " + wellRow + wellCol, well); 
     687      store.setWellSampleImageRef(imageID, 0, well, 0); 
    688688 
    689689      MetadataTools.setDefaultCreationDate(store, id, well); 
  • branches/4.2/components/bio-formats/src/loci/formats/in/MetamorphReader.java

    r6430 r6457  
    4848import loci.formats.tiff.TiffRational; 
    4949 
    50 import ome.xml.r201004.primitives.PositiveInteger; 
     50import ome.xml.model.primitives.PositiveInteger; 
    5151 
    5252/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/NativeND2Reader.java

    r6409 r6457  
    4545import loci.formats.meta.MetadataStore; 
    4646 
    47 import ome.xml.r201004.primitives.PositiveInteger; 
     47import ome.xml.model.primitives.PositiveInteger; 
    4848 
    4949import org.xml.sax.Attributes; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/NikonReader.java

    r6221 r6457  
    242242    } 
    243243 
    244     return ImageTools.interpolate(pix, buf, colorMap, getSizeX(), getSizeY(), 
     244    if (x == 0 && y == 0 && getSizeX() == w && getSizeY() == h) { 
     245      return ImageTools.interpolate(pix, buf, colorMap, getSizeX(), getSizeY(), 
     246        isLittleEndian()); 
     247    } 
     248 
     249    byte[] b = new byte[FormatTools.getPlaneSize(this)]; 
     250    ImageTools.interpolate(pix, b, colorMap, getSizeX(), getSizeY(), 
    245251      isLittleEndian()); 
     252    int bpp = FormatTools.getBytesPerPixel(getPixelType()) * 3; 
     253    int rowLen = w * bpp; 
     254    int width = getSizeX() * bpp; 
     255    for (int row=0; row<h; row++) { 
     256      System.arraycopy( 
     257        b, (row + y) * width + x * bpp, buf, row * rowLen, rowLen); 
     258    } 
     259 
     260    return buf; 
    246261  } 
    247262 
  • branches/4.2/components/bio-formats/src/loci/formats/in/NikonTiffReader.java

    r6376 r6457  
    3535import loci.formats.tiff.TiffParser; 
    3636 
    37 import ome.xml.r201004.primitives.PositiveInteger; 
     37import ome.xml.model.primitives.PositiveInteger; 
    3838 
    3939/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/PerkinElmerReader.java

    r6409 r6457  
    4141import loci.formats.meta.MetadataStore; 
    4242 
    43 import ome.xml.r201004.primitives.PositiveInteger; 
     43import ome.xml.model.primitives.PositiveInteger; 
    4444 
    4545/** 
  • branches/4.2/components/bio-formats/src/loci/formats/in/ScanrReader.java

    r6376 r6457  
    4141import loci.formats.tiff.TiffParser; 
    4242 
    43 import ome.xml.r201004.primitives.NonNegativeInteger; 
     43import ome.xml.model.primitives.NonNegativeInteger; 
    4444 
    4545import org.xml.sax.Attributes; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java

    r6376 r6457  
    5151import loci.formats.services.POIService; 
    5252 
    53 import ome.xml.r201004.primitives.PositiveInteger; 
     53import ome.xml.model.primitives.PositiveInteger; 
    5454 
    5555/** 
  • branches/4.2/components/bio-formats/src/loci/formats/meta/AggregateMetadata.java

    r6415 r6457  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by melissa via MetadataAutogen on May 10, 2010 9:27:03 PM CDT 
     27 * Created by melissa via MetadataAutogen on Jun 3, 2010 10:53:27 AM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    3535import java.util.List; 
    3636 
    37 import loci.common.DataTools; 
    38  
    39 import ome.xml.r201004.enums.*; 
    40 import ome.xml.r201004.primitives.*; 
     37import ome.xml.model.enums.*; 
     38import ome.xml.model.primitives.*; 
    4139 
    4240/** 
     
    554552  } 
    555553 
     554  /* @see MetadataRetrieve#getPixelsBinDataCount(int) */ 
     555  public int getPixelsBinDataCount(int imageIndex) { 
     556    for (Iterator iter = delegates.iterator(); iter.hasNext();) { 
     557      Object o = iter.next(); 
     558      if (o instanceof MetadataRetrieve) { 
     559        MetadataRetrieve retrieve = (MetadataRetrieve) o; 
     560        int result = retrieve.getPixelsBinDataCount(imageIndex); 
     561        if (result >= 0) return result; 
     562      } 
     563    } 
     564    return -1; 
     565  } 
     566 
    556567  /* @see MetadataRetrieve#getPlaneCount(int) */ 
    557568  public int getPlaneCount(int imageIndex) { 
     
    64306441  // - UUID property retrieval - 
    64316442 
    6432   public String getUUIDValue(int imageIndex, int tiffDataIndex) { 
    6433     for (Iterator iter = delegates.iterator(); iter.hasNext();) { 
    6434       Object o = iter.next(); 
    6435       if (o instanceof MetadataRetrieve) { 
    6436         MetadataRetrieve retrieve = (MetadataRetrieve) o; 
    6437         String result = retrieve.getUUIDValue(imageIndex, tiffDataIndex); 
    6438         if (result != null) return result; 
    6439       } 
    6440     } 
    6441     return null; 
    6442   } 
    6443  
    64446443  /* @see MetadataRetrieve#getUUIDFileName(int, int) */ 
    64456444  public String getUUIDFileName(int imageIndex, int tiffDataIndex) { 
     
    64496448        MetadataRetrieve retrieve = (MetadataRetrieve) o; 
    64506449        String result = retrieve.getUUIDFileName(imageIndex, tiffDataIndex); 
     6450        if (result != null) return result; 
     6451      } 
     6452    } 
     6453    return null; 
     6454  } 
     6455 
     6456  /* @see MetadataRetrieve#getUUIDValue(int, int) */ 
     6457  public String getUUIDValue(int imageIndex, int tiffDataIndex) { 
     6458    for (Iterator iter = delegates.iterator(); iter.hasNext();) { 
     6459      Object o = iter.next(); 
     6460      if (o instanceof MetadataRetrieve) { 
     6461        MetadataRetrieve retrieve = (MetadataRetrieve) o; 
     6462        String result = retrieve.getUUIDValue(imageIndex, tiffDataIndex); 
    64516463        if (result != null) return result; 
    64526464      } 
     
    1143911451 
    1144011452  // - UUID property storage - 
    11441    
    11442   public void setUUIDValue(String value, int imageIndex, int tiffDataIndex) { 
    11443     for (Iterator iter = delegates.iterator(); iter.hasNext();) { 
    11444       Object o = iter.next(); 
    11445       if (o instanceof MetadataStore) { 
    11446         MetadataStore store = (MetadataStore) o; 
    11447         store.setUUIDValue(value, imageIndex, tiffDataIndex); 
    11448       } 
    11449     } 
    11450   } 
    1145111453 
    1145211454  /* @see MetadataStore#setUUIDFileName(String, int, int) */ 
     
    1146111463  } 
    1146211464 
     11465  /* @see MetadataStore#setUUIDValue(String, int, int) */ 
     11466  public void setUUIDValue(String value, int imageIndex, int tiffDataIndex) { 
     11467    for (Iterator iter = delegates.iterator(); iter.hasNext();) { 
     11468      Object o = iter.next(); 
     11469      if (o instanceof MetadataStore) { 
     11470        MetadataStore store = (MetadataStore) o; 
     11471        store.setUUIDValue(value, imageIndex, tiffDataIndex); 
     11472      } 
     11473    } 
     11474  } 
     11475 
    1146311476  // - Well property storage - 
    1146411477 
  • branches/4.2/components/bio-formats/src/loci/formats/meta/DummyMetadata.java

    r6415 r6457  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by melissa via MetadataAutogen on May 10, 2010 9:27:03 PM CDT 
     27 * Created by melissa via MetadataAutogen on Jun 3, 2010 10:53:27 AM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    3232package loci.formats.meta; 
    3333 
    34 import ome.xml.r201004.Image; 
    35 import ome.xml.r201004.OME; 
    36 import ome.xml.r201004.Pixels; 
    37 import ome.xml.r201004.TiffData; 
    38 import ome.xml.r201004.UUID; 
    39 import ome.xml.r201004.enums.*; 
    40 import ome.xml.r201004.primitives.*; 
     34import ome.xml.model.enums.*; 
     35import ome.xml.model.primitives.*; 
    4136 
    4237/** 
     
    233228  } 
    234229 
     230  /* @see MetadataRetrieve#getPixelsBinDataCount(int) */ 
     231  public int getPixelsBinDataCount(int imageIndex) { 
     232    return -1; 
     233  } 
     234 
    235235  /* @see MetadataRetrieve#getPlaneCount(int) */ 
    236236  public int getPlaneCount(int imageIndex) { 
     
    22532253  // - UUID property retrieval - 
    22542254 
    2255   public String getUUIDValue(int imageIndex, int tiffDataIndex) { 
    2256     return null; 
    2257   } 
    2258  
    22592255  /* @see MetadataRetrieve#getUUIDFileName(int, int) */ 
    22602256  public String getUUIDFileName(int imageIndex, int tiffDataIndex) { 
    22612257    return null; 
    22622258  } 
     2259  /* @see MetadataRetrieve#getUUIDValue(int, int) */ 
     2260  public String getUUIDValue(int imageIndex, int tiffDataIndex) { 
     2261    return null; 
     2262  } 
    22632263 
    22642264  // - Well property retrieval - 
     
    41774177  // - UUID property storage - 
    41784178 
    4179   public void setUUIDValue(String value, int imageIndex, int tiffDataIndex) { 
    4180   } 
    4181  
    41824179  /* @see MetadataStore#setUUIDFileName(String, int, int) */ 
    41834180  public void setUUIDFileName(String fileName, int imageIndex, int tiffDataIndex) { 
    41844181  } 
    41854182 
     4183  /* @see MetadataStore#setUUIDValue(String, int, int) */ 
     4184  public void setUUIDValue(String value, int imageIndex, int tiffDataIndex) { 
     4185  } 
     4186 
    41864187  // - Well property storage - 
    41874188 
  • branches/4.2/components/bio-formats/src/loci/formats/meta/FilterMetadata.java

    r6415 r6457  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by melissa via MetadataAutogen on May 10, 2010 9:27:03 PM CDT 
     27 * Created by melissa via MetadataAutogen on Jun 3, 2010 10:53:27 AM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    3434import loci.common.DataTools; 
    3535 
    36 import ome.xml.r201004.Image; 
    37 import ome.xml.r201004.OME; 
    38 import ome.xml.r201004.Pixels; 
    39 import ome.xml.r201004.TiffData; 
    40 import ome.xml.r201004.UUID; 
    41 import ome.xml.r201004.enums.*; 
    42 import ome.xml.r201004.primitives.*; 
     36import ome.xml.model.enums.*; 
     37import ome.xml.model.primitives.*; 
    4338 
    4439/** 
     
    25322527  // -- UUID property storage - 
    25332528 
    2534   public void setUUIDValue(String value, int imageIndex, int tiffDataIndex) 
    2535   { 
    2536     String filteredValue = filter ? DataTools.sanitize(value) : value; 
    2537     store.setUUIDValue(filteredValue, imageIndex, tiffDataIndex); 
    2538   } 
    2539  
    25402529  /* @see MetadataStore#setUUIDFileName(String, int, int) */ 
    25412530  public void setUUIDFileName(String fileName, int imageIndex, int tiffDataIndex) { 
     
    25442533  } 
    25452534 
     2535  /* @see MetadataStore#setUUIDValue(String, int, int) */ 
     2536  public void setUUIDValue(String value, int imageIndex, int tiffDataIndex) { 
     2537    String filteredValue = filter ? DataTools.sanitize(value) : value; 
     2538    store.setUUIDValue(filteredValue, imageIndex, tiffDataIndex); 
     2539  } 
     2540 
    25462541  // -- Well property storage - 
    25472542 
  • branches/4.2/components/bio-formats/src/loci/formats/meta/MetadataConverter.java

    r6230 r6457  
    3232package loci.formats.meta; 
    3333 
    34 import ome.xml.r201004.enums.*; 
    35 import ome.xml.r201004.primitives.*; 
     34import ome.xml.model.enums.*; 
     35import ome.xml.model.primitives.*; 
    3636 
    3737/** 
  • branches/4.2/components/bio-formats/src/loci/formats/meta/MetadataRetrieve.java

    r6415 r6457  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-05-28 12:37:01.222862 
     35 * Created by melissa via xsd-fu on 2010-06-03 10:29:38.469040 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    4040package loci.formats.meta; 
    4141 
    42 import ome.xml.r201004.enums.*; 
    43 import ome.xml.r201004.primitives.*; 
     42import ome.xml.model.enums.*; 
     43import ome.xml.model.primitives.*; 
    4444 
    4545/** 
     
    7373public interface MetadataRetrieve { 
    7474 
    75         // -- Entity counting -- 
     75        // -- Entity counting (manual definitions) -- 
     76 
     77        int getPixelsBinDataCount(int imageIndex); 
     78 
     79        // -- Entity counting (code generated definitions) -- 
    7680 
    7781        // AnnotationRef entity counting 
     
    635639        // 
    636640        // EmissionFilterRef property storage 
    637         // 
    638         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    639         // Is multi path? True 
    640  
    641         // 
    642         // EmissionFilterRef property storage 
    643         // 
    644         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    645         // Is multi path? True 
    646  
    647         // 
    648         // ExcitationFilterRef property storage 
    649641        // 
    650642        // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
  • branches/4.2/components/bio-formats/src/loci/formats/meta/MetadataStore.java

    r6415 r6457  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-05-28 12:36:56.007582 
     35 * Created by melissa via xsd-fu on 2010-06-03 10:29:37.250861 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    4040package loci.formats.meta; 
    4141 
    42 import ome.xml.r201004.enums.*; 
    43 import ome.xml.r201004.primitives.*; 
     42import ome.xml.model.enums.*; 
     43import ome.xml.model.primitives.*; 
    4444 
    4545/** 
     
    447447 
    448448        // 
    449         // EmissionFilterRef property storage 
    450         // 
    451         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    452         // Is multi path? True 
    453  
    454         // 
    455         // ExcitationFilterRef property storage 
    456         // 
    457         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    458         // Is multi path? True 
    459  
    460         // 
    461449        // ExcitationFilterRef property storage 
    462450        // 
  • branches/4.2/components/bio-formats/src/loci/formats/ome/AbstractOMEXMLMetadata.java

    r6233 r6457  
    3333 
    3434import ome.xml.DOMUtil; 
    35 import ome.xml.r201004.OME; 
    36 import ome.xml.r201004.OMEModelObject; 
     35import ome.xml.model.OME; 
     36import ome.xml.model.OMEModelObject; 
    3737 
    3838import org.w3c.dom.Document; 
  • branches/4.2/components/bio-formats/src/loci/formats/ome/OMEXMLMetadataImpl.java

    r6430 r6457  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by melissa via xsd-fu on 2010-06-01 11:06:50.718672 
     35 * Created by melissa via xsd-fu on 2010-06-03 10:29:39.713258 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    4040package loci.formats.ome; 
    4141 
    42 import ome.xml.r201004.*; 
    43 import ome.xml.r201004.enums.*; 
    44 import ome.xml.r201004.primitives.*; 
     42import ome.xml.model.*; 
     43import ome.xml.model.enums.*; 
     44import ome.xml.model.primitives.*; 
    4545 
    4646/** 
     
    9797        } 
    9898 
    99         // -- Entity counting -- 
     99        // -- Entity counting (manual definitions) -- 
     100 
     101        public int getPixelsBinDataCount(int imageIndex) 
     102        { 
     103                return root.getImage(imageIndex).getPixels().sizeOfBinDataList(); 
     104        } 
     105 
     106        // -- Entity counting (code generated definitions) -- 
    100107 
    101108        // AnnotationRef entity counting 
  • branches/4.2/components/bio-formats/src/loci/formats/services/OMEXMLServiceImpl.java

    r6272 r6457  
    4242import loci.formats.ome.OMEXMLMetadataImpl; 
    4343import ome.xml.OMEXMLFactory; 
    44 import ome.xml.r201004.OME; 
    45 import ome.xml.r201004.OMEModel; 
    46 import ome.xml.r201004.OMEModelImpl; 
    47 import ome.xml.r201004.OMEModelObject; 
    48 import ome.xml.r201004.StructuredAnnotations; 
     44import ome.xml.model.OME; 
     45import ome.xml.model.OMEModel; 
     46import ome.xml.model.OMEModelImpl; 
     47import ome.xml.model.OMEModelObject; 
     48import ome.xml.model.StructuredAnnotations; 
    4949 
    5050import org.slf4j.Logger; 
     
    100100   */ 
    101101  public OMEXMLServiceImpl() { 
    102     checkClassDependency(ome.xml.r201004.OMEModelObject.class); 
     102    checkClassDependency(ome.xml.model.OMEModelObject.class); 
    103103  } 
    104104 
     
    202202   * classes should not leak out of the interface. 
    203203   * @param xml String of XML to create the root node from. 
    204    * @return An ome.xml.r201004.OMEModelObject subclass root node. 
     204   * @return An ome.xml.model.OMEModelObject subclass root node. 
    205205   * @throws IOException If there is an error reading from the string. 
    206206   * @throws SAXException If there is an error parsing the XML. 
  • branches/4.2/components/bio-formats/src/loci/formats/tiff/TiffParser.java

    r6430 r6457  
    762762 
    763763    long imageWidth = ifd.getImageWidth(); 
     764    long imageHeight = ifd.getImageLength(); 
    764765 
    765766    int bps0 = bitsPerSample[0]; 
     
    794795 
    795796    int skipBits = (int) (8 - ((imageWidth * bps0 * nChannels) % 8)); 
    796     if (skipBits == 8) skipBits = 0; 
     797 
     798    if (skipBits == 8 || 
     799      (bytes.length * 8 < bps0 * (nChannels * imageWidth + imageHeight))) 
     800    { 
     801      skipBits = 0; 
     802    } 
    797803 
    798804    // set up YCbCr-specific values 
     
    824830      for (int channel=0; channel<nChannels; channel++) { 
    825831        int index = numBytes * (sample * nChannels + channel); 
    826         int outputIndex = channel * nSamples + ndx * numBytes; 
     832        int outputIndex = (channel * nSamples + ndx) * numBytes; 
    827833 
    828834        // unpack non-YCbCr samples 
     
    838844            { 
    839845              value = bb.getBits(bps0) & 0xffff; 
    840               //if (littleEndian && bps0 > 8) { 
    841               //  value = DataTools.swap(value) >> (32 - bps0); 
    842               //} 
    843               if ((ndx % imageWidth) == imageWidth - 1/* && bps0 < 8*/) { 
     846              if ((ndx % imageWidth) == imageWidth - 1) { 
    844847                bb.skipBits(skipBits); 
    845848              } 
  • branches/4.2/components/bio-formats/test/loci/formats/utests/IMetadataBasedOMEModelMock.java

    r6415 r6457  
    3636 
    3737import loci.formats.ome.OMEXMLMetadataImpl; 
    38 import ome.xml.r201004.Arc; 
    39 import ome.xml.r201004.BinaryFile; 
    40 import ome.xml.r201004.BooleanAnnotation; 
    41 import ome.xml.r201004.Channel; 
    42 import ome.xml.r201004.Detector; 
    43 import ome.xml.r201004.Dichroic; 
    44 import ome.xml.r201004.DoubleAnnotation; 
    45 import ome.xml.r201004.External; 
    46 import ome.xml.r201004.Filament; 
    47 import ome.xml.r201004.Filter; 
    48 import ome.xml.r201004.FilterSet; 
    49 import ome.xml.r201004.Image; 
    50 import ome.xml.r201004.Instrument; 
    51 import ome.xml.r201004.Laser; 
    52 import ome.xml.r201004.LightEmittingDiode; 
    53 import ome.xml.r201004.LongAnnotation; 
    54 import ome.xml.r201004.MetadataOnly; 
    55 import ome.xml.r201004.OME; 
    56 import ome.xml.r201004.OMEModel; 
    57 import ome.xml.r201004.OTF; 
    58 import ome.xml.r201004.Objective; 
    59 import ome.xml.r201004.ObjectiveSettings; 
    60 import ome.xml.r201004.Pixels; 
    61 import ome.xml.r201004.Plate; 
    62 import ome.xml.r201004.ROI; 
    63 import ome.xml.r201004.Rectangle; 
    64 import ome.xml.r201004.StringAnnotation; 
    65 import ome.xml.r201004.StructuredAnnotations; 
    66 import ome.xml.r201004.TimestampAnnotation; 
    67 import ome.xml.r201004.Union; 
    68 import ome.xml.r201004.Well; 
    69 import ome.xml.r201004.WellSample; 
    70 import ome.xml.r201004.XMLAnnotation; 
    71 import ome.xml.r201004.primitives.NonNegativeInteger; 
    72 import ome.xml.r201004.primitives.PositiveInteger; 
     38import ome.xml.model.Arc; 
     39import ome.xml.model.BinaryFile; 
     40import ome.xml.model.BooleanAnnotation; 
     41import ome.xml.model.Channel; 
     42import ome.xml.model.Detector; 
     43import ome.xml.model.Dichroic; 
     44import ome.xml.model.DoubleAnnotation; 
     45import ome.xml.model.External; 
     46import ome.xml.model.Filament; 
     47import ome.xml.model.Filter; 
     48import ome.xml.model.FilterSet; 
     49import ome.xml.model.Image; 
     50import ome.xml.model.Instrument; 
     51import ome.xml.model.Laser; 
     52import ome.xml.model.LightEmittingDiode; 
     53import ome.xml.model.LongAnnotation; 
     54import ome.xml.model.MetadataOnly; 
     55import ome.xml.model.OME; 
     56import ome.xml.model.OMEModel; 
     57import ome.xml.model.OTF; 
     58import ome.xml.model.Objective; 
     59import ome.xml.model.ObjectiveSettings; 
     60import ome.xml.model.Pixels; 
     61import ome.xml.model.Plate; 
     62import ome.xml.model.ROI; 
     63import ome.xml.model.Rectangle; 
     64import ome.xml.model.StringAnnotation; 
     65import ome.xml.model.StructuredAnnotations; 
     66import ome.xml.model.TimestampAnnotation; 
     67import ome.xml.model.Union; 
     68import ome.xml.model.Well; 
     69import ome.xml.model.WellSample; 
     70import ome.xml.model.XMLAnnotation; 
     71import ome.xml.model.primitives.NonNegativeInteger; 
     72import ome.xml.model.primitives.PositiveInteger; 
    7373 
    7474/** 
  • branches/4.2/components/bio-formats/test/loci/formats/utests/InOut201004Test.java

    r6415 r6457  
    6060import static org.testng.AssertJUnit.*; 
    6161 
    62 import ome.xml.r201004.Annotation; 
    63 import ome.xml.r201004.Arc; 
    64 import ome.xml.r201004.BinaryFile; 
    65 import ome.xml.r201004.BooleanAnnotation; 
    66 import ome.xml.r201004.DoubleAnnotation; 
    67 import ome.xml.r201004.External; 
    68 import ome.xml.r201004.Filament; 
    69 import ome.xml.r201004.LightEmittingDiode; 
    70 import ome.xml.r201004.LongAnnotation; 
    71 import ome.xml.r201004.OMEModel; 
    72 import ome.xml.r201004.OMEModelImpl; 
    73 import ome.xml.r201004.OMEModelObject; 
    74 import ome.xml.r201004.Objective; 
    75 import ome.xml.r201004.ObjectiveSettings; 
    76 import ome.xml.r201004.Reference; 
    77 import ome.xml.r201004.StringAnnotation; 
    78 import ome.xml.r201004.StructuredAnnotations; 
    79 import ome.xml.r201004.TiffData; 
    80 import ome.xml.r201004.TimestampAnnotation; 
    81 import ome.xml.r201004.UUID; 
    82 import ome.xml.r201004.XMLAnnotation; 
    83 import ome.xml.r201004.Channel; 
    84 import ome.xml.r201004.Dichroic; 
    85 import ome.xml.r201004.Detector; 
    86 import ome.xml.r201004.Filter; 
    87 import ome.xml.r201004.FilterSet; 
    88 import ome.xml.r201004.Image; 
    89 import ome.xml.r201004.Instrument; 
    90 import ome.xml.r201004.Laser; 
    91 import ome.xml.r201004.MetadataOnly; 
    92 import ome.xml.r201004.OME; 
    93 import ome.xml.r201004.OTF; 
    94 import ome.xml.r201004.Pixels; 
    95 import ome.xml.r201004.Plate; 
    96 import ome.xml.r201004.Rectangle; 
    97 import ome.xml.r201004.ROI; 
    98 import ome.xml.r201004.Shape; 
    99 import ome.xml.r201004.Union; 
    100 import ome.xml.r201004.Well; 
    101 import ome.xml.r201004.WellSample; 
    102 import ome.xml.r201004.enums.ArcType; 
    103 import ome.xml.r201004.enums.DimensionOrder; 
    104 import ome.xml.r201004.enums.EnumerationException; 
    105 import ome.xml.r201004.enums.FilamentType; 
    106 import ome.xml.r201004.enums.FilterType; 
    107 import ome.xml.r201004.enums.LaserType; 
    108 import ome.xml.r201004.enums.NamingConvention; 
    109 import ome.xml.r201004.enums.PixelType; 
    110 import ome.xml.r201004.primitives.NonNegativeInteger; 
    111 import ome.xml.r201004.primitives.PositiveInteger; 
     62import ome.xml.model.Annotation; 
     63import ome.xml.model.Arc; 
     64import ome.xml.model.BinaryFile; 
     65import ome.xml.model.BooleanAnnotation; 
     66import ome.xml.model.DoubleAnnotation; 
     67import ome.xml.model.External; 
     68import ome.xml.model.Filament; 
     69import ome.xml.model.LightEmittingDiode; 
     70import ome.xml.model.LongAnnotation; 
     71import ome.xml.model.OMEModel; 
     72import ome.xml.model.OMEModelImpl; 
     73import ome.xml.model.OMEModelObject; 
     74import ome.xml.model.Objective; 
     75import ome.xml.model.ObjectiveSettings; 
     76import ome.xml.model.Reference; 
     77import ome.xml.model.StringAnnotation; 
     78import ome.xml.model.StructuredAnnotations; 
     79import ome.xml.model.TiffData; 
     80import ome.xml.model.TimestampAnnotation; 
     81import ome.xml.model.UUID; 
     82import ome.xml.model.XMLAnnotation; 
     83import ome.xml.model.Channel; 
     84import ome.xml.model.Dichroic; 
     85import ome.xml.model.Detector; 
     86import ome.xml.model.Filter; 
     87import ome.xml.model.FilterSet; 
     88import ome.xml.model.Image; 
     89import ome.xml.model.Instrument; 
     90import ome.xml.model.Laser; 
     91import ome.xml.model.MetadataOnly; 
     92import ome.xml.model.OME; 
     93import ome.xml.model.OTF; 
     94import ome.xml.model.Pixels; 
     95import ome.xml.model.Plate; 
     96import ome.xml.model.Rectangle; 
     97import ome.xml.model.ROI; 
     98import ome.xml.model.Shape; 
     99import ome.xml.model.Union; 
     100import ome.xml.model.Well; 
     101import ome.xml.model.WellSample; 
     102import ome.xml.model.enums.ArcType; 
     103import ome.xml.model.enums.DimensionOrder; 
     104import ome.xml.model.enums.EnumerationException; 
     105import ome.xml.model.enums.FilamentType; 
     106import ome.xml.model.enums.FilterType; 
     107import ome.xml.model.enums.LaserType; 
     108import ome.xml.model.enums.NamingConvention; 
     109import ome.xml.model.enums.PixelType; 
     110import ome.xml.model.primitives.NonNegativeInteger; 
     111import ome.xml.model.primitives.PositiveInteger; 
    112112 
    113113import org.testng.annotations.BeforeClass; 
  • branches/4.2/components/bio-formats/test/loci/formats/utests/OMEModelMock.java

    r6415 r6457  
    3535package loci.formats.utests; 
    3636 
    37 import ome.xml.r201004.OME; 
     37import ome.xml.model.OME; 
    3838 
    3939/** 
  • branches/4.2/components/bio-formats/test/loci/formats/utests/ObjectBasedOMEModelMock.java

    r6415 r6457  
    3535package loci.formats.utests; 
    3636 
    37 import ome.xml.r201004.Arc; 
    38 import ome.xml.r201004.BinaryFile; 
    39 import ome.xml.r201004.BooleanAnnotation; 
    40 import ome.xml.r201004.Channel; 
    41 import ome.xml.r201004.Detector; 
    42 import ome.xml.r201004.Dichroic; 
    43 import ome.xml.r201004.DoubleAnnotation; 
    44 import ome.xml.r201004.External; 
    45 import ome.xml.r201004.Filament; 
    46 import ome.xml.r201004.Filter; 
    47 import ome.xml.r201004.FilterSet; 
    48 import ome.xml.r201004.Image; 
    49 import ome.xml.r201004.Instrument; 
    50 import ome.xml.r201004.Laser; 
    51 import ome.xml.r201004.LightEmittingDiode; 
    52 import ome.xml.r201004.LongAnnotation; 
    53 import ome.xml.r201004.MetadataOnly; 
    54 import ome.xml.r201004.OME; 
    55 import ome.xml.r201004.OMEModel; 
    56 import ome.xml.r201004.OTF; 
    57 import ome.xml.r201004.Objective; 
    58 import ome.xml.r201004.ObjectiveSettings; 
    59 import ome.xml.r201004.Pixels; 
    60 import ome.xml.r201004.Plate; 
    61 import ome.xml.r201004.ROI; 
    62 import ome.xml.r201004.Rectangle; 
    63 import ome.xml.r201004.StringAnnotation; 
    64 import ome.xml.r201004.StructuredAnnotations; 
    65 import ome.xml.r201004.TiffData; 
    66 import ome.xml.r201004.TimestampAnnotation; 
    67 import ome.xml.r201004.UUID; 
    68 import ome.xml.r201004.Union; 
    69 import ome.xml.r201004.Well; 
    70 import ome.xml.r201004.WellSample; 
    71 import ome.xml.r201004.XMLAnnotation; 
    72 import ome.xml.r201004.primitives.NonNegativeInteger; 
    73 import ome.xml.r201004.primitives.PositiveInteger; 
     37import ome.xml.model.Arc; 
     38import ome.xml.model.BinaryFile; 
     39import ome.xml.model.BooleanAnnotation; 
     40import ome.xml.model.Channel; 
     41import ome.xml.model.Detector; 
     42import ome.xml.model.Dichroic; 
     43import ome.xml.model.DoubleAnnotation; 
     44import ome.xml.model.External; 
     45import ome.xml.model.Filament; 
     46import ome.xml.model.Filter; 
     47import ome.xml.model.FilterSet; 
     48import ome.xml.model.Image; 
     49import ome.xml.model.Instrument; 
     50import ome.xml.model.Laser; 
     51import ome.xml.model.LightEmittingDiode; 
     52import ome.xml.model.LongAnnotation; 
     53import ome.xml.model.MetadataOnly; 
     54import ome.xml.model.OME; 
     55import ome.xml.model.OMEModel; 
     56import ome.xml.model.OTF; 
     57import ome.xml.model.Objective; 
     58import ome.xml.model.ObjectiveSettings; 
     59import ome.xml.model.Pixels; 
     60import ome.xml.model.Plate; 
     61import ome.xml.model.ROI; 
     62import ome.xml.model.Rectangle; 
     63import ome.xml.model.StringAnnotation; 
     64import ome.xml.model.StructuredAnnotations; 
     65import ome.xml.model.TiffData; 
     66import ome.xml.model.TimestampAnnotation; 
     67import ome.xml.model.UUID; 
     68import ome.xml.model.Union; 
     69import ome.xml.model.Well; 
     70import ome.xml.model.WellSample; 
     71import ome.xml.model.XMLAnnotation; 
     72import ome.xml.model.primitives.NonNegativeInteger; 
     73import ome.xml.model.primitives.PositiveInteger; 
    7474 
    7575/** 
  • branches/4.2/components/bio-formats/test/loci/formats/utests/tiff/TiffParserTest.java

    r6128 r6457  
    177177  } 
    178178 
    179   @Test(expectedExceptions={ FormatException.class }) 
     179  @Test 
    180180  public void testBitsPerSampleMismatch() throws IOException, FormatException { 
    181181    mock = new BitsPerSampleSamplesPerPixelMismatchMock(); 
    182182    tiffParser = mock.getTiffParser(); 
    183183    assertTrue(tiffParser.checkHeader()); 
    184     tiffParser.getFirstIFD().getBitsPerSample(); 
     184    int[] samples = tiffParser.getFirstIFD().getBitsPerSample(); 
     185    assertEquals(samples.length, mock.getSamplesPerPixel()); 
    185186  } 
    186187 
  • branches/4.2/components/bio-formats/utils/MinimumWriter.java

    r6294 r6457  
    88import loci.formats.services.OMEXMLService; 
    99 
    10 import ome.xml.r201004.enums.DimensionOrder; 
    11 import ome.xml.r201004.enums.EnumerationException; 
    12 import ome.xml.r201004.enums.PixelType; 
    13 import ome.xml.r201004.primitives.PositiveInteger; 
     10import ome.xml.model.enums.DimensionOrder; 
     11import ome.xml.model.enums.EnumerationException; 
     12import ome.xml.model.enums.PixelType; 
     13import ome.xml.model.primitives.PositiveInteger; 
    1414 
    1515/** 
  • branches/4.2/components/bio-formats/utils/WriteRGBMovie.java

    r6294 r6457  
    88import loci.formats.services.OMEXMLService; 
    99 
    10 import ome.xml.r201004.enums.DimensionOrder; 
    11 import ome.xml.r201004.enums.EnumerationException; 
    12 import ome.xml.r201004.enums.PixelType; 
    13 import ome.xml.r201004.primitives.PositiveInteger; 
     10import ome.xml.model.enums.DimensionOrder; 
     11import ome.xml.model.enums.EnumerationException; 
     12import ome.xml.model.enums.PixelType; 
     13import ome.xml.model.primitives.PositiveInteger; 
    1414 
    1515/** 
  • branches/4.2/components/flow-cytometry/src/loci/apps/flow/FlowCytometry.java

    r6230 r6457  
    7575import loci.formats.services.OMEXMLService; 
    7676 
    77 import ome.xml.r201004.enums.*; 
    78 import ome.xml.r201004.primitives.*; 
     77import ome.xml.model.enums.*; 
     78import ome.xml.model.primitives.*; 
    7979 
    8080import visad.DataReferenceImpl; 
  • branches/4.2/components/legacy/ome-editor/src/loci/ome/editor/MetadataPane.java

    r6294 r6457  
    9191import ome.xml.DOMUtil; 
    9292import ome.xml.OMEXMLNode; 
    93 import ome.xml.r201004.enums.DimensionOrder; 
    94 import ome.xml.r201004.enums.EnumerationException; 
    95 import ome.xml.r201004.primitives.PositiveInteger; 
     93import ome.xml.model.enums.DimensionOrder; 
     94import ome.xml.model.enums.EnumerationException; 
     95import ome.xml.model.primitives.PositiveInteger; 
    9696 
    9797import org.openmicroscopy.xml.AttributeNode; 
  • branches/4.2/components/loci-plugins/src/loci/plugins/in/ImportProcess.java

    r6324 r6457  
    5757import loci.plugins.util.WindowTools; 
    5858 
    59 import ome.xml.r201004.enums.DimensionOrder; 
    60 import ome.xml.r201004.enums.EnumerationException; 
     59import ome.xml.model.enums.DimensionOrder; 
     60import ome.xml.model.enums.EnumerationException; 
    6161 
    6262import org.apache.log4j.Level; 
  • branches/4.2/components/loci-plugins/src/loci/plugins/out/Exporter.java

    r6341 r6457  
    6868import loci.plugins.util.WindowTools; 
    6969 
    70 import ome.xml.r201004.enums.DimensionOrder; 
    71 import ome.xml.r201004.enums.EnumerationException; 
    72 import ome.xml.r201004.enums.PixelType; 
    73 import ome.xml.r201004.primitives.PositiveInteger; 
     70import ome.xml.model.enums.DimensionOrder; 
     71import ome.xml.model.enums.EnumerationException; 
     72import ome.xml.model.enums.PixelType; 
     73import ome.xml.model.primitives.PositiveInteger; 
    7474 
    7575/** 
     
    285285        catch (EnumerationException e) { } 
    286286      } 
    287       if (store.getPixelsBinDataBigEndian(0, 0) == null) { 
     287      if (store.getPixelsBinDataCount(0) == 0 || 
     288        store.getPixelsBinDataBigEndian(0, 0) == null) 
     289      { 
    288290        store.setPixelsBinDataBigEndian(Boolean.FALSE, 0, 0); 
    289291      } 
  • branches/4.2/components/ome-plugins/src/loci/plugins/ome/LociUploader.java

    r6294 r6457  
    5151import loci.plugins.util.LibraryChecker; 
    5252 
    53 import ome.xml.r201004.enums.DimensionOrder; 
    54 import ome.xml.r201004.enums.EnumerationException; 
    55 import ome.xml.r201004.enums.PixelType; 
    56 import ome.xml.r201004.primitives.PositiveInteger; 
     53import ome.xml.model.enums.DimensionOrder; 
     54import ome.xml.model.enums.EnumerationException; 
     55import ome.xml.model.enums.PixelType; 
     56import ome.xml.model.primitives.PositiveInteger; 
    5757 
    5858/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/AbstractOMEModelObject.java

    r6195 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004; 
     24package ome.xml.model; 
    2525 
    2626import java.util.ArrayList; 
    2727import java.util.List; 
    2828 
    29 import ome.xml.r201004.enums.EnumerationException; 
     29import ome.xml.model.enums.EnumerationException; 
    3030 
    3131import org.w3c.dom.Document; 
     
    5353 
    5454  /* (non-Javadoc) 
    55    * @see ome.xml.r201004.OMEModelObject#update(org.w3c.dom.Element) 
     55   * @see ome.xml.model.OMEModelObject#update(org.w3c.dom.Element) 
    5656   */ 
    5757  public void update(Element element) throws EnumerationException { 
     
    6060 
    6161  /* (non-Javadoc) 
    62    * @see ome.xml.r201004.OMEModelObject#update(org.w3c.dom.Element, ome.xml.r201004.OMEModel) 
     62   * @see ome.xml.model.OMEModelObject#update(org.w3c.dom.Element, ome.xml.model.OMEModel) 
    6363   */ 
    6464  public void update(Element element, OMEModel model) 
     
    6868 
    6969  /* (non-Javadoc) 
    70    * @see ome.xml.r201004.OMEModelObject#asXMLElement(org.w3c.dom.Document) 
     70   * @see ome.xml.model.OMEModelObject#asXMLElement(org.w3c.dom.Document) 
    7171   */ 
    7272  public abstract Element asXMLElement(Document document); 
     
    8585 
    8686  /* (non-Javadoc) 
    87    * @see ome.xml.r201004.OMEModelObject#link(ome.xml.r201004.Reference, ome.xml.r201004.OMEModelObject) 
     87   * @see ome.xml.model.OMEModelObject#link(ome.xml.model.Reference, ome.xml.model.OMEModelObject) 
    8888   */ 
    8989  public abstract void link(Reference reference, OMEModelObject o); 
  • branches/4.2/components/ome-xml/src/ome/xml/model/OMEModel.java

    r6196 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004; 
     24package ome.xml.model; 
    2525 
    2626import java.util.List; 
  • branches/4.2/components/ome-xml/src/ome/xml/model/OMEModelObject.java

    r6178 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004; 
     24package ome.xml.model; 
    2525 
    26 import ome.xml.r201004.enums.EnumerationException; 
     26import ome.xml.model.enums.EnumerationException; 
    2727 
    2828import org.w3c.dom.Document; 
  • branches/4.2/components/ome-xml/src/ome/xml/model/enums/Enumeration.java

    r6137 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.enums; 
     24package ome.xml.model.enums; 
    2525 
    2626/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/enums/EnumerationException.java

    r6137 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.enums; 
     24package ome.xml.model.enums; 
    2525 
    2626/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/enums/handlers/IEnumerationHandler.java

    r6362 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.enums.handlers; 
     24package ome.xml.model.enums.handlers; 
    2525 
    26 import ome.xml.r201004.enums.Enumeration; 
    27 import ome.xml.r201004.enums.EnumerationException; 
     26import ome.xml.model.enums.Enumeration; 
     27import ome.xml.model.enums.EnumerationException; 
    2828 
    2929/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/primitives/NonNegativeInteger.java

    r6196 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.primitives; 
     24package ome.xml.model.primitives; 
    2525 
    2626/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/primitives/PercentFraction.java

    r6196 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.primitives; 
     24package ome.xml.model.primitives; 
    2525 
    2626/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/primitives/PositiveInteger.java

    r6196 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.primitives; 
     24package ome.xml.model.primitives; 
    2525 
    2626/** 
  • branches/4.2/components/ome-xml/src/ome/xml/model/primitives/PrimitiveType.java

    r6196 r6457  
    2222*/ 
    2323 
    24 package ome.xml.r201004.primitives; 
     24package ome.xml.model.primitives; 
    2525 
    2626/** 
  • branches/4.2/components/ome-xml/test/ome/xml/utests/NonNegativeIntegerTest.java

    r6196 r6457  
    3737import static org.testng.AssertJUnit.*; 
    3838 
    39 import ome.xml.r201004.primitives.NonNegativeInteger; 
     39import ome.xml.model.primitives.NonNegativeInteger; 
    4040 
    4141import org.testng.annotations.Test; 
  • branches/4.2/components/ome-xml/test/ome/xml/utests/PercentFractionTest.java

    r6196 r6457  
    3737import static org.testng.AssertJUnit.*; 
    3838 
    39 import ome.xml.r201004.primitives.PercentFraction; 
     39import ome.xml.model.primitives.PercentFraction; 
    4040 
    4141import org.testng.annotations.Test; 
  • branches/4.2/components/ome-xml/test/ome/xml/utests/PositiveIntegerTest.java

    r6196 r6457  
    3737import static org.testng.AssertJUnit.*; 
    3838 
    39 import ome.xml.r201004.primitives.PositiveInteger; 
     39import ome.xml.model.primitives.PositiveInteger; 
    4040 
    4141import org.testng.annotations.Test; 
Note: See TracChangeset for help on using the changeset viewer.