Changeset 7240 for trunk


Ignore:
Timestamp:
11/24/10 07:13:36 (10 years ago)
Author:
callan
Message:

Proper XML annotation support (See  omero:#3269); re-run of code generation. ( ome-xml:r693)

Location:
trunk/components
Files:
3 added
95 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/test/loci/formats/utests/InOut201004Test.java

    r7012 r7240  
    109109 
    110110import org.testng.annotations.BeforeClass; 
     111import org.testng.annotations.Optional; 
    111112import org.testng.annotations.Parameters; 
    112113import org.testng.annotations.Test; 
     
    237238 
    238239  public static final String CHANNEL_ANNOTATION_VALUE = 
    239   "<TestData><key>foo</key><value>bar</value></TestData>"; 
     240  "<TestData>\n\t<key>foo</key>\n\t<value>bar</value>\n</TestData>"; 
    240241 
    241242  public static final Double PIXELS_ANNOTATION_VALUE = 3.14; 
     
    301302  @Parameters({"mockClassName"}) 
    302303  @BeforeClass 
    303   public void setUp(String mockClassName) throws Exception { 
     304  public void setUp(@Optional String mockClassName) throws Exception { 
     305    if (mockClassName == null) { 
     306      mockClassName = "loci.formats.utests.ObjectBasedOMEModelMock"; 
     307    } 
    304308    Class mockClass = Class.forName(mockClassName); 
    305309    Constructor constructor = mockClass.getDeclaredConstructor(); 
     
    439443    assertEquals(n.getNamespace(), GENERAL_ANNOTATION_NAMESPACE); 
    440444    XMLAnnotation xml = (XMLAnnotation) n; 
    441     assertEquals(xml.getValue(), CHANNEL_ANNOTATION_VALUE); 
     445    assertEquals(CHANNEL_ANNOTATION_VALUE, xml.getValue()); 
    442446  } 
    443447 
     
    787791  public static void main(String[] args) throws Exception { 
    788792    InOut201004Test t = new InOut201004Test(); 
    789     t.setUp("ome.xml.utests.ObjectBasedOMEModelMock"); 
     793    t.setUp("loci.formats.utests.ObjectBasedOMEModelMock"); 
    790794    System.out.println("###\n### XML\n###"); 
    791795    System.out.println(t.asString); 
  • trunk/components/bio-formats/test/loci/formats/utests/testng.xml

    r7174 r7240  
    8989      </classes> 
    9090    </test> 
     91    <test name="XMLAnnotation"> 
     92      <groups/> 
     93      <classes> 
     94        <class name="loci.formats.utests.XMLAnnotationTest"/> 
     95      </classes> 
     96    </test> 
    9197</suite> 
  • trunk/components/ome-xml/src/ome/xml/model/Annotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/AnnotationRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Arc.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/BinData.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/BinaryFile.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/BooleanAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Channel.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ChannelRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/CommentAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Contact.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Dataset.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/DatasetRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Detector.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/DetectorSettings.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Dichroic.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/DichroicRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/DoubleAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Ellipse.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/EmissionFilterRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ExcitationFilterRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Experiment.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ExperimentRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Experimenter.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ExperimenterRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/External.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Filament.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/FileAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Filter.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/FilterRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/FilterSet.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/FilterSetRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Group.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/GroupRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Image.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ImageRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ImagingEnvironment.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Instrument.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/InstrumentRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Laser.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Leader.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/LightEmittingDiode.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/LightPath.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/LightSource.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/LightSourceSettings.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Line.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ListAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/LongAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ManufacturerSpec.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Mask.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/MetadataOnly.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/MicrobeamManipulation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/MicrobeamManipulationRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Microscope.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/OME.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/OTF.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/OTFRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Objective.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ObjectiveSettings.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Path.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Pixels.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Plane.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Plate.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/PlateAcquisition.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/PlateRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Point.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Polyline.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Project.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ProjectRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Pump.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ROI.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ROIRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Reagent.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ReagentRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Rectangle.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Reference.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Screen.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/ScreenRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Settings.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Shape.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/StageLabel.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/StructuredAnnotations.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/TagAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/TermAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Text.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/TiffData.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/TimestampAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/TransmittanceRange.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/UUID.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Union.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/Well.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/WellSample.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/WellSampleRef.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/src/ome/xml/model/XMLAnnotation.java

    r6652 r7240  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-07-06 17:07:47+0100 
     34 * Created by callan via xsd-fu on 2010-11-24 13:01:13+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    118118                        LOGGER.debug("Expecting node name of XMLAnnotation got {}", tagName); 
    119119                } 
     120                // -- BEGIN custom content from Value property template -- 
    120121                List<Element> Value_nodeList = 
    121122                                getChildrenByTagName(element, "Value"); 
     
    131132                        // Element property Value which is not complex (has no 
    132133                        // sub-elements) 
    133                         setValue( 
    134                                         String.valueOf(Value_nodeList.get(0).getTextContent())); 
    135                 } 
     134                        java.io.StringWriter sw = new java.io.StringWriter(); 
     135                        javax.xml.transform.stream.StreamResult sr =  
     136                                new javax.xml.transform.stream.StreamResult(sw); 
     137                        javax.xml.transform.TransformerFactory tf = 
     138                                javax.xml.transform.TransformerFactory.newInstance(); 
     139 
     140                        try 
     141                        { 
     142                                javax.xml.transform.Transformer t = tf.newTransformer( 
     143                                        new javax.xml.transform.stream.StreamSource( 
     144                                                this.getClass().getResourceAsStream("StripWhitespace.xsl"))); 
     145                                t.setOutputProperty( 
     146                                        javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes"); 
     147                                t.setOutputProperty( 
     148                                        javax.xml.transform.OutputKeys.INDENT, "no"); 
     149                                NodeList childNodeList = Value_nodeList.get(0).getChildNodes(); 
     150                                for (int i = 0; i < childNodeList.getLength(); i++) 
     151                                { 
     152                                        t.transform(new javax.xml.transform.dom.DOMSource( 
     153                                                childNodeList.item(i)), sr); 
     154                                } 
     155                                setValue(sw.toString().trim()); 
     156                        } 
     157                        catch (Exception e) 
     158                        { 
     159                                throw new RuntimeException(e); 
     160                        } 
     161                } 
     162 
     163                // -- END custom content from Value property template -- 
    136164        } 
    137165 
Note: See TracChangeset for help on using the changeset viewer.