Changeset 3110


Ignore:
Timestamp:
08/28/07 08:23:59 (12 years ago)
Author:
curtis
Message:

Fix more compile errors.

Location:
trunk/loci
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/ome/editor/MetadataPane.java

    r3015 r3110  
    3838import loci.formats.*; 
    3939import loci.formats.in.*; 
    40 import loci.formats.ome.OMEXMLMetadataStore; 
     40import loci.formats.ome.OMEXMLMetadata; 
    4141import loci.formats.out.*; 
    4242import org.openmicroscopy.xml.*; 
     
    155155  protected Hashtable tiffDataStore; 
    156156 
    157   protected OMEXMLMetadataStore ms; 
     157  protected OMEXMLMetadata ms; 
    158158 
    159159  // -- Fields - raw panel -- 
     
    501501      String id = currentFile.getPath(); 
    502502      ImageReader read = new ImageReader(); 
    503       OMEXMLMetadataStore oms = new OMEXMLMetadataStore(); 
     503      OMEXMLMetadata oms = new OMEXMLMetadata(); 
    504504      read.setMetadataStore(oms); 
    505505 
     
    762762      try { 
    763763        reader = new ImageReader(); 
    764         ms = new OMEXMLMetadataStore(); 
     764        ms = new OMEXMLMetadata(); 
    765765        ms.createRoot(); 
    766766 
  • trunk/loci/ome/notes/Notes.java

    r3015 r3110  
    373373 
    374374      if (currentRoot == null) { 
    375         OMEXMLMetadataStore tmp = new OMEXMLMetadataStore(); 
    376         tmp.createRoot(); 
     375        OMEXMLMetadata tmp = new OMEXMLMetadata(); 
    377376        currentRoot = (OMENode) tmp.getRoot(); 
    378377      } 
     
    382381      // always save to the current filename + ".ome" 
    383382 
    384       OMEXMLMetadataStore store = new OMEXMLMetadataStore(); 
     383      OMEXMLMetadata store = new OMEXMLMetadata(); 
    385384      store.setRoot(currentRoot); 
    386385 
     
    576575      } 
    577576 
    578       reader.setMetadataStore(new OMEXMLMetadataStore()); 
     577      reader.setMetadataStore(new OMEXMLMetadata()); 
    579578      reader.setId(currentFile); 
    580       OMEXMLMetadataStore store = 
    581         (OMEXMLMetadataStore) reader.getMetadataStore(); 
     579      OMEXMLMetadata store = 
     580        (OMEXMLMetadata) reader.getMetadataStore(); 
    582581 
    583582      if (companion.exists()) { 
  • trunk/loci/plugins/Importer.java

    r3015 r3110  
    3838import loci.formats.*; 
    3939import loci.formats.ome.OMEReader; 
    40 import loci.formats.ome.OMEXMLMetadataStore; 
     40import loci.formats.ome.OMEXMLMetadata; 
    4141import loci.plugins.browser.LociDataBrowser; 
    4242 
     
    113113      r = new OMEReader(); 
    114114    } 
    115     OMEXMLMetadataStore store = new OMEXMLMetadataStore(); 
     115    OMEXMLMetadata store = new OMEXMLMetadata(); 
    116116    r.setMetadataStore(store); 
    117117 
     
    585585   */ 
    586586  private void showStack(ImageStack stack, String file, String series, 
    587     OMEXMLMetadataStore store, int cCount, int zCount, int tCount, 
     587    OMEXMLMetadata store, int cCount, int zCount, int tCount, 
    588588    int sizeZ, int sizeC, int sizeT, FileInfo fi, IFormatReader r, 
    589589    FileStitcher fs, ImporterOptions options) 
     
    652652      imp.setProperty("Info", "File full path=" + file + 
    653653        "\nSeries name=" + series + "\n"); 
    654       applyCalibration((OMEXMLMetadataStore) r.getMetadataStore(), imp, 
     654      applyCalibration((OMEXMLMetadata) r.getMetadataStore(), imp, 
    655655        r.getSeries()); 
    656656 
     
    825825 
    826826  /** Applies spatial calibrations to an image stack. */ 
    827   private void applyCalibration(OMEXMLMetadataStore store, 
     827  private void applyCalibration(OMEXMLMetadata store, 
    828828    ImagePlus imp, int series) 
    829829  { 
  • trunk/loci/plugins/LociFunctions.java

    r3086 r3110  
    99import javax.swing.JOptionPane; 
    1010import loci.formats.*; 
    11 import loci.formats.ome.OMEXMLMetadataStore; 
     11import loci.formats.ome.OMEXMLMetadata; 
    1212 
    1313/** 
     
    2727  public LociFunctions() { 
    2828    r = new FileStitcher(true); 
    29     r.setMetadataStore(new OMEXMLMetadataStore()); 
     29    r.setMetadataStore(new OMEXMLMetadata()); 
    3030  } 
    3131 
     
    178178 
    179179  public void getSeriesName(String[] seriesName) { 
    180     OMEXMLMetadataStore ms = (OMEXMLMetadataStore) r.getMetadataStore(); 
     180    OMEXMLMetadata ms = (OMEXMLMetadata) r.getMetadataStore(); 
    181181    seriesName[0] = ms.getImageName(new Integer(r.getSeries())); 
    182182  } 
  • trunk/loci/plugins/LociUploader.java

    r3109 r3110  
    3434import java.util.HashSet; 
    3535import loci.formats.FormatTools; 
    36 import loci.formats.ome.OMEXMLMetadataStore; 
     36import loci.formats.ome.OMEXMLMetadata; 
    3737import loci.formats.ome.OMEWriter; 
    3838 
     
    116116      ImageStack is = imp.getImageStack(); 
    117117      FileInfo fi = imp.getOriginalFileInfo(); 
    118       OMEXMLMetadataStore store = new OMEXMLMetadataStore(); 
     118      OMEXMLMetadata store = new OMEXMLMetadata(); 
    119119 
    120120      // if we opened this stack with the Bio-Formats importer, then the 
  • trunk/loci/plugins/browser/ImagePlusWrapper.java

    r2725 r3110  
    3030import java.io.IOException; 
    3131import loci.formats.*; 
    32 import loci.formats.ome.OMEXMLMetadataStore; 
     32import loci.formats.ome.OMEXMLMetadata; 
    3333 
    3434public class ImagePlusWrapper { 
     
    4949    boolean stitch) throws IOException, FormatException 
    5050  { 
    51     store = new OMEXMLMetadataStore(); 
     51    store = new OMEXMLMetadata(); 
    5252    synchronized (r) { 
    5353      try { 
  • trunk/loci/plugins/browser/LociDataBrowser.java

    r3015 r3110  
    3333import java.io.PrintStream; 
    3434import loci.formats.*; 
    35 import loci.formats.ome.OMEXMLMetadataStore; 
     35import loci.formats.ome.OMEXMLMetadata; 
    3636 
    3737/** 
     
    319319 
    320320        MetadataStore store = reader.getMetadataStore(); 
    321         if (store instanceof OMEXMLMetadataStore) { 
    322           fi.description = ((OMEXMLMetadataStore) store).dumpXML(); 
     321        if (store instanceof OMEXMLMetadata) { 
     322          fi.description = ((OMEXMLMetadata) store).dumpXML(); 
    323323        } 
    324324 
     
    342342 
    343343        MetadataStore store = ipw.store; 
    344         if (store instanceof OMEXMLMetadataStore) { 
    345           fi.description = ((OMEXMLMetadataStore) store).dumpXML(); 
     344        if (store instanceof OMEXMLMetadata) { 
     345          fi.description = ((OMEXMLMetadata) store).dumpXML(); 
    346346        } 
    347347 
Note: See TracChangeset for help on using the changeset viewer.