Changeset 6172


Ignore:
Timestamp:
04/22/10 10:52:24 (10 years ago)
Author:
callan
Message:

Re-run of code generation ( ome-xml:r525)

Location:
trunk/components/ome-xml
Files:
91 edited

Legend:

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    221221        public boolean linkImage(Image o) 
    222222        { 
    223  
    224                 o.linkAnnotation(this); 
    225223                return image_BackReferenceList.add(o); 
    226224        } 
     
    228226        public boolean unlinkImage(Image o) 
    229227        { 
    230  
    231                 o.unlinkAnnotation(this); 
    232228                return image_BackReferenceList.remove(o); 
    233229        } 
     
    256252        public boolean linkPixels(Pixels o) 
    257253        { 
    258  
    259                 o.linkAnnotation(this); 
    260254                return pixels_BackReferenceList.add(o); 
    261255        } 
     
    263257        public boolean unlinkPixels(Pixels o) 
    264258        { 
    265  
    266                 o.unlinkAnnotation(this); 
    267259                return pixels_BackReferenceList.remove(o); 
    268260        } 
     
    291283        public boolean linkPlane(Plane o) 
    292284        { 
    293  
    294                 o.linkAnnotation(this); 
    295285                return plane_BackReferenceList.add(o); 
    296286        } 
     
    298288        public boolean unlinkPlane(Plane o) 
    299289        { 
    300  
    301                 o.unlinkAnnotation(this); 
    302290                return plane_BackReferenceList.remove(o); 
    303291        } 
     
    326314        public boolean linkChannel(Channel o) 
    327315        { 
    328  
    329                 o.linkAnnotation(this); 
    330316                return channel_BackReferenceList.add(o); 
    331317        } 
     
    333319        public boolean unlinkChannel(Channel o) 
    334320        { 
    335  
    336                 o.unlinkAnnotation(this); 
    337321                return channel_BackReferenceList.remove(o); 
    338322        } 
     
    361345        public boolean linkProject(Project o) 
    362346        { 
    363  
    364                 o.linkAnnotation(this); 
    365347                return project_BackReferenceList.add(o); 
    366348        } 
     
    368350        public boolean unlinkProject(Project o) 
    369351        { 
    370  
    371                 o.unlinkAnnotation(this); 
    372352                return project_BackReferenceList.remove(o); 
    373353        } 
     
    396376        public boolean linkDataset(Dataset o) 
    397377        { 
    398  
    399                 o.linkAnnotation(this); 
    400378                return dataset_BackReferenceList.add(o); 
    401379        } 
     
    403381        public boolean unlinkDataset(Dataset o) 
    404382        { 
    405  
    406                 o.unlinkAnnotation(this); 
    407383                return dataset_BackReferenceList.remove(o); 
    408384        } 
     
    431407        public boolean linkExperimenter(Experimenter o) 
    432408        { 
    433  
    434                 o.linkAnnotation(this); 
    435409                return experimenter_BackReferenceList.add(o); 
    436410        } 
     
    438412        public boolean unlinkExperimenter(Experimenter o) 
    439413        { 
    440  
    441                 o.unlinkAnnotation(this); 
    442414                return experimenter_BackReferenceList.remove(o); 
    443415        } 
     
    466438        public boolean linkPlate(Plate o) 
    467439        { 
    468  
    469                 o.linkAnnotation(this); 
    470440                return plate_BackReferenceList.add(o); 
    471441        } 
     
    473443        public boolean unlinkPlate(Plate o) 
    474444        { 
    475  
    476                 o.unlinkAnnotation(this); 
    477445                return plate_BackReferenceList.remove(o); 
    478446        } 
     
    501469        public boolean linkReagent(Reagent o) 
    502470        { 
    503  
    504                 o.linkAnnotation(this); 
    505471                return reagent_BackReferenceList.add(o); 
    506472        } 
     
    508474        public boolean unlinkReagent(Reagent o) 
    509475        { 
    510  
    511                 o.unlinkAnnotation(this); 
    512476                return reagent_BackReferenceList.remove(o); 
    513477        } 
     
    536500        public boolean linkScreen(Screen o) 
    537501        { 
    538  
    539                 o.linkAnnotation(this); 
    540502                return screen_BackReferenceList.add(o); 
    541503        } 
     
    543505        public boolean unlinkScreen(Screen o) 
    544506        { 
    545  
    546                 o.unlinkAnnotation(this); 
    547507                return screen_BackReferenceList.remove(o); 
    548508        } 
     
    571531        public boolean linkPlateAcquisition(PlateAcquisition o) 
    572532        { 
    573  
    574                 o.linkAnnotation(this); 
    575533                return plateAcquisition_BackReferenceList.add(o); 
    576534        } 
     
    578536        public boolean unlinkPlateAcquisition(PlateAcquisition o) 
    579537        { 
    580  
    581                 o.unlinkAnnotation(this); 
    582538                return plateAcquisition_BackReferenceList.remove(o); 
    583539        } 
     
    606562        public boolean linkWell(Well o) 
    607563        { 
    608  
    609                 o.linkAnnotation(this); 
    610564                return well_BackReferenceList.add(o); 
    611565        } 
     
    613567        public boolean unlinkWell(Well o) 
    614568        { 
    615  
    616                 o.unlinkAnnotation(this); 
    617569                return well_BackReferenceList.remove(o); 
    618570        } 
     
    641593        public boolean linkWellSample(WellSample o) 
    642594        { 
    643  
    644                 o.linkAnnotation(this); 
    645595                return wellSample_BackReferenceList.add(o); 
    646596        } 
     
    648598        public boolean unlinkWellSample(WellSample o) 
    649599        { 
    650  
    651                 o.unlinkAnnotation(this); 
    652600                return wellSample_BackReferenceList.remove(o); 
    653601        } 
     
    676624        public boolean linkROI(ROI o) 
    677625        { 
    678  
    679                 o.linkAnnotation(this); 
    680626                return roi_backReferenceList.add(o); 
    681627        } 
     
    683629        public boolean unlinkROI(ROI o) 
    684630        { 
    685  
    686                 o.unlinkAnnotation(this); 
    687631                return roi_backReferenceList.remove(o); 
    688632        } 
     
    711655        public boolean linkShape(Shape o) 
    712656        { 
    713  
    714                 o.linkAnnotation(this); 
    715657                return shape_BackReferenceList.add(o); 
    716658        } 
     
    718660        public boolean unlinkShape(Shape o) 
    719661        { 
    720  
    721                 o.unlinkAnnotation(this); 
    722662                return shape_BackReferenceList.remove(o); 
    723663        } 
     
    746686        public boolean linkListAnnotation(ListAnnotation o) 
    747687        { 
    748  
    749                 o.linkAnnotation(this); 
    750688                return listAnnotation_BackReferenceList.add(o); 
    751689        } 
     
    753691        public boolean unlinkListAnnotation(ListAnnotation o) 
    754692        { 
    755  
    756                 o.unlinkAnnotation(this); 
    757693                return listAnnotation_BackReferenceList.remove(o); 
    758694        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/AnnotationRef.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    514514        public boolean linkAnnotation(Annotation o) 
    515515        { 
    516  
    517516                o.linkChannel(this); 
    518517                return annotationList.add(o); 
     
    521520        public boolean unlinkAnnotation(Annotation o) 
    522521        { 
    523  
    524522                o.unlinkChannel(this); 
    525523                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/ChannelProfile.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    254254        public boolean linkProject(Project o) 
    255255        { 
    256  
    257256                o.linkDataset(this); 
    258257                return projectList.add(o); 
     
    261260        public boolean unlinkProject(Project o) 
    262261        { 
    263  
    264262                o.unlinkDataset(this); 
    265263                return projectList.remove(o); 
     
    289287        public boolean linkAnnotation(Annotation o) 
    290288        { 
    291  
    292289                o.linkDataset(this); 
    293290                return annotationList.add(o); 
     
    296293        public boolean unlinkAnnotation(Annotation o) 
    297294        { 
    298  
    299295                o.unlinkDataset(this); 
    300296                return annotationList.remove(o); 
     
    324320        public boolean linkImage(Image o) 
    325321        { 
    326  
    327                 o.linkDataset(this); 
    328322                return image_BackReferenceList.add(o); 
    329323        } 
     
    331325        public boolean unlinkImage(Image o) 
    332326        { 
    333  
    334                 o.unlinkDataset(this); 
    335327                return image_BackReferenceList.remove(o); 
    336328        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/DatasetRef.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    156156        public boolean linkFilterSet(FilterSet o) 
    157157        { 
    158  
    159                 o.linkDichroic(this); 
    160158                return filterSet_BackReferenceList.add(o); 
    161159        } 
     
    163161        public boolean unlinkFilterSet(FilterSet o) 
    164162        { 
    165  
    166                 o.unlinkDichroic(this); 
    167163                return filterSet_BackReferenceList.remove(o); 
    168164        } 
     
    191187        public boolean linkLightPath(LightPath o) 
    192188        { 
    193  
    194                 o.linkDichroic(this); 
    195189                return lightPath_BackReferenceList.add(o); 
    196190        } 
     
    198192        public boolean unlinkLightPath(LightPath o) 
    199193        { 
    200  
    201                 o.unlinkDichroic(this); 
    202194                return lightPath_BackReferenceList.remove(o); 
    203195        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/DichroicRef.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    266266        public boolean linkImage(Image o) 
    267267        { 
    268  
    269                 o.linkExperiment(this); 
    270268                return image_BackReferenceList.add(o); 
    271269        } 
     
    273271        public boolean unlinkImage(Image o) 
    274272        { 
    275  
    276                 o.unlinkExperiment(this); 
    277273                return image_BackReferenceList.remove(o); 
    278274        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExperimentRef.java

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    316316        public boolean linkGroup(Group o) 
    317317        { 
    318  
    319318                o.linkExperimenter(this); 
    320319                return groupList.add(o); 
     
    323322        public boolean unlinkGroup(Group o) 
    324323        { 
    325  
    326324                o.unlinkExperimenter(this); 
    327325                return groupList.remove(o); 
     
    351349        public boolean linkAnnotation(Annotation o) 
    352350        { 
    353  
    354351                o.linkExperimenter(this); 
    355352                return annotationList.add(o); 
     
    358355        public boolean unlinkAnnotation(Annotation o) 
    359356        { 
    360  
    361357                o.unlinkExperimenter(this); 
    362358                return annotationList.remove(o); 
     
    386382        public boolean linkImage(Image o) 
    387383        { 
    388  
    389                 o.linkExperimenter(this); 
    390384                return image_BackReferenceList.add(o); 
    391385        } 
     
    393387        public boolean unlinkImage(Image o) 
    394388        { 
    395  
    396                 o.unlinkExperimenter(this); 
    397389                return image_BackReferenceList.remove(o); 
    398390        } 
     
    421413        public boolean linkMicrobeamManipulation(MicrobeamManipulation o) 
    422414        { 
    423  
    424                 o.linkExperimenter(this); 
    425415                return microbeamManipulation_BackReferenceList.add(o); 
    426416        } 
     
    428418        public boolean unlinkMicrobeamManipulation(MicrobeamManipulation o) 
    429419        { 
    430  
    431                 o.unlinkExperimenter(this); 
    432420                return microbeamManipulation_BackReferenceList.remove(o); 
    433421        } 
     
    456444        public boolean linkProject(Project o) 
    457445        { 
    458  
    459                 o.linkExperimenter(this); 
    460446                return project_BackReferenceList.add(o); 
    461447        } 
     
    463449        public boolean unlinkProject(Project o) 
    464450        { 
    465  
    466                 o.unlinkExperimenter(this); 
    467451                return project_BackReferenceList.remove(o); 
    468452        } 
     
    491475        public boolean linkDataset(Dataset o) 
    492476        { 
    493  
    494                 o.linkExperimenter(this); 
    495477                return dataset_BackReferenceList.add(o); 
    496478        } 
     
    498480        public boolean unlinkDataset(Dataset o) 
    499481        { 
    500  
    501                 o.unlinkExperimenter(this); 
    502482                return dataset_BackReferenceList.remove(o); 
    503483        } 
     
    526506        public boolean linkExperiment(Experiment o) 
    527507        { 
    528  
    529                 o.linkExperimenter(this); 
    530508                return experiment_BackReferenceList.add(o); 
    531509        } 
     
    533511        public boolean unlinkExperiment(Experiment o) 
    534512        { 
    535  
    536                 o.unlinkExperimenter(this); 
    537513                return experiment_BackReferenceList.remove(o); 
    538514        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ExperimenterRef.java

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

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    172172        public boolean linkExcitationFilter(Filter o) 
    173173        { 
    174  
    175174                o.linkFilterSet(this); 
    176175                return excitationFilterList.add(o); 
     
    179178        public boolean unlinkExcitationFilter(Filter o) 
    180179        { 
    181  
    182180                o.unlinkFilterSet(this); 
    183181                return excitationFilterList.remove(o); 
     
    226224        public boolean linkEmissionFilter(Filter o) 
    227225        { 
    228  
    229226                o.linkFilterSet(this); 
    230227                return emissionFilterList.add(o); 
     
    233230        public boolean unlinkEmissionFilter(Filter o) 
    234231        { 
    235  
    236232                o.unlinkFilterSet(this); 
    237233                return emissionFilterList.remove(o); 
     
    261257        public boolean linkChannel(Channel o) 
    262258        { 
    263  
    264                 o.linkFilterSet(this); 
    265259                return channel_BackReferenceList.add(o); 
    266260        } 
     
    268262        public boolean unlinkChannel(Channel o) 
    269263        { 
    270  
    271                 o.unlinkFilterSet(this); 
    272264                return channel_BackReferenceList.remove(o); 
    273265        } 
     
    296288        public boolean linkOTF(OTF o) 
    297289        { 
    298  
    299                 o.linkFilterSet(this); 
    300290                return otf_backReferenceList.add(o); 
    301291        } 
     
    303293        public boolean unlinkOTF(OTF o) 
    304294        { 
    305  
    306                 o.unlinkFilterSet(this); 
    307295                return otf_backReferenceList.remove(o); 
    308296        } 
     
    331319        public boolean linkChannelProfile(ChannelProfile o) 
    332320        { 
    333  
    334                 o.linkFilterSet(this); 
    335321                return channelProfile_BackReferenceList.add(o); 
    336322        } 
     
    338324        public boolean unlinkChannelProfile(ChannelProfile o) 
    339325        { 
    340  
    341                 o.unlinkFilterSet(this); 
    342326                return channelProfile_BackReferenceList.remove(o); 
    343327        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/FilterSetRef.java

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    258258        public boolean linkImage(Image o) 
    259259        { 
    260  
    261                 o.linkGroup(this); 
    262260                return image_BackReferenceList.add(o); 
    263261        } 
     
    265263        public boolean unlinkImage(Image o) 
    266264        { 
    267  
    268                 o.unlinkGroup(this); 
    269265                return image_BackReferenceList.remove(o); 
    270266        } 
     
    293289        public boolean linkProject(Project o) 
    294290        { 
    295  
    296                 o.linkGroup(this); 
    297291                return project_BackReferenceList.add(o); 
    298292        } 
     
    300294        public boolean unlinkProject(Project o) 
    301295        { 
    302  
    303                 o.unlinkGroup(this); 
    304296                return project_BackReferenceList.remove(o); 
    305297        } 
     
    328320        public boolean linkDataset(Dataset o) 
    329321        { 
    330  
    331                 o.linkGroup(this); 
    332322                return dataset_BackReferenceList.add(o); 
    333323        } 
     
    335325        public boolean unlinkDataset(Dataset o) 
    336326        { 
    337  
    338                 o.unlinkGroup(this); 
    339327                return dataset_BackReferenceList.remove(o); 
    340328        } 
     
    363351        public boolean linkExperimenter(Experimenter o) 
    364352        { 
    365  
    366                 o.linkGroup(this); 
    367353                return experimenter_BackReferenceList.add(o); 
    368354        } 
     
    370356        public boolean unlinkExperimenter(Experimenter o) 
    371357        { 
    372  
    373                 o.unlinkGroup(this); 
    374358                return experimenter_BackReferenceList.remove(o); 
    375359        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/GroupRef.java

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    389389        public boolean linkDataset(Dataset o) 
    390390        { 
    391  
    392391                o.linkImage(this); 
    393392                return datasetList.add(o); 
     
    396395        public boolean unlinkDataset(Dataset o) 
    397396        { 
    398  
    399397                o.unlinkImage(this); 
    400398                return datasetList.remove(o); 
     
    487485        public boolean linkROI(ROI o) 
    488486        { 
    489  
    490487                o.linkImage(this); 
    491488                return roiList.add(o); 
     
    494491        public boolean unlinkROI(ROI o) 
    495492        { 
    496  
    497493                o.unlinkImage(this); 
    498494                return roiList.remove(o); 
     
    522518        public boolean linkMicrobeamManipulation(MicrobeamManipulation o) 
    523519        { 
    524  
    525520                o.linkImage(this); 
    526521                return microbeamManipulationList.add(o); 
     
    529524        public boolean unlinkMicrobeamManipulation(MicrobeamManipulation o) 
    530525        { 
    531  
    532526                o.unlinkImage(this); 
    533527                return microbeamManipulationList.remove(o); 
     
    557551        public boolean linkAnnotation(Annotation o) 
    558552        { 
    559  
    560553                o.linkImage(this); 
    561554                return annotationList.add(o); 
     
    564557        public boolean unlinkAnnotation(Annotation o) 
    565558        { 
    566  
    567559                o.unlinkImage(this); 
    568560                return annotationList.remove(o); 
     
    592584        public boolean linkWellSample(WellSample o) 
    593585        { 
    594  
    595                 o.linkImage(this); 
    596586                return wellSample_BackReferenceList.add(o); 
    597587        } 
     
    599589        public boolean unlinkWellSample(WellSample o) 
    600590        { 
    601  
    602                 o.unlinkImage(this); 
    603591                return wellSample_BackReferenceList.remove(o); 
    604592        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ImageProfile.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    522522        public boolean linkImage(Image o) 
    523523        { 
    524  
    525                 o.linkInstrument(this); 
    526524                return image_BackReferenceList.add(o); 
    527525        } 
     
    529527        public boolean unlinkImage(Image o) 
    530528        { 
    531  
    532                 o.unlinkInstrument(this); 
    533529                return image_BackReferenceList.remove(o); 
    534530        } 
     
    557553        public boolean linkImageProfile(ImageProfile o) 
    558554        { 
    559  
    560                 o.linkInstrument(this); 
    561555                return imageProfile_BackReferenceList.add(o); 
    562556        } 
     
    564558        public boolean unlinkImageProfile(ImageProfile o) 
    565559        { 
    566  
    567                 o.unlinkInstrument(this); 
    568560                return imageProfile_BackReferenceList.remove(o); 
    569561        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/InstrumentRef.java

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    140140        public boolean linkExcitationFilter(Filter o) 
    141141        { 
    142  
    143142                o.linkLightPath(this); 
    144143                return excitationFilterList.add(o); 
     
    147146        public boolean unlinkExcitationFilter(Filter o) 
    148147        { 
    149  
    150148                o.unlinkLightPath(this); 
    151149                return excitationFilterList.remove(o); 
     
    194192        public boolean linkEmissionFilter(Filter o) 
    195193        { 
    196  
    197194                o.linkLightPath(this); 
    198195                return emissionFilterList.add(o); 
     
    201198        public boolean unlinkEmissionFilter(Filter o) 
    202199        { 
    203  
    204200                o.unlinkLightPath(this); 
    205201                return emissionFilterList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/LightSource.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    132132        public boolean linkAnnotation(Annotation o) 
    133133        { 
    134  
    135134                o.linkListAnnotation(this); 
    136135                return annotationList.add(o); 
     
    139138        public boolean unlinkAnnotation(Annotation o) 
    140139        { 
    141  
    142140                o.unlinkListAnnotation(this); 
    143141                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/LongAnnotation.java

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    192192        public boolean linkROI(ROI o) 
    193193        { 
    194  
    195194                o.linkMicrobeamManipulation(this); 
    196195                return roiList.add(o); 
     
    199198        public boolean unlinkROI(ROI o) 
    200199        { 
    201  
    202200                o.unlinkMicrobeamManipulation(this); 
    203201                return roiList.remove(o); 
     
    277275        public boolean linkImage(Image o) 
    278276        { 
    279  
    280                 o.linkMicrobeamManipulation(this); 
    281277                return image_BackReferenceList.add(o); 
    282278        } 
     
    284280        public boolean unlinkImage(Image o) 
    285281        { 
    286  
    287                 o.unlinkMicrobeamManipulation(this); 
    288282                return image_BackReferenceList.remove(o); 
    289283        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/MicrobeamManipulationRef.java

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    316316        public boolean linkChannel(Channel o) 
    317317        { 
    318  
    319                 o.linkOTF(this); 
    320318                return channel_BackReferenceList.add(o); 
    321319        } 
     
    323321        public boolean unlinkChannel(Channel o) 
    324322        { 
    325  
    326                 o.unlinkOTF(this); 
    327323                return channel_BackReferenceList.remove(o); 
    328324        } 
     
    351347        public boolean linkChannelProfile(ChannelProfile o) 
    352348        { 
    353  
    354                 o.linkOTF(this); 
    355349                return channelProfile_BackReferenceList.add(o); 
    356350        } 
     
    358352        public boolean unlinkChannelProfile(ChannelProfile o) 
    359353        { 
    360  
    361                 o.unlinkOTF(this); 
    362354                return channelProfile_BackReferenceList.remove(o); 
    363355        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/OTFRef.java

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    572572        public boolean linkAnnotation(Annotation o) 
    573573        { 
    574  
    575574                o.linkPixels(this); 
    576575                return annotationList.add(o); 
     
    579578        public boolean unlinkAnnotation(Annotation o) 
    580579        { 
    581  
    582580                o.unlinkPixels(this); 
    583581                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/Plane.java

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    320320        public boolean linkAnnotation(Annotation o) 
    321321        { 
    322  
    323322                o.linkPlane(this); 
    324323                return annotationList.add(o); 
     
    327326        public boolean unlinkAnnotation(Annotation o) 
    328327        { 
    329  
    330328                o.unlinkPlane(this); 
    331329                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/Plate.java

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    462462        public boolean linkAnnotation(Annotation o) 
    463463        { 
    464  
    465464                o.linkPlate(this); 
    466465                return annotationList.add(o); 
     
    469468        public boolean unlinkAnnotation(Annotation o) 
    470469        { 
    471  
    472470                o.unlinkPlate(this); 
    473471                return annotationList.remove(o); 
     
    528526        public boolean linkScreen(Screen o) 
    529527        { 
    530  
    531                 o.linkPlate(this); 
    532528                return screen_BackReferenceList.add(o); 
    533529        } 
     
    535531        public boolean unlinkScreen(Screen o) 
    536532        { 
    537  
    538                 o.unlinkPlate(this); 
    539533                return screen_BackReferenceList.remove(o); 
    540534        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/PlateAcquisition.java

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    264264        public boolean linkWellSample(WellSample o) 
    265265        { 
    266  
    267266                o.linkPlateAcquisition(this); 
    268267                return wellSampleList.add(o); 
     
    271270        public boolean unlinkWellSample(WellSample o) 
    272271        { 
    273  
    274272                o.unlinkPlateAcquisition(this); 
    275273                return wellSampleList.remove(o); 
     
    299297        public boolean linkAnnotation(Annotation o) 
    300298        { 
    301  
    302299                o.linkPlateAcquisition(this); 
    303300                return annotationList.add(o); 
     
    306303        public boolean unlinkAnnotation(Annotation o) 
    307304        { 
    308  
    309305                o.unlinkPlateAcquisition(this); 
    310306                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/PlateRef.java

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    250250        public boolean linkAnnotation(Annotation o) 
    251251        { 
    252  
    253252                o.linkProject(this); 
    254253                return annotationList.add(o); 
     
    257256        public boolean unlinkAnnotation(Annotation o) 
    258257        { 
    259  
    260258                o.unlinkProject(this); 
    261259                return annotationList.remove(o); 
     
    285283        public boolean linkDataset(Dataset o) 
    286284        { 
    287  
    288                 o.linkProject(this); 
    289285                return dataset_BackReferenceList.add(o); 
    290286        } 
     
    292288        public boolean unlinkDataset(Dataset o) 
    293289        { 
    294  
    295                 o.unlinkProject(this); 
    296290                return dataset_BackReferenceList.remove(o); 
    297291        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ProjectRef.java

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    246246        public boolean linkAnnotation(Annotation o) 
    247247        { 
    248  
    249248                o.linkROI(this); 
    250249                return annotationList.add(o); 
     
    253252        public boolean unlinkAnnotation(Annotation o) 
    254253        { 
    255  
    256254                o.unlinkROI(this); 
    257255                return annotationList.remove(o); 
     
    292290        public boolean linkImage(Image o) 
    293291        { 
    294  
    295                 o.linkROI(this); 
    296292                return image_BackReferenceList.add(o); 
    297293        } 
     
    299295        public boolean unlinkImage(Image o) 
    300296        { 
    301  
    302                 o.unlinkROI(this); 
    303297                return image_BackReferenceList.remove(o); 
    304298        } 
     
    327321        public boolean linkMicrobeamManipulation(MicrobeamManipulation o) 
    328322        { 
    329  
    330                 o.linkROI(this); 
    331323                return microbeamManipulation_BackReferenceList.add(o); 
    332324        } 
     
    334326        public boolean unlinkMicrobeamManipulation(MicrobeamManipulation o) 
    335327        { 
    336  
    337                 o.unlinkROI(this); 
    338328                return microbeamManipulation_BackReferenceList.remove(o); 
    339329        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ROIRef.java

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    224224        public boolean linkAnnotation(Annotation o) 
    225225        { 
    226  
    227226                o.linkReagent(this); 
    228227                return annotationList.add(o); 
     
    231230        public boolean unlinkAnnotation(Annotation o) 
    232231        { 
    233  
    234232                o.unlinkReagent(this); 
    235233                return annotationList.remove(o); 
     
    259257        public boolean linkWell(Well o) 
    260258        { 
    261  
    262                 o.linkReagent(this); 
    263259                return well_BackReferenceList.add(o); 
    264260        } 
     
    266262        public boolean unlinkWell(Well o) 
    267263        { 
    268  
    269                 o.unlinkReagent(this); 
    270264                return well_BackReferenceList.remove(o); 
    271265        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ReagentRef.java

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    390390        public boolean linkAnnotation(Annotation o) 
    391391        { 
    392  
    393392                o.linkScreen(this); 
    394393                return annotationList.add(o); 
     
    397396        public boolean unlinkAnnotation(Annotation o) 
    398397        { 
    399  
    400398                o.unlinkScreen(this); 
    401399                return annotationList.remove(o); 
     
    425423        public boolean linkPlate(Plate o) 
    426424        { 
    427  
    428                 o.linkScreen(this); 
    429425                return plate_BackReferenceList.add(o); 
    430426        } 
     
    432428        public boolean unlinkPlate(Plate o) 
    433429        { 
    434  
    435                 o.unlinkScreen(this); 
    436430                return plate_BackReferenceList.remove(o); 
    437431        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/ScreenRef.java

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    604604        public boolean linkAnnotation(Annotation o) 
    605605        { 
    606  
    607606                o.linkShape(this); 
    608607                return annotationList.add(o); 
     
    611610        public boolean unlinkAnnotation(Annotation o) 
    612611        { 
    613  
    614612                o.unlinkShape(this); 
    615613                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/StageLabel.java

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

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

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

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

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

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

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

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

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    338338        public boolean linkAnnotation(Annotation o) 
    339339        { 
    340  
    341340                o.linkWell(this); 
    342341                return annotationList.add(o); 
     
    345344        public boolean unlinkAnnotation(Annotation o) 
    346345        { 
    347  
    348346                o.unlinkWell(this); 
    349347                return annotationList.remove(o); 
  • trunk/components/ome-xml/src/ome/xml/r201004/WellSample.java

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    259259        public boolean linkAnnotation(Annotation o) 
    260260        { 
    261  
    262261                o.linkWellSample(this); 
    263262                return annotationList.add(o); 
     
    266265        public boolean unlinkAnnotation(Annotation o) 
    267266        { 
    268  
    269267                o.unlinkWellSample(this); 
    270268                return annotationList.remove(o); 
     
    294292        public boolean linkPlateAcquisition(PlateAcquisition o) 
    295293        { 
    296  
    297                 o.linkWellSample(this); 
    298294                return plateAcquisition_BackReferenceList.add(o); 
    299295        } 
     
    301297        public boolean unlinkPlateAcquisition(PlateAcquisition o) 
    302298        { 
    303  
    304                 o.unlinkWellSample(this); 
    305299                return plateAcquisition_BackReferenceList.remove(o); 
    306300        } 
  • trunk/components/ome-xml/src/ome/xml/r201004/WellSampleRef.java

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

    r6171 r6172  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2010-04-22 16:29:38+0100 
     34 * Created by callan via xsd-fu on 2010-04-22 16:50:50+0100 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
  • trunk/components/ome-xml/test/ome/xml/utests/InOut201004Test.java

    r6171 r6172  
    6262import ome.xml.r201004.ListAnnotation; 
    6363import ome.xml.r201004.LongAnnotation; 
     64import ome.xml.r201004.Objective; 
     65import ome.xml.r201004.ObjectiveSettings; 
    6466import ome.xml.r201004.StringAnnotation; 
    6567import ome.xml.r201004.StructuredAnnotations; 
     
    132134  private static String EX_FILTER_ID = "Filter:1"; 
    133135 
     136  private static String OBJECTIVE_ID = "Objective:0"; 
     137 
    134138  private static String OTF_ID = "OTF:0"; 
    135139 
     
    160164 
    161165  private static final String LIGHTSOURCE_MODEL = "ReallyBright!"; 
     166 
     167  private static final String OBJECTIVE_MODEL = "ReallyClear!"; 
    162168 
    163169  private static final String DICHROIC_SN = "0123456789"; 
     
    339345  } 
    340346 
     347  @Test(dependsOnMethods={"testValidInstrumentNode"}) 
     348  public void testValidObjectiveNode() 
     349  { 
     350    Objective objective = ome.getInstrument(0).getObjective(0); 
     351    assertNotNull(objective); 
     352    assertEquals(OBJECTIVE_ID, objective.getID()); 
     353    assertEquals(OBJECTIVE_MODEL, objective.getModel()); 
     354  } 
     355 
    341356  @Test(dependsOnMethods={"testValidDichroicNode"}) 
    342357  public void testValidFilterSetNode() { 
     
    379394    assertEquals(OTF_SIZE_Y, otf.getSizeY()); 
    380395    assertEquals(OTF_OPTICAL_AXIS_AVERAGED, otf.getOpticalAxisAveraged()); 
     396    ObjectiveSettings otfObjectiveSettings = otf.getObjectiveSettings(); 
     397    assertNotNull(otfObjectiveSettings); 
     398    assertEquals(OBJECTIVE_ID, otfObjectiveSettings.getID()); 
    381399    assertEquals(otf, ome.getInstrument(0).getFilterSet(0).getLinkedOTF(0)); 
    382400  } 
     
    531549    Filter exFilter = new Filter(); 
    532550    OTF otf = new OTF(); 
     551    // Create <Objective/> under <Instrument/> 
     552    Objective objective = new Objective(); 
     553    objective.setID(OBJECTIVE_ID); 
     554    objective.setModel(OBJECTIVE_MODEL); 
    533555 
    534556    emFilter.setID(EM_FILTER_ID); 
     
    541563    otf.setSizeY(OTF_SIZE_Y); 
    542564    otf.setOpticalAxisAveraged(OTF_OPTICAL_AXIS_AVERAGED); 
     565    ObjectiveSettings otfObjectiveSettings = new ObjectiveSettings(); 
     566    otfObjectiveSettings.setID(objective.getID()); 
     567    otf.setObjectiveSettings(otfObjectiveSettings); 
    543568 
    544569    instrument.addFilter(emFilter); 
    545570    instrument.addFilter(exFilter); 
    546571    instrument.addOTF(otf); 
     572    instrument.addObjective(objective); 
    547573 
    548574    filterSet.linkEmissionFilter(emFilter); 
Note: See TracChangeset for help on using the changeset viewer.