Changeset 6137


Ignore:
Timestamp:
04/19/10 13:13:31 (10 years ago)
Author:
callan
Message:

Re-arranged enumeration locations, split between ome-xml and bio-formats components. Initial commit of ome.xml.r201004 POJO based OME-XML instances (OME-XML Subversion revision 501)

Location:
trunk/components
Files:
4 added
30 edited
26 moved

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/enums/EnumerationProvider.java

    r6128 r6137  
    3232import loci.formats.enums.handler.IEnumerationHandler; 
    3333import loci.formats.services.OMEXMLService; 
     34 
     35import ome.xml.r201004.enums.Enumeration; 
     36import ome.xml.r201004.enums.EnumerationException; 
    3437 
    3538import org.slf4j.Logger; 
  • trunk/components/bio-formats/src/loci/formats/enums/IEnumerationProvider.java

    r6041 r6137  
    2525 
    2626import java.util.List; 
     27 
     28import ome.xml.r201004.enums.Enumeration; 
     29import ome.xml.r201004.enums.EnumerationException; 
    2730 
    2831/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/AcquisitionModeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.AcquisitionMode; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.AcquisitionMode; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ArcTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.ArcType; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.ArcType; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/BinningEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Binning; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.Binning; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ContrastMethodEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.ContrastMethod; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.ContrastMethod; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Correction; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.Correction; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/DetectorTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.DetectorType; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.DetectorType; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/DimensionOrderEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.DimensionOrder; 
    44 import loci.formats.enums.Enumeration; 
    45 import loci.formats.enums.EnumerationException; 
     43import ome.xml.r201004.enums.DimensionOrder; 
     44import ome.xml.r201004.enums.Enumeration; 
     45import ome.xml.r201004.enums.EnumerationException; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ExperimentTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.ExperimentType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.ExperimentType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FilamentTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.FilamentType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.FilamentType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FilterTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.FilterType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.FilterType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FontFamilyEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.FontFamily; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.FontFamily; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FontStyleEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.FontStyle; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.FontStyle; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/HandlerFactory.java

    r5644 r6137  
    2424package loci.formats.enums.handler; 
    2525 
    26 import loci.formats.enums.Enumeration; 
    27 import loci.formats.enums.EnumerationException; 
     26import ome.xml.r201004.enums.Enumeration; 
     27import ome.xml.r201004.enums.EnumerationException; 
    2828 
    2929/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/IEnumerationHandler.java

    r6128 r6137  
    2424package loci.formats.enums.handler; 
    2525 
    26 import loci.formats.enums.Enumeration; 
    27 import loci.formats.enums.EnumerationException; 
     26import ome.xml.r201004.enums.Enumeration; 
     27import ome.xml.r201004.enums.EnumerationException; 
    2828 
    2929/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/IlluminationTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.IlluminationType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.IlluminationType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ImmersionEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.Immersion; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.Immersion; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LaserMediumEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.LaserMedium; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.LaserMedium; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LaserTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.LaserType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.LaserType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LineCapEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.LineCap; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.LineCap; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MarkerEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.Marker; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.Marker; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MediumEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.Medium; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.Medium; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MicrobeamManipulationTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.MicrobeamManipulationType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.MicrobeamManipulationType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MicroscopeTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.MicroscopeType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.MicroscopeType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/NamingConventionEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.NamingConvention; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.NamingConvention; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/PixelTypeEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.PixelType; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.PixelType; 
    4646 
    4747/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/PulseEnumHandler.java

    r6128 r6137  
    4141import java.util.Hashtable; 
    4242 
    43 import loci.formats.enums.Enumeration; 
    44 import loci.formats.enums.EnumerationException; 
    45 import loci.formats.enums.Pulse; 
     43import ome.xml.r201004.enums.Enumeration; 
     44import ome.xml.r201004.enums.EnumerationException; 
     45import ome.xml.r201004.enums.Pulse; 
    4646 
    4747/** 
  • trunk/components/ome-xml/build.properties

    r6045 r6137  
    1111component.version        = 4.1.1 
    1212component.classpath      = 
    13 component.java-version   = 1.4 
     13component.java-version   = 1.5 
    1414component.deprecation    = true 
    1515 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/AcquisitionMode.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.AcquisitionMode 
     2 * ome.xml.r201004.enums.AcquisitionMode 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum AcquisitionMode implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ArcType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.ArcType 
     2 * ome.xml.r201004.enums.ArcType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum ArcType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Binning.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.Binning 
     2 * ome.xml.r201004.enums.Binning 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum Binning implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ContrastMethod.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.ContrastMethod 
     2 * ome.xml.r201004.enums.ContrastMethod 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum ContrastMethod implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Correction.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.Correction 
     2 * ome.xml.r201004.enums.Correction 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum Correction implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/DetectorType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.DetectorType 
     2 * ome.xml.r201004.enums.DetectorType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum DetectorType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/DimensionOrder.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.DimensionOrder 
     2 * ome.xml.r201004.enums.DimensionOrder 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum DimensionOrder implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Enumeration.java

    r5642 r6137  
    2222*/ 
    2323 
    24 package loci.formats.enums; 
     24package ome.xml.r201004.enums; 
    2525 
    2626/** 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/EnumerationException.java

    r5629 r6137  
    55/* 
    66OME Bio-Formats package for reading and converting biological file formats. 
    7 Copyright (C) 2005-@year@ UW-Madison LOCI and Glencoe Software, Inc. 
     7Copyright (C) 2005-2010 UW-Madison LOCI and Glencoe Software, Inc. 
    88 
    99This program is free software; you can redistribute it and/or modify 
     
    2222*/ 
    2323 
    24 package loci.formats.enums; 
    25  
    26 import loci.formats.FormatException; 
     24package ome.xml.r201004.enums; 
    2725 
    2826/** 
     
    3432 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/EnumerationException.java">SVN</a></dd></dl> 
    3533 */ 
    36 public class EnumerationException extends FormatException { 
     34public class EnumerationException extends Exception { 
    3735 
    3836  public EnumerationException() { super(); } 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ExperimentType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.ExperimentType 
     2 * ome.xml.r201004.enums.ExperimentType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum ExperimentType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FilamentType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.FilamentType 
     2 * ome.xml.r201004.enums.FilamentType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum FilamentType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FilterType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.FilterType 
     2 * ome.xml.r201004.enums.FilterType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum FilterType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FontFamily.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.FontFamily 
     2 * ome.xml.r201004.enums.FontFamily 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum FontFamily implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FontStyle.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.FontStyle 
     2 * ome.xml.r201004.enums.FontStyle 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum FontStyle implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/IlluminationType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.IlluminationType 
     2 * ome.xml.r201004.enums.IlluminationType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum IlluminationType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Immersion.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.Immersion 
     2 * ome.xml.r201004.enums.Immersion 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum Immersion implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/LaserMedium.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.LaserMedium 
     2 * ome.xml.r201004.enums.LaserMedium 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum LaserMedium implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/LaserType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.LaserType 
     2 * ome.xml.r201004.enums.LaserType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum LaserType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/LineCap.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.LineCap 
     2 * ome.xml.r201004.enums.LineCap 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum LineCap implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Marker.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.Marker 
     2 * ome.xml.r201004.enums.Marker 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum Marker implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Medium.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.Medium 
     2 * ome.xml.r201004.enums.Medium 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum Medium implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/MicrobeamManipulationType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.MicrobeamManipulationType 
     2 * ome.xml.r201004.enums.MicrobeamManipulationType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum MicrobeamManipulationType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/MicroscopeType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.MicroscopeType 
     2 * ome.xml.r201004.enums.MicroscopeType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum MicroscopeType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/NamingConvention.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.NamingConvention 
     2 * ome.xml.r201004.enums.NamingConvention 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum NamingConvention implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/PixelType.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.PixelType 
     2 * ome.xml.r201004.enums.PixelType 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum PixelType implements Enumeration 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Pulse.java

    r6136 r6137  
    11/* 
    2  * loci.formats.enums.Pulse 
     2 * ome.xml.r201004.enums.Pulse 
    33 * 
    44 *----------------------------------------------------------------------------- 
     
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:11:21+0100 
     34 * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
    3737 */ 
    3838 
    39 package loci.formats.enums; 
     39package ome.xml.r201004.enums; 
    4040 
    4141public enum Pulse implements Enumeration 
  • trunk/components/test-suite/src/loci/tests/EnumTest.java

    r6026 r6137  
    3434import java.util.Vector; 
    3535import loci.common.services.DependencyException; 
    36 import loci.formats.enums.*; 
     36import loci.formats.enums.EnumerationProvider; 
     37import loci.formats.enums.IEnumerationProvider; 
     38import ome.xml.r201004.enums.*; 
    3739 
    3840/** 
Note: See TracChangeset for help on using the changeset viewer.