Changeset 3121


Ignore:
Timestamp:
08/30/07 10:38:46 (13 years ago)
Author:
curtis
Message:

Fix compile errors.

Location:
trunk/utils
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils/ConvertToOmeTiff.java

    r2765 r3121  
    66import java.util.Hashtable; 
    77import loci.formats.*; 
    8 import loci.formats.ome.OMEXMLMetadataStore; 
     8import loci.formats.ome.OMEXMLMetadata; 
    99import loci.formats.out.TiffWriter; 
    1010 
     
    2020    TiffWriter writer = new TiffWriter(); 
    2121    // record metadata to OME-XML format 
    22     OMEXMLMetadataStore store = new OMEXMLMetadataStore(); 
    23     reader.setMetadataStore(store); 
     22    OMEXMLMetadata omexmlMeta = new OMEXMLMetadata(); 
     23    reader.setMetadataStore(omexmlMeta); 
    2424    for (int i=0; i<args.length; i++) { 
    2525      String id = args[i]; 
     
    3030      // insert TiffData element into OME-XML 
    3131      // currently handles only single series (single Image, single Pixels) 
    32       String xml = store.dumpXML(); 
     32      String xml = omexmlMeta.dumpXML(); 
    3333      int pix = xml.indexOf("<Pixels "); 
    3434      int end = xml.indexOf("/>", pix); 
  • trunk/utils/EditImageName.java

    r2587 r3121  
    44 
    55import loci.formats.ImageReader; 
    6 import loci.formats.ome.OMEXMLMetadataStore; 
     6import loci.formats.ome.OMEXMLMetadata; 
    77import org.openmicroscopy.xml.ImageNode; 
    88import org.openmicroscopy.xml.OMENode; 
     
    1818    ImageReader reader = new ImageReader(); 
    1919    // record metadata to OME-XML format 
    20     reader.setMetadataStore(new OMEXMLMetadataStore()); 
     20    reader.setMetadataStore(new OMEXMLMetadata()); 
    2121    String id = args[0]; 
    2222    System.out.print("Reading metadata "); 
    2323    reader.setId(id);  
    24     OMEXMLMetadataStore store = 
    25       (OMEXMLMetadataStore) reader.getMetadataStore(); 
     24    OMEXMLMetadata store = (OMEXMLMetadata) reader.getMetadataStore(); 
    2625    System.out.println(" [done]"); 
    2726    // get OME root node 
  • trunk/utils/MakeLZW.java

    r2765 r3121  
    77import org.openmicroscopy.xml.OMENode; 
    88import loci.formats.*; 
    9 import loci.formats.ome.OMEXMLMetadataStore; 
     9import loci.formats.ome.OMEXMLMetadata; 
    1010import loci.formats.out.TiffWriter; 
    1111 
     
    1515  public static void main(String[] args) throws Exception { 
    1616    ImageReader reader = new ImageReader(); 
    17     OMEXMLMetadataStore ms = new OMEXMLMetadataStore(); 
    18     reader.setMetadataStore(ms); 
     17    OMEXMLMetadata omexmlMeta = new OMEXMLMetadata(); 
     18    reader.setMetadataStore(omexmlMeta); 
    1919    TiffWriter writer = new TiffWriter(); 
    2020    for (int i=0; i<args.length; i++) { 
     
    2525      writer.setId(nf); 
    2626      int blocks = reader.getImageCount(); 
    27       OMENode ome = (OMENode) ms.getRoot(); 
     27      OMENode ome = (OMENode) omexmlMeta.getRoot(); 
    2828      for (int b=0; b<blocks; b++) { 
    2929        System.out.print("."); 
  • trunk/utils/XMLIndent.java

    r2606 r3121  
    55import java.io.BufferedReader; 
    66import java.io.FileReader; 
    7 import loci.formats.FormatTools; 
     7import loci.formats.MetadataTools; 
    88 
    99/** Indents XML to be more readable. Does not handle CDATA. */ 
     
    2121      } 
    2222      in.close(); 
    23       System.out.println(FormatTools.indentXML(sb.toString())); 
     23      System.out.println(MetadataTools.indentXML(sb.toString())); 
    2424    } 
    2525  } 
Note: See TracChangeset for help on using the changeset viewer.