Changeset 6428


Ignore:
Timestamp:
06/01/10 10:34:59 (9 years ago)
Author:
callan
Message:

Reverting r6427.

Location:
trunk/components/bio-formats/src/loci/formats
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/meta/MetadataRetrieve.java

    r6413 r6428  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-05-28 12:37:01.222862 
     35 * Created by callan via xsd-fu on 2010-06-01 11:44:50.965032 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    640640 
    641641        // 
    642         // EmissionFilterRef property storage 
    643         // 
    644         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    645         // Is multi path? True 
    646  
    647         // 
    648         // ExcitationFilterRef property storage 
    649         // 
    650         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    651         // Is multi path? True 
    652  
    653         // 
    654642        // ExcitationFilterRef property storage 
    655643        // 
  • trunk/components/bio-formats/src/loci/formats/meta/MetadataStore.java

    r6413 r6428  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-05-28 12:36:56.007582 
     35 * Created by callan via xsd-fu on 2010-06-01 11:45:36.959537 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    447447 
    448448        // 
    449         // EmissionFilterRef property storage 
    450         // 
    451         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    452         // Is multi path? True 
    453  
    454         // 
    455         // ExcitationFilterRef property storage 
    456         // 
    457         // {u'LightPath': {u'Channel': {u'Pixels': {u'Image': {u'OME': None}}}}, u'FilterSet': {u'Instrument': {u'OME': None}}} 
    458         // Is multi path? True 
    459  
    460         // 
    461449        // ExcitationFilterRef property storage 
    462450        // 
  • trunk/components/bio-formats/src/loci/formats/services/OMEXMLServiceImpl.java

    r6427 r6428  
    7272 
    7373  /** Reordering stylesheet. */ 
    74   private static Templates reorderXSLT; 
     74  private static Templates reorderXSLT = 
     75    XMLTools.getStylesheet("/loci/formats/meta/reorder-2008-09.xsl", 
     76    OMEXMLServiceImpl.class); 
    7577 
    7678  /** Stylesheets for updating from previous schema releases. */ 
    77   private static Templates UPDATE_2003FC; 
    78   private static Templates UPDATE_2006LO; 
    79   private static Templates UPDATE_200706; 
    80   private static Templates UPDATE_200802; 
    81   private static Templates UPDATE_200809; 
    82   private static Templates UPDATE_200909; 
     79  private static Templates UPDATE_2003FC = 
     80    XMLTools.getStylesheet("/loci/formats/meta/2003-FC-to-2008-09.xsl", 
     81    OMEXMLServiceImpl.class); 
     82  private static Templates UPDATE_2006LO = 
     83    XMLTools.getStylesheet("/loci/formats/meta/2006-LO-to-2008-09.xsl", 
     84    OMEXMLServiceImpl.class); 
     85  private static Templates UPDATE_200706 = 
     86    XMLTools.getStylesheet("/loci/formats/meta/2007-06-to-2008-09.xsl", 
     87    OMEXMLServiceImpl.class); 
     88  private static Templates UPDATE_200802 = 
     89    XMLTools.getStylesheet("/loci/formats/meta/2008-02-to-2008-09.xsl", 
     90    OMEXMLServiceImpl.class); 
     91  private static Templates UPDATE_200809 = 
     92    XMLTools.getStylesheet("/loci/formats/meta/2008-09-to-2009-09.xsl", 
     93    OMEXMLServiceImpl.class); 
     94  private static Templates UPDATE_200909 = 
     95    XMLTools.getStylesheet("/loci/formats/meta/2009-09-to-2010-04.xsl", 
     96    OMEXMLServiceImpl.class); 
    8397 
    8498  /** 
     
    87101  public OMEXMLServiceImpl() { 
    88102    checkClassDependency(ome.xml.r201004.OMEModelObject.class); 
    89     System.setProperty("javax.xml.transform.TransformerFactory", 
    90 //                       "net.sf.saxon.TransformerFactoryImpl"); 
    91 //                       "org.apache.xalan.processor.TransformerFactoryImpl"); 
    92                        "com.icl.saxon.TransformerFactoryImpl"); 
    93  
    94     reorderXSLT = 
    95       XMLTools.getStylesheet("/loci/formats/meta/reorder-2008-09.xsl", 
    96       OMEXMLServiceImpl.class); 
    97     UPDATE_2003FC = 
    98       XMLTools.getStylesheet("/loci/formats/meta/2003-FC-to-2008-09.xsl", 
    99       OMEXMLServiceImpl.class); 
    100     UPDATE_2006LO = 
    101       XMLTools.getStylesheet("/loci/formats/meta/2006-LO-to-2008-09.xsl", 
    102       OMEXMLServiceImpl.class); 
    103     UPDATE_200706 = 
    104       XMLTools.getStylesheet("/loci/formats/meta/2007-06-to-2008-09.xsl", 
    105       OMEXMLServiceImpl.class); 
    106     UPDATE_200802 = 
    107       XMLTools.getStylesheet("/loci/formats/meta/2008-02-to-2008-09.xsl", 
    108       OMEXMLServiceImpl.class); 
    109     UPDATE_200809 = 
    110       XMLTools.getStylesheet("/loci/formats/meta/2008-09-to-2009-09.xsl", 
    111       OMEXMLServiceImpl.class); 
    112     UPDATE_200909 = 
    113       XMLTools.getStylesheet("/loci/formats/meta/2009-09-to-2010-04.xsl", 
    114       OMEXMLServiceImpl.class); 
    115103  } 
    116104 
Note: See TracChangeset for help on using the changeset viewer.