Changeset 6173


Ignore:
Timestamp:
04/22/10 11:16:32 (10 years ago)
Author:
callan
Message:

Add support for binary file schema. ( ome-xml:r525)

Location:
trunk/components/ome-xml
Files:
4 added
117 edited

Legend:

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

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/AnnotationRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Arc.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/BooleanAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Channel.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ChannelProfile.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ChannelRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Contact.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Dataset.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/DatasetRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Detector.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/DetectorSettings.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Dichroic.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/DichroicRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/DoubleAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Ellipse.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Experiment.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExperimentRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Experimenter.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExperimenterRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Filament.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/FileAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    5959 
    6060        // Property 
    61         private String binaryFile; 
     61        private BinaryFile binaryFile; 
    6262 
    6363        // -- Constructors -- 
     
    113113                else if (BinaryFile_nodeList.getLength() != 0) 
    114114                { 
    115                         // Element property BinaryFile which is not complex (has no 
     115                        // Element property BinaryFile which is complex (has 
    116116                        // sub-elements) 
    117                         setBinaryFile(BinaryFile_nodeList.item(0).getTextContent()); 
     117                        setBinaryFile(new BinaryFile( 
     118                                        (Element) BinaryFile_nodeList.item(0))); 
    118119                } 
    119120        } 
     
    123124 
    124125        // Property 
    125         public String getBinaryFile() 
     126        public BinaryFile getBinaryFile() 
    126127        { 
    127128                return binaryFile; 
    128129        } 
    129130 
    130         public void setBinaryFile(String binaryFile) 
     131        public void setBinaryFile(BinaryFile binaryFile) 
    131132        { 
    132133                this.binaryFile = binaryFile; 
     
    149150                if (binaryFile != null) 
    150151                { 
    151                         // Element property BinaryFile which is not complex (has no 
     152                        // Element property BinaryFile which is complex (has 
    152153                        // sub-elements) 
    153                         Element binaryFile_element =  
    154                                         document.createElementNS(NAMESPACE, "BinaryFile"); 
    155                         binaryFile_element.setTextContent(binaryFile); 
    156                         FileAnnotation_element.appendChild(binaryFile_element); 
     154                        FileAnnotation_element.appendChild(binaryFile.asXMLElement(document)); 
    157155                } 
    158156                return super.asXMLElement(document, FileAnnotation_element); 
  • trunk/components/ome-xml/src/ome/xml/r201004/Filter.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterSet.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterSetRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Group.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/GroupRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Image.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImageProfile.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImageRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImagingEnvironment.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Instrument.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/InstrumentRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Laser.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Leader.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightEmittingDiode.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightPath.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightSource.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightSourceSettings.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Line.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ListAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/LongAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ManufacturerSpec.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Mask.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    6565 
    6666        // Property which occurs more than once 
    67         private List<String> binDataList = new ArrayList<String>(); 
     67        private List<BinData> binDataList = new ArrayList<BinData>(); 
    6868 
    6969        // -- Constructors -- 
     
    121121                                        element.getAttribute("X"))); 
    122122                } 
    123                 // Element property BinData which is not complex (has no 
    124                 // sub-elements) which occurs more than once 
     123                // Element property BinData which is complex (has 
     124                // sub-elements) and occurs more than once 
    125125                NodeList BinData_nodeList = element.getElementsByTagName("BinData"); 
    126126                for (int i = 0; i < BinData_nodeList.getLength(); i++) 
    127127                { 
    128                         addBinData(new String( 
    129                                         BinData_nodeList.item(i).getTextContent())); 
     128                        Element BinData_element = (Element) BinData_nodeList.item(i); 
     129                        addBinData( 
     130                                        new BinData(BinData_element)); 
    130131                } 
    131132        } 
     
    162163        } 
    163164 
    164         public List<String> copyBinDataList() 
    165         { 
    166                 return new ArrayList<String>(binDataList); 
    167         } 
    168  
    169         public String getBinData(int index) 
     165        public List<BinData> copyBinDataList() 
     166        { 
     167                return new ArrayList<BinData>(binDataList); 
     168        } 
     169 
     170        public BinData getBinData(int index) 
    170171        { 
    171172                return binDataList.get(index); 
    172173        } 
    173174 
    174         public String setBinData(int index, String binData) 
     175        public BinData setBinData(int index, BinData binData) 
    175176        { 
    176177                return binDataList.set(index, binData); 
    177178        } 
    178179 
    179         public void addBinData(String binData) 
     180        public void addBinData(BinData binData) 
    180181        { 
    181182                binDataList.add(binData); 
    182183        } 
    183184 
    184         public void removeBinData(String binData) 
     185        public void removeBinData(BinData binData) 
    185186        { 
    186187                binDataList.remove(binData); 
     
    213214                if (binDataList != null) 
    214215                { 
    215                         // Element property BinData which is not complex (has no 
    216                         // sub-elements) which occurs more than once 
    217                         for (String binDataList_value : binDataList) 
     216                        // Element property BinData which is complex (has 
     217                        // sub-elements) and occurs more than once 
     218                        for (BinData binDataList_value : binDataList) 
    218219                        { 
    219                                 Element binDataList_element = 
    220                                                 document.createElementNS(NAMESPACE, "BinData"); 
    221                                 binDataList_element.setTextContent(binDataList_value); 
    222                                 Mask_element.appendChild(binDataList_element); 
     220                                Mask_element.appendChild(binDataList_value.asXMLElement(document)); 
    223221                        } 
    224222                } 
  • trunk/components/ome-xml/src/ome/xml/r201004/MetadataOnly.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/MicrobeamManipulation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/MicrobeamManipulationRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Microscope.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/OME.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/OTF.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    8080 
    8181        // Property 
    82         private String binaryFile; 
     82        private BinaryFile binaryFile; 
    8383 
    8484        // Back reference Channel_BackReference 
     
    186186                else if (BinaryFile_nodeList.getLength() != 0) 
    187187                { 
    188                         // Element property BinaryFile which is not complex (has no 
     188                        // Element property BinaryFile which is complex (has 
    189189                        // sub-elements) 
    190                         setBinaryFile(BinaryFile_nodeList.item(0).getTextContent()); 
     190                        setBinaryFile(new BinaryFile( 
     191                                        (Element) BinaryFile_nodeList.item(0))); 
    191192                } 
    192193                // *** IGNORING *** Skipped back reference Channel_BackReference 
     
    283284 
    284285        // Property 
    285         public String getBinaryFile() 
     286        public BinaryFile getBinaryFile() 
    286287        { 
    287288                return binaryFile; 
    288289        } 
    289290 
    290         public void setBinaryFile(String binaryFile) 
     291        public void setBinaryFile(BinaryFile binaryFile) 
    291292        { 
    292293                this.binaryFile = binaryFile; 
     
    408409                if (binaryFile != null) 
    409410                { 
    410                         // Element property BinaryFile which is not complex (has no 
     411                        // Element property BinaryFile which is complex (has 
    411412                        // sub-elements) 
    412                         Element binaryFile_element =  
    413                                         document.createElementNS(NAMESPACE, "BinaryFile"); 
    414                         binaryFile_element.setTextContent(binaryFile); 
    415                         OTF_element.appendChild(binaryFile_element); 
     413                        OTF_element.appendChild(binaryFile.asXMLElement(document)); 
    416414                } 
    417415                if (channel_BackReferenceList != null) 
  • trunk/components/ome-xml/src/ome/xml/r201004/OTFRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Objective.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ObjectiveSettings.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Path.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Pixels.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    9898 
    9999        // Property which occurs more than once 
    100         private List<String> binDataList = new ArrayList<String>(); 
     100        private List<BinData> binDataList = new ArrayList<BinData>(); 
    101101 
    102102        // Property which occurs more than once 
     
    235235                                        new Channel(Channel_element)); 
    236236                } 
    237                 // Element property BinData which is not complex (has no 
    238                 // sub-elements) which occurs more than once 
     237                // Element property BinData which is complex (has 
     238                // sub-elements) and occurs more than once 
    239239                NodeList BinData_nodeList = element.getElementsByTagName("BinData"); 
    240240                for (int i = 0; i < BinData_nodeList.getLength(); i++) 
    241241                { 
    242                         addBinData(new String( 
    243                                         BinData_nodeList.item(i).getTextContent())); 
     242                        Element BinData_element = (Element) BinData_nodeList.item(i); 
     243                        addBinData( 
     244                                        new BinData(BinData_element)); 
    244245                } 
    245246                // Element property TiffData which is complex (has 
     
    451452        } 
    452453 
    453         public List<String> copyBinDataList() 
    454         { 
    455                 return new ArrayList<String>(binDataList); 
    456         } 
    457  
    458         public String getBinData(int index) 
     454        public List<BinData> copyBinDataList() 
     455        { 
     456                return new ArrayList<BinData>(binDataList); 
     457        } 
     458 
     459        public BinData getBinData(int index) 
    459460        { 
    460461                return binDataList.get(index); 
    461462        } 
    462463 
    463         public String setBinData(int index, String binData) 
     464        public BinData setBinData(int index, BinData binData) 
    464465        { 
    465466                return binDataList.set(index, binData); 
    466467        } 
    467468 
    468         public void addBinData(String binData) 
     469        public void addBinData(BinData binData) 
    469470        { 
    470471                binDataList.add(binData); 
    471472        } 
    472473 
    473         public void removeBinData(String binData) 
     474        public void removeBinData(BinData binData) 
    474475        { 
    475476                binDataList.remove(binData); 
     
    667668                if (binDataList != null) 
    668669                { 
    669                         // Element property BinData which is not complex (has no 
    670                         // sub-elements) which occurs more than once 
    671                         for (String binDataList_value : binDataList) 
     670                        // Element property BinData which is complex (has 
     671                        // sub-elements) and occurs more than once 
     672                        for (BinData binDataList_value : binDataList) 
    672673                        { 
    673                                 Element binDataList_element = 
    674                                                 document.createElementNS(NAMESPACE, "BinData"); 
    675                                 binDataList_element.setTextContent(binDataList_value); 
    676                                 Pixels_element.appendChild(binDataList_element); 
     674                                Pixels_element.appendChild(binDataList_value.asXMLElement(document)); 
    677675                        } 
    678676                } 
  • trunk/components/ome-xml/src/ome/xml/r201004/Plane.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Plate.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/PlateAcquisition.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/PlateRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Point.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Polyline.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ProfileSet.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Project.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ProjectRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Pump.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ROI.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ROIRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Reagent.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ReagentRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Rectangle.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Reference.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ReferenceWithID.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Screen.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/ScreenRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Settings.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Shape.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/StageLabel.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/StringAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/StructuredAnnotations.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Text.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/TiffData.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/TimestampAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/TransmittanceRange.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/UUID.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Union.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/Well.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/WellSample.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/WellSampleRef.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/XMLAnnotation.java

    r6172 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:05:10+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/AcquisitionMode.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ArcType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Binning.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ContrastMethod.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Correction.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/DetectorType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/DimensionOrder.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ExperimentType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FilamentType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FillRule.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FilterType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FontFamily.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/FontStyle.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/IlluminationType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Immersion.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/LaserMedium.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/LaserType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/LineCap.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Marker.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Medium.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/MicrobeamManipulationType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/MicroscopeType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/NamingConvention.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/PixelType.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/ProfileSource.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/r201004/enums/Pulse.java

    r6137 r6173  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-19 18:31:26+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 17:04:59+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/test/ome/xml/utests/InOut201004Test.java

    r6172 r6173  
    5757 
    5858import ome.xml.r201004.Annotation; 
     59import ome.xml.r201004.BinaryFile; 
    5960import ome.xml.r201004.BooleanAnnotation; 
    6061import ome.xml.r201004.DoubleAnnotation; 
     62import ome.xml.r201004.External; 
    6163import ome.xml.r201004.FileAnnotation; 
    6264import ome.xml.r201004.ListAnnotation; 
     
    203205  private static final Double RECTANGLE_HEIGHT = 256.0; 
    204206 
     207  private static final String OTF_BINARY_FILE_NAME = "abc.bin"; 
     208 
     209  private static final Integer OTF_BINARY_FILE_SIZE = 64; 
     210 
     211  private static final String OTF_BINARY_FILE_EXTERNAL_HREF = "file:///abc.bin"; 
     212 
     213  private static final String OTF_BINARY_FILE_EXTERNAL_SHA1 = 
     214    "1234567890123456789012345678901234567890"; 
     215 
    205216  /** XML namespace. */ 
    206217  public static final String XML_NS = 
     
    394405    assertEquals(OTF_SIZE_Y, otf.getSizeY()); 
    395406    assertEquals(OTF_OPTICAL_AXIS_AVERAGED, otf.getOpticalAxisAveraged()); 
    396     ObjectiveSettings otfObjectiveSettings = otf.getObjectiveSettings(); 
    397     assertNotNull(otfObjectiveSettings); 
    398     assertEquals(OBJECTIVE_ID, otfObjectiveSettings.getID()); 
     407    ObjectiveSettings settings = otf.getObjectiveSettings(); 
     408    assertNotNull(settings); 
     409    assertEquals(OBJECTIVE_ID, settings.getID()); 
    399410    assertEquals(otf, ome.getInstrument(0).getFilterSet(0).getLinkedOTF(0)); 
     411    BinaryFile bf = otf.getBinaryFile(); 
     412    assertNotNull(bf); 
     413    assertEquals(OTF_BINARY_FILE_NAME, bf.getFileName()); 
     414    assertEquals(OTF_BINARY_FILE_SIZE, bf.getSize()); 
     415    External external = bf.getExternal(); 
     416    assertNotNull(external); 
     417    assertEquals(OTF_BINARY_FILE_EXTERNAL_HREF, external.gethref()); 
     418    assertEquals(OTF_BINARY_FILE_EXTERNAL_SHA1, external.getSHA1()); 
    400419  } 
    401420 
     
    563582    otf.setSizeY(OTF_SIZE_Y); 
    564583    otf.setOpticalAxisAveraged(OTF_OPTICAL_AXIS_AVERAGED); 
     584    // Create <ObjectiveSettings/> under <OTF/> 
    565585    ObjectiveSettings otfObjectiveSettings = new ObjectiveSettings(); 
    566586    otfObjectiveSettings.setID(objective.getID()); 
    567587    otf.setObjectiveSettings(otfObjectiveSettings); 
     588    // Create <BinaryFile/> under <OTF/> 
     589    BinaryFile otfBinaryFile = new BinaryFile(); 
     590    otfBinaryFile.setFileName(OTF_BINARY_FILE_NAME); 
     591    otfBinaryFile.setSize(OTF_BINARY_FILE_SIZE); 
     592    External otfBinaryFileExternal = new External(); 
     593    otfBinaryFileExternal.sethref(OTF_BINARY_FILE_EXTERNAL_HREF); 
     594    otfBinaryFileExternal.setSHA1(OTF_BINARY_FILE_EXTERNAL_SHA1); 
     595    otfBinaryFile.setExternal(otfBinaryFileExternal); 
     596    otf.setBinaryFile(otfBinaryFile); 
    568597 
    569598    instrument.addFilter(emFilter); 
Note: See TracChangeset for help on using the changeset viewer.