Changeset 5901 for branches/cleanup


Ignore:
Timestamp:
02/11/10 10:21:49 (10 years ago)
Author:
melissa
Message:

Fixed IMetadata template for bf-ice.

Location:
branches/cleanup/components
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/cleanup/components/autogen/src/ice/IMetadataI.vm

    r5490 r5901  
    3232package loci.ice.formats; 
    3333 
     34import java.io.IOException; 
     35import javax.xml.parsers.ParserConfigurationException; 
    3436import Ice.Current; 
     37import loci.common.dependency.DependencyException; 
     38import loci.common.dependency.ServiceFactory; 
    3539import loci.formats.MetadataTools; 
    3640import loci.formats.meta.IMetadata; 
     41import loci.formats.ome.OMEXMLService; 
     42import org.xml.sax.SAXException; 
    3743 
    3844/** 
     
    5258 
    5359  private IMetadata metadataObject; 
     60  private OMEXMLService service; 
    5461 
    5562  // -- Constructor -- 
    5663 
    5764  public IMetadataI() { 
    58     metadataObject = MetadataTools.createOMEXMLMetadata(); 
     65    try { 
     66      ServiceFactory factory = new ServiceFactory(); 
     67      service = factory.getInstance(OMEXMLService.class); 
     68      metadataObject = service.createOMEXMLMetadata(); 
     69    } 
     70    catch (DependencyException de) { } 
     71    catch (ParserConfigurationException pce) { } 
     72    catch (SAXException se) { } 
     73    catch (IOException e) { } 
    5974  } 
    6075 
     
    7287 
    7388  public String getOMEXML(Current current) { 
    74     return MetadataTools.getOMEXML(metadataObject); 
     89    try { 
     90      return service.getOMEXML(metadataObject); 
     91    } 
     92    catch (ParserConfigurationException pce) { } 
     93    catch (SAXException se) { } 
     94    catch (IOException e) { } 
     95    return null; 
    7596  } 
    7697 
  • branches/cleanup/components/bf-ice/src/bio-formats.ice

    r5624 r5901  
    55/* 
    66OME Bio-Formats package for reading and converting biological file formats. 
    7 Copyright (C) 2005-2009 UW-Madison LOCI and Glencoe Software, Inc. 
     7Copyright (C) 2005-2010 UW-Madison LOCI and Glencoe Software, Inc. 
    88 
    99This program is free software; you can redistribute it and/or modify 
     
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on Oct 20, 2009 12:57:18 AM EDT 
     27 * Created by melissa via MetadataAutogen on Feb 11, 2010 10:18:29 AM CST 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
  • branches/cleanup/components/bf-ice/src/loci/ice/formats/IMetadataI.java

    r5624 r5901  
    55/* 
    66OME Bio-Formats package for reading and converting biological file formats. 
    7 Copyright (C) 2005-2009 UW-Madison LOCI and Glencoe Software, Inc. 
     7Copyright (C) 2005-2010 UW-Madison LOCI and Glencoe Software, Inc. 
    88 
    99This program is free software; you can redistribute it and/or modify 
     
    2525 * 
    2626 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    27  * Created by curtis via MetadataAutogen on Oct 20, 2009 12:57:18 AM EDT 
     27 * Created by melissa via MetadataAutogen on Feb 11, 2010 10:18:29 AM CST 
    2828 * 
    2929 *----------------------------------------------------------------------------- 
     
    3232package loci.ice.formats; 
    3333 
     34import java.io.IOException; 
     35import javax.xml.parsers.ParserConfigurationException; 
    3436import Ice.Current; 
     37import loci.common.dependency.DependencyException; 
     38import loci.common.dependency.ServiceFactory; 
    3539import loci.formats.MetadataTools; 
    3640import loci.formats.meta.IMetadata; 
     41import loci.formats.ome.OMEXMLService; 
     42import org.xml.sax.SAXException; 
    3743 
    3844/** 
     
    5258 
    5359  private IMetadata metadataObject; 
     60  private OMEXMLService service; 
    5461 
    5562  // -- Constructor -- 
    5663 
    5764  public IMetadataI() { 
    58     metadataObject = MetadataTools.createOMEXMLMetadata(); 
     65    try { 
     66      ServiceFactory factory = new ServiceFactory(); 
     67      service = factory.getInstance(OMEXMLService.class); 
     68      metadataObject = service.createOMEXMLMetadata(); 
     69    } 
     70    catch (DependencyException de) { } 
     71    catch (ParserConfigurationException pce) { } 
     72    catch (SAXException se) { } 
     73    catch (IOException e) { } 
    5974  } 
    6075 
     
    7287 
    7388  public String getOMEXML(Current current) { 
    74     return MetadataTools.getOMEXML(metadataObject); 
     89    try { 
     90      return service.getOMEXML(metadataObject); 
     91    } 
     92    catch (ParserConfigurationException pce) { } 
     93    catch (SAXException se) { } 
     94    catch (IOException e) { } 
     95    return null; 
    7596  } 
    7697 
Note: See TracChangeset for help on using the changeset viewer.