Changeset 2327


Ignore:
Timestamp:
02/23/07 13:12:23 (13 years ago)
Author:
curtis
Message:

Rearrange Bio-Formats OME logic into loci.formats.ome package.

Location:
trunk/loci
Files:
2 added
1 deleted
14 edited
3 copied
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/loci/apps/stitcher/MovieStitcher.java

    r2268 r2327  
    2121import javax.swing.event.*; 
    2222import loci.formats.*; 
     23import loci.formats.ome.OMEXMLMetadataStore; 
    2324import loci.formats.out.TiffWriter; 
    2425import org.openmicroscopy.xml.*; 
  • trunk/loci/formats/in/OMEXMLReader.java

    r2320 r2327  
    3030import java.util.zip.*; 
    3131import loci.formats.*; 
     32import loci.formats.ome.OMEXMLMetadataStore; 
    3233import org.openmicroscopy.xml.OMENode; 
    3334 
  • trunk/loci/formats/in/TiffReader.java

    r2292 r2327  
    3030import javax.xml.parsers.*; 
    3131import loci.formats.*; 
     32import loci.formats.ome.OMEXMLMetadataStore; 
    3233import org.w3c.dom.*; 
    3334import org.xml.sax.SAXException; 
  • trunk/loci/formats/ome/OMEReader.java

    r2320 r2327  
    2323*/ 
    2424 
    25 package loci.formats.in; 
     25package loci.formats.ome; 
    2626 
    2727import java.awt.image.BufferedImage; 
  • trunk/loci/formats/ome/OMEUploader.java

    r2304 r2327  
    44 
    55/* 
    6 OME Upload package for uploading data to an OME server. 
    7 Copyright (C) 2006-@year@ Melissa Linkert. 
     6LOCI Bio-Formats package for reading and converting biological file formats. 
     7Copyright (C) 2005-@year@ Melissa Linkert, Curtis Rueden, Chris Allan, 
     8Eric Kjellman and Brian Loranger. 
    89 
    910This program is free software; you can redistribute it and/or modify 
     
    2223*/ 
    2324 
    24 package loci.ome.upload; 
     25package loci.formats.ome; 
    2526 
    2627import java.awt.image.BufferedImage; 
  • trunk/loci/formats/ome/OMEXMLMetadataStore.java

    r2320 r2327  
    2323*/ 
    2424 
    25 package loci.formats; 
     25package loci.formats.ome; 
    2626 
    2727//import org.apache.commons.logging.Log; 
     
    3232import javax.xml.parsers.ParserConfigurationException; 
    3333import javax.xml.transform.TransformerException; 
     34import loci.formats.FormatReader; 
     35import loci.formats.MetadataStore; 
    3436import org.openmicroscopy.xml.*; 
    3537import org.openmicroscopy.xml.st.*; 
  • trunk/loci/formats/ome/OmeisException.java

    r2178 r2327  
    2323*/ 
    2424 
    25 package loci.formats; 
     25package loci.formats.ome; 
    2626 
    2727/** 
  • trunk/loci/formats/ome/OmeisImporter.java

    r2318 r2327  
    2323*/ 
    2424 
    25 package loci.formats; 
     25package loci.formats.ome; 
    2626 
    2727import java.io.*; 
    2828import java.net.URL; 
    2929import java.util.*; 
     30import loci.formats.*; 
    3031import org.openmicroscopy.xml.DOMUtil; 
    3132import org.openmicroscopy.xml.OMENode; 
  • trunk/loci/formats/ome/UploadException.java

    r2178 r2327  
    44 
    55/* 
    6 OME Upload package for uploading data to an OME server. 
    7 Copyright (C) 2006-@year@ Melissa Linkert. 
     6LOCI Bio-Formats package for reading and converting biological file formats. 
     7Copyright (C) 2005-@year@ Melissa Linkert, Curtis Rueden, Chris Allan, 
     8Eric Kjellman and Brian Loranger. 
    89 
    910This program is free software; you can redistribute it and/or modify 
     
    2223*/ 
    2324 
    24 package loci.ome.upload; 
     25package loci.formats.ome; 
    2526 
    2627/** 
  • trunk/loci/formats/ome/Uploader.java

    r2178 r2327  
    44 
    55/* 
    6 OME Upload package for uploading data to an OME server. 
    7 Copyright (C) 2006-@year@ Melissa Linkert. 
     6LOCI Bio-Formats package for reading and converting biological file formats. 
     7Copyright (C) 2005-@year@ Melissa Linkert, Curtis Rueden, Chris Allan, 
     8Eric Kjellman and Brian Loranger. 
    89 
    910This program is free software; you can redistribute it and/or modify 
     
    2223*/ 
    2324 
    24 package loci.ome.upload; 
     25package loci.formats.ome; 
    2526 
    2627import java.awt.image.BufferedImage; 
  • trunk/loci/formats/test/ReaderTest.java

    r2321 r2327  
    3030import junit.framework.*; 
    3131import loci.formats.*; 
     32import loci.formats.ome.OMEXMLMetadataStore; 
    3233 
    3334/** 
  • trunk/loci/ome/notebook/Merger.java

    r2269 r2327  
    3030import javax.swing.JComponent; 
    3131import javax.swing.JOptionPane; 
    32 import java.io.FileInputStream; 
    3332import java.util.Vector; 
    3433 
  • trunk/loci/ome/notebook/MetadataPane.java

    r2322 r2327  
    3838import loci.formats.*; 
    3939import loci.formats.in.*; 
     40import loci.formats.ome.OMEXMLMetadataStore; 
    4041import loci.formats.out.*; 
    4142import org.openmicroscopy.xml.*; 
  • trunk/loci/plugins/Importer.java

    r2324 r2327  
    4141import javax.swing.*; 
    4242import loci.formats.*; 
    43 import loci.formats.in.OMEReader; 
     43import loci.formats.ome.OMEReader; 
     44import loci.formats.ome.OMEXMLMetadataStore; 
    4445import loci.plugins.browser.LociDataBrowser; 
    4546 
  • trunk/loci/plugins/LociUploader.java

    r2312 r2327  
    3434import ij.io.FileInfo; 
    3535import loci.formats.*; 
    36 import loci.ome.upload.*; 
     36import loci.formats.ome.*; 
    3737 
    3838/** 
  • trunk/loci/plugins/browser/CustomWindow.java

    r2206 r2327  
    3333import javax.swing.event.ChangeEvent; 
    3434import javax.swing.event.ChangeListener; 
    35 import loci.formats.ReflectedUniverse; 
    36 import loci.formats.ReflectException; 
    37 import loci.formats.FilePattern; 
    38 import loci.formats.FormatException; 
    39 import loci.formats.OMEXMLMetadataStore; 
     35import loci.formats.*; 
    4036import org.openmicroscopy.xml.OMENode; 
    4137import java.io.IOException; 
  • trunk/loci/plugins/browser/ImagePlusWrapper.java

    r1989 r2327  
    3030import java.io.IOException; 
    3131import loci.formats.*; 
     32import loci.formats.ome.OMEXMLMetadataStore; 
    3233 
    3334public class ImagePlusWrapper { 
  • trunk/loci/plugins/browser/LociDataBrowser.java

    r2226 r2327  
    2727import ij.*; 
    2828import ij.gui.GenericDialog; 
    29 import ij.gui.MessageDialog; 
    3029import ij.gui.ImageCanvas; 
    3130import ij.io.FileInfo; 
    32 import java.awt.Frame; 
    3331import loci.formats.*; 
     32import loci.formats.ome.OMEXMLMetadataStore; 
    3433 
    3534/** 
  • trunk/loci/visbio/data/Dataset.java

    r1989 r2327  
    3333import javax.swing.JComponent; 
    3434import loci.formats.*; 
     35import loci.formats.ome.OMEXMLMetadataStore; 
    3536import loci.visbio.TaskEvent; 
    3637import loci.visbio.TaskListener; 
  • trunk/loci/visbio/ome/ImageUploader.java

    r2146 r2327  
    2727import java.util.*; 
    2828import loci.formats.FilePattern; 
    29 import loci.ome.upload.OMEUploader; 
     29import loci.formats.ome.OMEUploader; 
    3030import loci.visbio.*; 
    3131 
  • trunk/loci/visbio/ome/OMEImage.java

    r2230 r2327  
    2929import javax.swing.JOptionPane; 
    3030import loci.formats.*; 
    31 import loci.formats.in.OMEReader; 
     31import loci.formats.ome.OMEReader; 
    3232import loci.ome.util.OMEUtils; 
    3333import loci.visbio.*; 
Note: See TracChangeset for help on using the changeset viewer.