Changeset 6196


Ignore:
Timestamp:
04/27/10 04:37:37 (10 years ago)
Author:
callan
Message:

Move to use primitives for NonNegativeInteger, PositiveInteger and PercentFraction. Re-run of code generation ( ome-xml:r557).

Location:
trunk/components/ome-xml
Files:
8 added
96 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/ome-xml/src/ome/xml/r201004/Annotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public abstract class Annotation extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/AnnotationRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class AnnotationRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Arc.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Arc extends LightSource 
  • trunk/components/ome-xml/src/ome/xml/r201004/BinData.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class BinData extends AbstractOMEModelObject 
     
    6263 
    6364        // Property 
    64         private Integer length; 
     65        private NonNegativeInteger length; 
    6566 
    6667        // Property 
     
    129130                { 
    130131                        // Attribute property Length 
    131                         setLength(Integer.valueOf( 
     132                        setLength(NonNegativeInteger.valueOf( 
    132133                                        element.getAttribute("Length"))); 
    133134                } 
     
    162163 
    163164        // Property 
    164         public Integer getLength() 
     165        public NonNegativeInteger getLength() 
    165166        { 
    166167                return length; 
    167168        } 
    168169 
    169         public void setLength(Integer length) 
     170        public void setLength(NonNegativeInteger length) 
    170171        { 
    171172                this.length = length; 
  • trunk/components/ome-xml/src/ome/xml/r201004/BinaryFile.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class BinaryFile extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/BooleanAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class BooleanAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/Channel.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Channel extends AbstractOMEModelObject 
     
    7475 
    7576        // Property 
    76         private Integer excitationWavelength; 
     77        private PositiveInteger excitationWavelength; 
    7778 
    7879        // Property 
     
    8687 
    8788        // Property 
    88         private Integer emissionWavelength; 
     89        private PositiveInteger emissionWavelength; 
    8990 
    9091        // Property 
     
    201202                { 
    202203                        // Attribute property ExcitationWavelength 
    203                         setExcitationWavelength(Integer.valueOf( 
     204                        setExcitationWavelength(PositiveInteger.valueOf( 
    204205                                        element.getAttribute("ExcitationWavelength"))); 
    205206                } 
     
    225226                { 
    226227                        // Attribute property EmissionWavelength 
    227                         setEmissionWavelength(Integer.valueOf( 
     228                        setEmissionWavelength(PositiveInteger.valueOf( 
    228229                                        element.getAttribute("EmissionWavelength"))); 
    229230                } 
     
    418419 
    419420        // Property 
    420         public Integer getExcitationWavelength() 
     421        public PositiveInteger getExcitationWavelength() 
    421422        { 
    422423                return excitationWavelength; 
    423424        } 
    424425 
    425         public void setExcitationWavelength(Integer excitationWavelength) 
     426        public void setExcitationWavelength(PositiveInteger excitationWavelength) 
    426427        { 
    427428                this.excitationWavelength = excitationWavelength; 
     
    462463 
    463464        // Property 
    464         public Integer getEmissionWavelength() 
     465        public PositiveInteger getEmissionWavelength() 
    465466        { 
    466467                return emissionWavelength; 
    467468        } 
    468469 
    469         public void setEmissionWavelength(Integer emissionWavelength) 
     470        public void setEmissionWavelength(PositiveInteger emissionWavelength) 
    470471        { 
    471472                this.emissionWavelength = emissionWavelength; 
  • trunk/components/ome-xml/src/ome/xml/r201004/ChannelProfile.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ChannelProfile extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ChannelRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ChannelRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Contact.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Contact extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Dataset.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Dataset extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/DatasetRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class DatasetRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Detector.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Detector extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/DetectorSettings.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class DetectorSettings extends Settings 
  • trunk/components/ome-xml/src/ome/xml/r201004/Dichroic.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Dichroic extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/DichroicRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class DichroicRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/DoubleAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class DoubleAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/Ellipse.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Ellipse extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/EmissionFilterRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class EmissionFilterRef extends FilterRef 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExcitationFilterRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ExcitationFilterRef extends FilterRef 
  • trunk/components/ome-xml/src/ome/xml/r201004/Experiment.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Experiment extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExperimentRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ExperimentRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Experimenter.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Experimenter extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExperimenterRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ExperimenterRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/External.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class External extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Filament.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Filament extends LightSource 
  • trunk/components/ome-xml/src/ome/xml/r201004/FileAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class FileAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/Filter.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Filter extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class FilterRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterSet.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class FilterSet extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterSetRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class FilterSetRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Group.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Group extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/GroupRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class GroupRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Image.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Image extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImageProfile.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ImageProfile extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImageRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ImageRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImagingEnvironment.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ImagingEnvironment extends AbstractOMEModelObject 
     
    5960 
    6061        // Property 
    61         private Double co2percent; 
     62        private PercentFraction co2percent; 
    6263 
    6364        // Property 
     
    6869 
    6970        // Property 
    70         private Double humidity; 
     71        private PercentFraction humidity; 
    7172 
    7273        // -- Constructors -- 
     
    126127                { 
    127128                        // Attribute property CO2Percent 
    128                         setCO2Percent(Double.valueOf( 
     129                        setCO2Percent(PercentFraction.valueOf( 
    129130                                        element.getAttribute("CO2Percent"))); 
    130131                } 
     
    144145                { 
    145146                        // Attribute property Humidity 
    146                         setHumidity(Double.valueOf( 
     147                        setHumidity(PercentFraction.valueOf( 
    147148                                        element.getAttribute("Humidity"))); 
    148149                } 
     
    160161 
    161162        // Property 
    162         public Double getCO2Percent() 
     163        public PercentFraction getCO2Percent() 
    163164        { 
    164165                return co2percent; 
    165166        } 
    166167 
    167         public void setCO2Percent(Double co2percent) 
     168        public void setCO2Percent(PercentFraction co2percent) 
    168169        { 
    169170                this.co2percent = co2percent; 
     
    193194 
    194195        // Property 
    195         public Double getHumidity() 
     196        public PercentFraction getHumidity() 
    196197        { 
    197198                return humidity; 
    198199        } 
    199200 
    200         public void setHumidity(Double humidity) 
     201        public void setHumidity(PercentFraction humidity) 
    201202        { 
    202203                this.humidity = humidity; 
  • trunk/components/ome-xml/src/ome/xml/r201004/Instrument.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Instrument extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/InstrumentRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class InstrumentRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Laser.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Laser extends LightSource 
     
    7172 
    7273        // Property 
    73         private Integer wavelength; 
    74  
    75         // Property 
    76         private Integer frequencyMultiplication; 
     74        private PositiveInteger wavelength; 
     75 
     76        // Property 
     77        private PositiveInteger frequencyMultiplication; 
    7778 
    7879        // Property 
     
    165166                { 
    166167                        // Attribute property Wavelength 
    167                         setWavelength(Integer.valueOf( 
     168                        setWavelength(PositiveInteger.valueOf( 
    168169                                        element.getAttribute("Wavelength"))); 
    169170                } 
     
    171172                { 
    172173                        // Attribute property FrequencyMultiplication 
    173                         setFrequencyMultiplication(Integer.valueOf( 
     174                        setFrequencyMultiplication(PositiveInteger.valueOf( 
    174175                                        element.getAttribute("FrequencyMultiplication"))); 
    175176                } 
     
    258259 
    259260        // Property 
    260         public Integer getWavelength() 
     261        public PositiveInteger getWavelength() 
    261262        { 
    262263                return wavelength; 
    263264        } 
    264265 
    265         public void setWavelength(Integer wavelength) 
     266        public void setWavelength(PositiveInteger wavelength) 
    266267        { 
    267268                this.wavelength = wavelength; 
     
    269270 
    270271        // Property 
    271         public Integer getFrequencyMultiplication() 
     272        public PositiveInteger getFrequencyMultiplication() 
    272273        { 
    273274                return frequencyMultiplication; 
    274275        } 
    275276 
    276         public void setFrequencyMultiplication(Integer frequencyMultiplication) 
     277        public void setFrequencyMultiplication(PositiveInteger frequencyMultiplication) 
    277278        { 
    278279                this.frequencyMultiplication = frequencyMultiplication; 
  • trunk/components/ome-xml/src/ome/xml/r201004/Leader.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Leader extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightEmittingDiode.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class LightEmittingDiode extends LightSource 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightPath.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class LightPath extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightSource.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public abstract class LightSource extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightSourceSettings.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class LightSourceSettings extends Settings 
     
    5960 
    6061        // Property 
    61         private Integer wavelength; 
    62  
    63         // Property 
    64         private Double attenuation; 
     62        private PositiveInteger wavelength; 
     63 
     64        // Property 
     65        private PercentFraction attenuation; 
    6566 
    6667        // Property 
     
    123124                { 
    124125                        // Attribute property Wavelength 
    125                         setWavelength(Integer.valueOf( 
     126                        setWavelength(PositiveInteger.valueOf( 
    126127                                        element.getAttribute("Wavelength"))); 
    127128                } 
     
    129130                { 
    130131                        // Attribute property Attenuation 
    131                         setAttenuation(Double.valueOf( 
     132                        setAttenuation(PercentFraction.valueOf( 
    132133                                        element.getAttribute("Attenuation"))); 
    133134                } 
     
    159160 
    160161        // Property 
    161         public Integer getWavelength() 
     162        public PositiveInteger getWavelength() 
    162163        { 
    163164                return wavelength; 
    164165        } 
    165166 
    166         public void setWavelength(Integer wavelength) 
     167        public void setWavelength(PositiveInteger wavelength) 
    167168        { 
    168169                this.wavelength = wavelength; 
     
    170171 
    171172        // Property 
    172         public Double getAttenuation() 
     173        public PercentFraction getAttenuation() 
    173174        { 
    174175                return attenuation; 
    175176        } 
    176177 
    177         public void setAttenuation(Double attenuation) 
     178        public void setAttenuation(PercentFraction attenuation) 
    178179        { 
    179180                this.attenuation = attenuation; 
  • trunk/components/ome-xml/src/ome/xml/r201004/Line.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Line extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/ListAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ListAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/LongAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class LongAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/ManufacturerSpec.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public abstract class ManufacturerSpec extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Mask.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Mask extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/MetadataOnly.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class MetadataOnly extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/MicrobeamManipulation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class MicrobeamManipulation extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/MicrobeamManipulationRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class MicrobeamManipulationRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Microscope.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Microscope extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/OME.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class OME extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/OMEModel.java

    r6178 r6196  
    2727import java.util.Map; 
    2828 
    29 import ome.xml.r201004.enums.EnumerationException; 
    30  
    31 import org.w3c.dom.Document; 
    32 import org.w3c.dom.Element; 
    33  
    3429/** 
    3530 * @author callan 
  • trunk/components/ome-xml/src/ome/xml/r201004/OTF.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class OTF extends AbstractOMEModelObject 
     
    5960 
    6061        // Property 
    61         private Integer sizeX; 
    62  
    63         // Property 
    64         private Integer sizeY; 
     62        private PositiveInteger sizeX; 
     63 
     64        // Property 
     65        private PositiveInteger sizeY; 
    6566 
    6667        // Property 
     
    144145                { 
    145146                        // Attribute property SizeX 
    146                         setSizeX(Integer.valueOf( 
     147                        setSizeX(PositiveInteger.valueOf( 
    147148                                        element.getAttribute("SizeX"))); 
    148149                } 
     
    150151                { 
    151152                        // Attribute property SizeY 
    152                         setSizeY(Integer.valueOf( 
     153                        setSizeY(PositiveInteger.valueOf( 
    153154                                        element.getAttribute("SizeY"))); 
    154155                } 
     
    242243 
    243244        // Property 
    244         public Integer getSizeX() 
     245        public PositiveInteger getSizeX() 
    245246        { 
    246247                return sizeX; 
    247248        } 
    248249 
    249         public void setSizeX(Integer sizeX) 
     250        public void setSizeX(PositiveInteger sizeX) 
    250251        { 
    251252                this.sizeX = sizeX; 
     
    253254 
    254255        // Property 
    255         public Integer getSizeY() 
     256        public PositiveInteger getSizeY() 
    256257        { 
    257258                return sizeY; 
    258259        } 
    259260 
    260         public void setSizeY(Integer sizeY) 
     261        public void setSizeY(PositiveInteger sizeY) 
    261262        { 
    262263                this.sizeY = sizeY; 
  • trunk/components/ome-xml/src/ome/xml/r201004/OTFRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class OTFRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Objective.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Objective extends ManufacturerSpec 
  • trunk/components/ome-xml/src/ome/xml/r201004/ObjectiveSettings.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ObjectiveSettings extends Settings 
  • trunk/components/ome-xml/src/ome/xml/r201004/Path.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Path extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/Pixels.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Pixels extends AbstractOMEModelObject 
     
    5960 
    6061        // Property 
    61         private Integer sizeT; 
     62        private PositiveInteger sizeT; 
    6263 
    6364        // Property 
     
    7778 
    7879        // Property 
    79         private Integer sizeX; 
    80  
    81         // Property 
    82         private Integer sizeY; 
    83  
    84         // Property 
    85         private Integer sizeZ; 
    86  
    87         // Property 
    88         private Integer sizeC; 
     80        private PositiveInteger sizeX; 
     81 
     82        // Property 
     83        private PositiveInteger sizeY; 
     84 
     85        // Property 
     86        private PositiveInteger sizeZ; 
     87 
     88        // Property 
     89        private PositiveInteger sizeC; 
    8990 
    9091        // Property 
     
    168169                { 
    169170                        // Attribute property SizeT 
    170                         setSizeT(Integer.valueOf( 
     171                        setSizeT(PositiveInteger.valueOf( 
    171172                                        element.getAttribute("SizeT"))); 
    172173                } 
     
    204205                { 
    205206                        // Attribute property SizeX 
    206                         setSizeX(Integer.valueOf( 
     207                        setSizeX(PositiveInteger.valueOf( 
    207208                                        element.getAttribute("SizeX"))); 
    208209                } 
     
    210211                { 
    211212                        // Attribute property SizeY 
    212                         setSizeY(Integer.valueOf( 
     213                        setSizeY(PositiveInteger.valueOf( 
    213214                                        element.getAttribute("SizeY"))); 
    214215                } 
     
    216217                { 
    217218                        // Attribute property SizeZ 
    218                         setSizeZ(Integer.valueOf( 
     219                        setSizeZ(PositiveInteger.valueOf( 
    219220                                        element.getAttribute("SizeZ"))); 
    220221                } 
     
    222223                { 
    223224                        // Attribute property SizeC 
    224                         setSizeC(Integer.valueOf( 
     225                        setSizeC(PositiveInteger.valueOf( 
    225226                                        element.getAttribute("SizeC"))); 
    226227                } 
     
    326327 
    327328        // Property 
    328         public Integer getSizeT() 
     329        public PositiveInteger getSizeT() 
    329330        { 
    330331                return sizeT; 
    331332        } 
    332333 
    333         public void setSizeT(Integer sizeT) 
     334        public void setSizeT(PositiveInteger sizeT) 
    334335        { 
    335336                this.sizeT = sizeT; 
     
    392393 
    393394        // Property 
    394         public Integer getSizeX() 
     395        public PositiveInteger getSizeX() 
    395396        { 
    396397                return sizeX; 
    397398        } 
    398399 
    399         public void setSizeX(Integer sizeX) 
     400        public void setSizeX(PositiveInteger sizeX) 
    400401        { 
    401402                this.sizeX = sizeX; 
     
    403404 
    404405        // Property 
    405         public Integer getSizeY() 
     406        public PositiveInteger getSizeY() 
    406407        { 
    407408                return sizeY; 
    408409        } 
    409410 
    410         public void setSizeY(Integer sizeY) 
     411        public void setSizeY(PositiveInteger sizeY) 
    411412        { 
    412413                this.sizeY = sizeY; 
     
    414415 
    415416        // Property 
    416         public Integer getSizeZ() 
     417        public PositiveInteger getSizeZ() 
    417418        { 
    418419                return sizeZ; 
    419420        } 
    420421 
    421         public void setSizeZ(Integer sizeZ) 
     422        public void setSizeZ(PositiveInteger sizeZ) 
    422423        { 
    423424                this.sizeZ = sizeZ; 
     
    425426 
    426427        // Property 
    427         public Integer getSizeC() 
     428        public PositiveInteger getSizeC() 
    428429        { 
    429430                return sizeC; 
    430431        } 
    431432 
    432         public void setSizeC(Integer sizeC) 
     433        public void setSizeC(PositiveInteger sizeC) 
    433434        { 
    434435                this.sizeC = sizeC; 
  • trunk/components/ome-xml/src/ome/xml/r201004/Plane.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Plane extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Plate.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Plate extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/PlateAcquisition.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class PlateAcquisition extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/PlateRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class PlateRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Point.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Point extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/Polyline.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Polyline extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/ProfileSet.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ProfileSet extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Project.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Project extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ProjectRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ProjectRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Pump.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Pump extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/ROI.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ROI extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ROIRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ROIRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Reagent.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Reagent extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ReagentRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ReagentRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Rectangle.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Rectangle extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/Reference.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public abstract class Reference extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Screen.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Screen extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/ScreenRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class ScreenRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Settings.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public abstract class Settings extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/Shape.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public abstract class Shape extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/StageLabel.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class StageLabel extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/StringAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class StringAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/StructuredAnnotations.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class StructuredAnnotations extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Text.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Text extends Shape 
  • trunk/components/ome-xml/src/ome/xml/r201004/TiffData.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class TiffData extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/TimestampAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class TimestampAnnotation extends Annotation 
  • trunk/components/ome-xml/src/ome/xml/r201004/TransmittanceRange.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class TransmittanceRange extends AbstractOMEModelObject 
     
    6263 
    6364        // Property 
    64         private Double transmittance; 
     65        private PercentFraction transmittance; 
    6566 
    6667        // Property 
     
    135136                { 
    136137                        // Attribute property Transmittance 
    137                         setTransmittance(Double.valueOf( 
     138                        setTransmittance(PercentFraction.valueOf( 
    138139                                        element.getAttribute("Transmittance"))); 
    139140                } 
     
    180181 
    181182        // Property 
    182         public Double getTransmittance() 
     183        public PercentFraction getTransmittance() 
    183184        { 
    184185                return transmittance; 
    185186        } 
    186187 
    187         public void setTransmittance(Double transmittance) 
     188        public void setTransmittance(PercentFraction transmittance) 
    188189        { 
    189190                this.transmittance = transmittance; 
  • trunk/components/ome-xml/src/ome/xml/r201004/UUID.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class UUID extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Union.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Union extends AbstractOMEModelObject 
  • trunk/components/ome-xml/src/ome/xml/r201004/Well.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class Well extends AbstractOMEModelObject 
     
    6566 
    6667        // Property 
    67         private Integer column; 
     68        private NonNegativeInteger column; 
    6869 
    6970        // Property 
     
    7778 
    7879        // Property 
    79         private Integer row; 
     80        private NonNegativeInteger row; 
    8081 
    8182        // Property which occurs more than once 
     
    156157                { 
    157158                        // Attribute property Column 
    158                         setColumn(Integer.valueOf( 
     159                        setColumn(NonNegativeInteger.valueOf( 
    159160                                        element.getAttribute("Column"))); 
    160161                } 
     
    188189                { 
    189190                        // Attribute property Row 
    190                         setRow(Integer.valueOf( 
     191                        setRow(NonNegativeInteger.valueOf( 
    191192                                        element.getAttribute("Row"))); 
    192193                } 
     
    267268 
    268269        // Property 
    269         public Integer getColumn() 
     270        public NonNegativeInteger getColumn() 
    270271        { 
    271272                return column; 
    272273        } 
    273274 
    274         public void setColumn(Integer column) 
     275        public void setColumn(NonNegativeInteger column) 
    275276        { 
    276277                this.column = column; 
     
    311312 
    312313        // Property 
    313         public Integer getRow() 
     314        public NonNegativeInteger getRow() 
    314315        { 
    315316                return row; 
    316317        } 
    317318 
    318         public void setRow(Integer row) 
     319        public void setRow(NonNegativeInteger row) 
    319320        { 
    320321                this.row = row; 
  • trunk/components/ome-xml/src/ome/xml/r201004/WellSample.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class WellSample extends AbstractOMEModelObject 
     
    5960 
    6061        // Property 
    61         private Integer index; 
     62        private NonNegativeInteger index; 
    6263 
    6364        // Property 
     
    138139                { 
    139140                        // Attribute property Index 
    140                         setIndex(Integer.valueOf( 
     141                        setIndex(NonNegativeInteger.valueOf( 
    141142                                        element.getAttribute("Index"))); 
    142143                } 
     
    219220 
    220221        // Property 
    221         public Integer getIndex() 
     222        public NonNegativeInteger getIndex() 
    222223        { 
    223224                return index; 
    224225        } 
    225226 
    226         public void setIndex(Integer index) 
     227        public void setIndex(NonNegativeInteger index) 
    227228        { 
    228229                this.index = index; 
  • trunk/components/ome-xml/src/ome/xml/r201004/WellSampleRef.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class WellSampleRef extends Reference 
  • trunk/components/ome-xml/src/ome/xml/r201004/XMLAnnotation.java

    r6195 r6196  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-27 09:14:49+0100 
     34 * Created by callan via xsd-fu on 2010-04-27 09:58:45+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    4949 
    5050import ome.xml.r201004.enums.*; 
     51import ome.xml.r201004.primitives.*; 
    5152 
    5253public class XMLAnnotation extends Annotation 
  • trunk/components/ome-xml/test/ome/xml/utests/InOut201004Test.java

    r6194 r6196  
    3636 
    3737import java.io.ByteArrayOutputStream; 
    38 import java.io.IOException; 
    3938import java.io.OutputStreamWriter; 
    40 import java.io.StringReader; 
    41 import java.io.StringWriter; 
    4239import java.io.UnsupportedEncodingException; 
    4340import java.util.List; 
     
    6461import ome.xml.r201004.DoubleAnnotation; 
    6562import ome.xml.r201004.External; 
    66 import ome.xml.r201004.FileAnnotation; 
    67 import ome.xml.r201004.ListAnnotation; 
    6863import ome.xml.r201004.LongAnnotation; 
    6964import ome.xml.r201004.OMEModel; 
     
    10297import ome.xml.r201004.enums.NamingConvention; 
    10398import ome.xml.r201004.enums.PixelType; 
     99import ome.xml.r201004.primitives.NonNegativeInteger; 
     100import ome.xml.r201004.primitives.PositiveInteger; 
    104101 
    105102import org.testng.annotations.BeforeClass; 
     
    107104import org.w3c.dom.Document; 
    108105import org.w3c.dom.Element; 
    109 import org.w3c.dom.Node; 
    110 import org.w3c.dom.NodeList; 
    111 import org.xml.sax.InputSource; 
    112 import org.xml.sax.SAXException; 
    113106 
    114107/** 
     
    261254  @BeforeClass 
    262255  public void setUp() 
    263   throws ParserConfigurationException, TransformerException, 
    264   EnumerationException, UnsupportedEncodingException { 
     256  throws ParserConfigurationException, TransformerException, UnsupportedEncodingException { 
    265257    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); 
    266258    DocumentBuilder parser = factory.newDocumentBuilder(); 
     
    314306  public void testValidPixelsNode() { 
    315307    Pixels pixels = ome.getImage(0).getPixels(); 
    316     assertEquals(SIZE_X, pixels.getSizeX()); 
    317     assertEquals(SIZE_Y, pixels.getSizeY()); 
    318     assertEquals(SIZE_Z, pixels.getSizeZ()); 
    319     assertEquals(SIZE_C, pixels.getSizeC()); 
    320     assertEquals(SIZE_T, pixels.getSizeT()); 
     308    assertEquals(SIZE_X, pixels.getSizeX().getValue()); 
     309    assertEquals(SIZE_Y, pixels.getSizeY().getValue()); 
     310    assertEquals(SIZE_Z, pixels.getSizeZ().getValue()); 
     311    assertEquals(SIZE_C, pixels.getSizeC().getValue()); 
     312    assertEquals(SIZE_T, pixels.getSizeT().getValue()); 
    321313    assertEquals(DIMENSION_ORDER, pixels.getDimensionOrder()); 
    322314    assertEquals(PIXEL_TYPE, pixels.getType()); 
     
    433425    assertEquals(OTF_ID, otf.getID()); 
    434426    assertEquals(OTF_PIXELTYPE, otf.getType()); 
    435     assertEquals(OTF_SIZE_X, otf.getSizeX()); 
    436     assertEquals(OTF_SIZE_Y, otf.getSizeY()); 
     427    assertEquals(OTF_SIZE_X, otf.getSizeX().getValue()); 
     428    assertEquals(OTF_SIZE_Y, otf.getSizeY().getValue()); 
    437429    assertEquals(OTF_OPTICAL_AXIS_AVERAGED, otf.getOpticalAxisAveraged()); 
    438430    ObjectiveSettings settings = otf.getObjectiveSettings(); 
     
    508500        assertEquals(String.format("WellSample:%d_%d", row, col), 
    509501          sample.getID()); 
    510         assertEquals(wellSampleIndex, sample.getIndex()); 
     502        assertEquals(wellSampleIndex, sample.getIndex().getValue()); 
    511503        Image image = sample.getLinkedImage(); 
    512504        assertNotNull(image); 
     
    570562    Pixels pixels = new Pixels(); 
    571563    pixels.setID(PIXELS_ID); 
    572     pixels.setSizeX(SIZE_X); 
    573     pixels.setSizeY(SIZE_Y); 
    574     pixels.setSizeZ(SIZE_Z); 
    575     pixels.setSizeC(SIZE_C); 
    576     pixels.setSizeT(SIZE_T); 
     564    pixels.setSizeX(new PositiveInteger(SIZE_X)); 
     565    pixels.setSizeY(new PositiveInteger(SIZE_Y)); 
     566    pixels.setSizeZ(new PositiveInteger(SIZE_Z)); 
     567    pixels.setSizeC(new PositiveInteger(SIZE_C)); 
     568    pixels.setSizeT(new PositiveInteger(SIZE_T)); 
    577569    pixels.setDimensionOrder(DIMENSION_ORDER); 
    578570    pixels.setType(PIXEL_TYPE); 
     
    643635    otf.setID(OTF_ID); 
    644636    otf.setType(OTF_PIXELTYPE); 
    645     otf.setSizeX(OTF_SIZE_X); 
    646     otf.setSizeY(OTF_SIZE_Y); 
     637    otf.setSizeX(new PositiveInteger(OTF_SIZE_X)); 
     638    otf.setSizeY(new PositiveInteger(OTF_SIZE_Y)); 
    647639    otf.setOpticalAxisAveraged(OTF_OPTICAL_AXIS_AVERAGED); 
    648640    // Create <ObjectiveSettings/> under <OTF/> 
     
    698690        Well well = new Well(); 
    699691        well.setID(String.format("Well:%d_%d", row, col)); 
    700         well.setRow(row); 
    701         well.setColumn(col); 
     692        well.setRow(new NonNegativeInteger(row)); 
     693        well.setColumn(new NonNegativeInteger(col)); 
    702694 
    703695        if (row == 0 && col == 0) { 
     
    711703        WellSample sample = new WellSample(); 
    712704        sample.setID(String.format("WellSample:%d_%d", row, col)); 
    713         sample.setIndex(wellSampleIndex); 
     705        sample.setIndex(new NonNegativeInteger(wellSampleIndex)); 
    714706        sample.linkImage(ome.getImage(0)); 
    715707        well.addWellSample(sample); 
     
    760752    transformer.transform(source, result); 
    761753    return os.toString(); 
    762   } 
    763  
    764   private Document fromString(String xml) 
    765   throws ParserConfigurationException, IOException, SAXException { 
    766     DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); 
    767     DocumentBuilder builder = factory.newDocumentBuilder(); 
    768     return builder.parse(new InputSource(new StringReader(xml))); 
    769754  } 
    770755 
Note: See TracChangeset for help on using the changeset viewer.