Changeset 4065


Ignore:
Timestamp:
05/23/08 16:40:51 (12 years ago)
Author:
curtis
Message:

Update MetadataStore to handle SPW data model in ome.xml.r20xxxx.spw packages.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/auto/MetaEntityList.java

    r4048 r4065  
    6161  public String basePackage() { return value("basePackage"); } 
    6262 
    63   public String subPackage() { return value("subPackage"); } 
    64  
    6563  public String version() { return value("version"); } 
     64 
     65  public boolean spwImport() { return !"false".equals(value("spwImport")); } 
    6666 
    6767  // -- MetaEntityList API methods - entities -- 
  • trunk/loci/formats/auto/OMEXMLMetadata.vm

    r4050 r4065  
    3232package loci.formats.ome; 
    3333 
    34 import $q.basePackage().$q.subPackage().*; 
     34import ${q.basePackage()}.ome.*; 
     35#if ($q.spwImport()) 
     36import ${q.basePackage()}.spw.*; 
     37#end##if spwImport 
    3538import java.util.List; 
    3639import loci.formats.LogTools; 
  • trunk/loci/formats/auto/entities.txt

    r4064 r4065  
    11561156description = the institution to which the experimenter belongs 
    11571157 
    1158 ### Entities for ScreenPlateWell ### 
     1158### Entities for high-content screening ### 
    11591159 
    11601160## Plate ## 
  • trunk/loci/formats/auto/versions.txt

    r4051 r4065  
    2626id = OMEXML200802Metadata.java 
    2727basePackage = ome.xml.r200802 
    28 subPackage = ome 
    2928version = 2008-02 
    3029 
     
    3332id = OMEXML200706Metadata.java 
    3433basePackage = ome.xml.r200706 
    35 subPackage = ome 
    3634version = 2007-06 
    3735 
     
    4038id = OMEXML2003FCMetadata.java 
    4139basePackage = ome.xml.r2003fc 
    42 subPackage = ome 
    4340version = 2003-FC 
     41spwImport = false 
  • trunk/loci/formats/meta/AggregateMetadata.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/meta/DummyMetadata.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/meta/FilterMetadata.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/meta/MetadataConverter.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/meta/MetadataRetrieve.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/meta/MetadataStore.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/ome/OMEXML2003FCMetadata.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • trunk/loci/formats/ome/OMEXML200706Metadata.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    3333 
    3434import ome.xml.r200706.ome.*; 
     35import ome.xml.r200706.spw.*; 
    3536import java.util.List; 
    3637import loci.formats.LogTools; 
  • trunk/loci/formats/ome/OMEXML200802Metadata.java

    r4064 r4065  
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on May 22, 2008 8:17:46 PM GMT 
     27 * Created by curtis via MetadataAutogen on May 23, 2008 4:44:30 PM CDT 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    3333 
    3434import ome.xml.r200802.ome.*; 
     35import ome.xml.r200802.spw.*; 
    3536import java.util.List; 
    3637import loci.formats.LogTools; 
Note: See TracChangeset for help on using the changeset viewer.