Changeset 6128


Ignore:
Timestamp:
04/15/10 14:37:12 (10 years ago)
Author:
curtis
Message:

Fix some Eclipse warnings, clean up imports, minor progress on Importer plugin.

Location:
trunk/components
Files:
128 edited

Legend:

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

    r6078 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.util.HashSet; 
    2827import java.util.Set; 
    2928 
  • trunk/components/bio-formats/src/loci/formats/FormatHandler.java

    r6026 r6128  
    2323 
    2424package loci.formats; 
    25  
    26 import java.util.Vector; 
    2725 
    2826import org.slf4j.Logger; 
  • trunk/components/bio-formats/src/loci/formats/enums/EnumerationProvider.java

    r6026 r6128  
    2727import java.util.List; 
    2828 
     29import loci.common.services.DependencyException; 
     30import loci.common.services.ServiceFactory; 
     31import loci.formats.enums.handler.HandlerFactory; 
     32import loci.formats.enums.handler.IEnumerationHandler; 
     33import loci.formats.services.OMEXMLService; 
     34 
    2935import org.slf4j.Logger; 
    3036import org.slf4j.LoggerFactory; 
    31  
    32 import loci.common.services.DependencyException; 
    33 import loci.common.services.ServiceFactory; 
    34 import loci.formats.MetadataTools; 
    35 import loci.formats.MissingLibraryException; 
    36 import loci.formats.enums.handler.HandlerFactory; 
    37 import loci.formats.enums.handler.IEnumerationHandler; 
    38 import loci.formats.ome.OMEXMLMetadata; 
    39 import loci.formats.services.OMEXMLService; 
    40 import loci.formats.tools.ImageConverter; 
    4137 
    4238/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/AcquisitionModeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.AcquisitionMode; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.AcquisitionMode; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ArcTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.ArcType; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.ArcType; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/BinningEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.Binning; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.Binning; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ContrastMethodEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.ContrastMethod; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.ContrastMethod; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.Correction; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.Correction; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/DetectorTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.DetectorType; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.DetectorType; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/DimensionOrderEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
     43import loci.formats.enums.DimensionOrder; 
    4444import loci.formats.enums.Enumeration; 
    4545import loci.formats.enums.EnumerationException; 
    46 import loci.formats.enums.DimensionOrder; 
    4746 
    4847/** 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ExperimentTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FilamentTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FilterTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FontFamilyEnumHandler.java

    r5642 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/FontStyleEnumHandler.java

    r5642 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/IEnumerationHandler.java

    r6019 r6128  
    2424package loci.formats.enums.handler; 
    2525 
    26 import java.util.List; 
    27  
    2826import loci.formats.enums.Enumeration; 
    2927import loci.formats.enums.EnumerationException; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/IlluminationTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/ImmersionEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LaserMediumEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LaserTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/LineCapEnumHandler.java

    r5642 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MarkerEnumHandler.java

    r5642 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MediumEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MicrobeamManipulationTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/MicroscopeTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/NamingConventionEnumHandler.java

    r5642 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/PixelTypeEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/PulseEnumHandler.java

    r5647 r6128  
    4040 
    4141import java.util.Hashtable; 
    42 import java.util.List; 
    4342 
    4443import loci.formats.enums.Enumeration; 
  • trunk/components/bio-formats/src/loci/formats/gui/CacheComponent.java

    r6026 r6128  
    4949import loci.formats.cache.RectangleStrategy; 
    5050 
     51import org.slf4j.Logger; 
     52import org.slf4j.LoggerFactory; 
     53 
    5154import com.jgoodies.forms.layout.CellConstraints; 
    5255import com.jgoodies.forms.layout.FormLayout; 
    53  
    54 import org.slf4j.Logger; 
    55 import org.slf4j.LoggerFactory; 
    5656 
    5757/** 
  • trunk/components/bio-formats/src/loci/formats/in/BDReader.java

    r6095 r6128  
    3333 
    3434import loci.common.DataTools; 
    35 import loci.common.Location; 
    36 import loci.common.RandomAccessInputStream; 
    3735import loci.common.IniList; 
    3836import loci.common.IniParser; 
    3937import loci.common.IniTable; 
     38import loci.common.Location; 
     39import loci.common.RandomAccessInputStream; 
    4040import loci.formats.CoreMetadata; 
    4141import loci.formats.FormatException; 
  • trunk/components/bio-formats/src/loci/formats/in/BioRadReader.java

    r6113 r6128  
    3030import java.util.Vector; 
    3131 
    32 import loci.common.DataTools; 
    3332import loci.common.Location; 
    3433import loci.common.RandomAccessInputStream; 
  • trunk/components/bio-formats/src/loci/formats/in/DeltavisionReader.java

    r6104 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.util.HashSet; 
    28 import java.util.Set; 
    2927import java.util.Vector; 
    3028 
     
    3634import loci.formats.FormatReader; 
    3735import loci.formats.FormatTools; 
    38 import loci.formats.IMetadataConfigurable; 
    3936import loci.formats.MetadataTools; 
    4037import loci.formats.meta.FilterMetadata; 
  • trunk/components/bio-formats/src/loci/formats/in/GatanDM2Reader.java

    r6118 r6128  
    2626import java.io.IOException; 
    2727 
    28 import loci.common.DataTools; 
    2928import loci.common.DateTools; 
    3029import loci.common.Location; 
  • trunk/components/bio-formats/src/loci/formats/in/GatanReader.java

    r6118 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.util.StringTokenizer; 
    2827import java.util.Vector; 
    2928 
  • trunk/components/bio-formats/src/loci/formats/in/IPWReader.java

    r6118 r6128  
    3232import loci.common.DataTools; 
    3333import loci.common.DateTools; 
     34import loci.common.Location; 
     35import loci.common.RandomAccessInputStream; 
    3436import loci.common.services.DependencyException; 
    3537import loci.common.services.ServiceFactory; 
    36 import loci.common.Location; 
    37 import loci.common.RandomAccessInputStream; 
    3838import loci.formats.FormatException; 
    3939import loci.formats.FormatReader; 
  • trunk/components/bio-formats/src/loci/formats/in/LIFReader.java

    r6086 r6128  
    3838import loci.formats.ImageTools; 
    3939import loci.formats.MetadataTools; 
    40 import loci.formats.meta.DummyMetadata; 
    4140import loci.formats.meta.FilterMetadata; 
    4241import loci.formats.meta.MetadataStore; 
  • trunk/components/bio-formats/src/loci/formats/in/OMETiffReader.java

    r6026 r6128  
    4343import loci.formats.IFormatReader; 
    4444import loci.formats.MissingLibraryException; 
    45 import loci.formats.meta.IMetadata; 
    4645import loci.formats.ome.OMEXMLMetadata; 
    4746import loci.formats.services.OMEXMLService; 
  • trunk/components/bio-formats/src/loci/formats/in/PhotoshopTiffReader.java

    r6029 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.util.StringTokenizer; 
    28 import java.util.Vector; 
    29  
    30 import loci.common.DataTools; 
     27 
    3128import loci.common.RandomAccessInputStream; 
    3229import loci.formats.CoreMetadata; 
     
    4239import loci.formats.meta.MetadataStore; 
    4340import loci.formats.tiff.IFD; 
    44 import loci.formats.tiff.IFDList; 
    4541import loci.formats.tiff.TiffParser; 
    4642 
  • trunk/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java

    r6077 r6128  
    2626import java.io.ByteArrayInputStream; 
    2727import java.io.File; 
     28import java.io.IOException; 
    2829import java.io.InputStream; 
    29 import java.io.IOException; 
    3030import java.util.Arrays; 
    3131import java.util.Comparator; 
  • trunk/components/bio-formats/src/loci/formats/out/TiffWriter.java

    r6108 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.util.Vector; 
    2827 
    2928import loci.common.RandomAccessInputStream; 
     
    3837import loci.formats.tiff.IFD; 
    3938import loci.formats.tiff.TiffCompression; 
    40 import loci.formats.tiff.TiffParser; 
    4139import loci.formats.tiff.TiffSaver; 
    4240 
  • trunk/components/bio-formats/src/loci/formats/services/JAIIIOService.java

    r6026 r6128  
    2525 
    2626import java.awt.image.BufferedImage; 
     27import java.io.IOException; 
    2728import java.io.InputStream; 
    28 import java.io.IOException; 
    2929import java.io.OutputStream; 
    3030 
  • trunk/components/bio-formats/src/loci/formats/services/JAIIIOServiceImpl.java

    r6026 r6128  
    2424package loci.formats.services; 
    2525 
    26 import com.sun.media.imageio.plugins.jpeg2000.J2KImageWriteParam; 
    27 import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReader; 
    28 import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReaderSpi; 
    29 import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriter; 
    30 import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriterSpi; 
    31  
    3226import java.awt.image.BufferedImage; 
     27import java.io.IOException; 
    3328import java.io.InputStream; 
    34 import java.io.IOException; 
    3529import java.io.OutputStream; 
    3630import java.util.Iterator; 
     
    4640import loci.common.services.AbstractService; 
    4741import loci.common.services.ServiceException; 
     42 
     43import com.sun.media.imageio.plugins.jpeg2000.J2KImageWriteParam; 
     44import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReader; 
     45import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReaderSpi; 
     46import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriter; 
     47import com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriterSpi; 
    4848 
    4949/** 
  • trunk/components/bio-formats/src/loci/formats/services/LuraWaveServiceImpl.java

    r6026 r6128  
    2727import java.io.InputStream; 
    2828 
    29 import com.luratech.lwf.lwfDecoder; 
    30  
    3129import loci.common.services.AbstractService; 
    3230import loci.common.services.DependencyException; 
    3331import loci.common.services.ServiceException; 
     32 
     33import com.luratech.lwf.lwfDecoder; 
    3434 
    3535/** 
  • trunk/components/bio-formats/src/loci/formats/services/MDBServiceImpl.java

    r6059 r6128  
    2929 
    3030import loci.common.services.AbstractService; 
    31  
    3231import mdbtools.jdbc2.File; 
    3332import mdbtools.libmdb.Catalog; 
  • trunk/components/bio-formats/src/loci/formats/services/NetCDFServiceImpl.java

    r6117 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.io.PrintStream; 
    2827import java.util.ArrayList; 
    2928import java.util.Hashtable; 
  • trunk/components/bio-formats/src/loci/formats/services/OMEXMLServiceImpl.java

    r6026 r6128  
    3030import javax.xml.transform.TransformerConfigurationException; 
    3131import javax.xml.transform.TransformerException; 
    32  
    33 import ome.xml.OMEXMLFactory; 
    34 import ome.xml.OMEXMLNode; 
    35  
    36 import org.slf4j.Logger; 
    37 import org.slf4j.LoggerFactory; 
    38 import org.w3c.dom.Document; 
    39 import org.w3c.dom.Node; 
    40 import org.w3c.dom.NodeList; 
    41 import org.xml.sax.SAXException; 
    4232 
    4333import loci.common.services.AbstractService; 
     
    4939import loci.formats.meta.MetadataStore; 
    5040import loci.formats.ome.OMEXMLMetadata; 
     41import ome.xml.OMEXMLFactory; 
     42import ome.xml.OMEXMLNode; 
     43 
     44import org.slf4j.Logger; 
     45import org.slf4j.LoggerFactory; 
     46import org.w3c.dom.Document; 
     47import org.w3c.dom.Node; 
     48import org.w3c.dom.NodeList; 
     49import org.xml.sax.SAXException; 
    5150 
    5251/** 
  • trunk/components/bio-formats/src/loci/formats/services/POIService.java

    r6077 r6128  
    2424package loci.formats.services; 
    2525 
     26import java.io.IOException; 
    2627import java.io.InputStream; 
    27 import java.io.IOException; 
    2828import java.util.Vector; 
    2929 
  • trunk/components/bio-formats/src/loci/formats/services/POIServiceImpl.java

    r6077 r6128  
    2525 
    2626import java.io.File; 
     27import java.io.IOException; 
    2728import java.io.InputStream; 
    28 import java.io.IOException; 
     29import java.util.Hashtable; 
    2930import java.util.Iterator; 
    30 import java.util.Hashtable; 
    3131import java.util.Vector; 
    3232 
    3333import loci.common.RandomAccessInputStream; 
    3434import loci.common.services.AbstractService; 
    35  
    3635import loci.poi.poifs.filesystem.DirectoryEntry; 
    3736import loci.poi.poifs.filesystem.DocumentEntry; 
  • trunk/components/bio-formats/src/loci/formats/tiff/TiffParser.java

    r6062 r6128  
    2525 
    2626import java.io.IOException; 
    27 import java.util.Arrays; 
    2827import java.util.TreeSet; 
    2928import java.util.Vector; 
  • trunk/components/bio-formats/src/loci/formats/tiff/TiffSaver.java

    r6126 r6128  
    3131 
    3232import loci.common.ByteArrayHandle; 
    33 import loci.common.DataTools; 
    3433import loci.common.RandomAccessInputStream; 
    3534import loci.common.RandomAccessOutputStream; 
  • trunk/components/bio-formats/src/loci/formats/tools/ImageConverter.java

    r6026 r6128  
    5151import org.apache.log4j.Level; 
    5252import org.apache.log4j.PatternLayout; 
    53  
    5453import org.slf4j.Logger; 
    5554import org.slf4j.LoggerFactory; 
  • trunk/components/bio-formats/src/loci/formats/tools/ImageInfo.java

    r6026 r6128  
    2828import java.util.Hashtable; 
    2929import java.util.StringTokenizer; 
    30  
    31 import javax.xml.parsers.ParserConfigurationException; 
    3230 
    3331import loci.common.ByteArrayHandle; 
     
    6462import org.apache.log4j.Level; 
    6563import org.apache.log4j.PatternLayout; 
    66  
    6764import org.slf4j.Logger; 
    6865import org.slf4j.LoggerFactory; 
    69 import org.xml.sax.SAXException; 
    7066 
    7167/** 
  • trunk/components/bio-formats/src/loci/formats/tools/PrintFormatTable.java

    r6026 r6128  
    3636import org.apache.log4j.Level; 
    3737import org.apache.log4j.PatternLayout; 
    38  
    3938import org.slf4j.Logger; 
    4039import org.slf4j.LoggerFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/DeltavisionMetadataConfigurableTest.java

    r6074 r6128  
    2424package loci.formats.utests; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertNull; 
     28import static org.testng.AssertJUnit.fail; 
    2729 
    2830import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/JAIIIOServiceTest.java

    r6026 r6128  
    2424package loci.formats.utests; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertNotNull; 
     28import static org.testng.AssertJUnit.assertTrue; 
    2729 
    2830import java.awt.image.BufferedImage; 
  • trunk/components/bio-formats/test/loci/formats/utests/LuraWaveServiceTest.java

    r6026 r6128  
    2323 
    2424package loci.formats.utests; 
    25  
    26 import static org.testng.AssertJUnit.*; 
    2725 
    2826import java.io.ByteArrayInputStream; 
  • trunk/components/bio-formats/test/loci/formats/utests/MDBServiceTest.java

    r6026 r6128  
    2424package loci.formats.utests; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
    2727 
    2828import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/MetadataConfigurableTest.java

    r6074 r6128  
    2424package loci.formats.utests; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertFalse; 
     28import static org.testng.AssertJUnit.fail; 
    2729 
    2830import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/MissingJAIIIOServiceTest.java

    r6026 r6128  
    2525 
    2626import static org.testng.AssertJUnit.assertNotNull; 
    27  
    2827import loci.common.services.DependencyException; 
    2928import loci.common.services.ServiceFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/MissingLuraWaveServiceTest.java

    r6026 r6128  
    2525 
    2626import static org.testng.AssertJUnit.assertNotNull; 
    27  
    2827import loci.common.services.DependencyException; 
    2928import loci.common.services.ServiceFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/MissingMDBServiceTest.java

    r6026 r6128  
    2525 
    2626import static org.testng.AssertJUnit.assertNotNull; 
    27  
    2827import loci.common.services.DependencyException; 
    2928import loci.common.services.ServiceFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/MissingNetCDFServiceTest.java

    r6026 r6128  
    2525 
    2626import static org.testng.AssertJUnit.assertNotNull; 
    27  
    2827import loci.common.services.DependencyException; 
    2928import loci.common.services.ServiceFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/MissingOMEXMLServiceTest.java

    r6026 r6128  
    2525 
    2626import static org.testng.AssertJUnit.assertNotNull; 
    27  
    2827import loci.common.services.DependencyException; 
    2928import loci.common.services.ServiceFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/MissingPOIServiceTest.java

    r6026 r6128  
    2525 
    2626import static org.testng.AssertJUnit.assertNotNull; 
    27  
    2827import loci.common.services.DependencyException; 
    2928import loci.common.services.ServiceFactory; 
  • trunk/components/bio-formats/test/loci/formats/utests/NetCDFServiceTest.java

    r6026 r6128  
    2424package loci.formats.utests; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
    2727 
    2828import java.io.File; 
  • trunk/components/bio-formats/test/loci/formats/utests/OMEXMLServiceTest.java

    r6026 r6128  
    2727import static org.testng.AssertJUnit.assertNotNull; 
    2828 
     29import java.io.IOException; 
    2930import java.io.InputStream; 
    30 import java.io.IOException; 
    3131 
    3232import loci.common.services.DependencyException; 
  • trunk/components/bio-formats/test/loci/formats/utests/POIServiceTest.java

    r6026 r6128  
    2424package loci.formats.utests; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertNotNull; 
     28import static org.testng.AssertJUnit.fail; 
    2729 
    2830import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/IFDTypeTest.java

    r6026 r6128  
    2323package loci.formats.utests.tiff; 
    2424 
    25 import static org.testng.AssertJUnit.*; 
     25import static org.testng.AssertJUnit.assertEquals; 
     26import loci.common.enumeration.EnumException; 
     27import loci.formats.tiff.IFDType; 
    2628 
    2729import org.testng.annotations.Test; 
    28  
    29 import loci.common.enumeration.EnumException; 
    30 import loci.formats.tiff.IFDType; 
    3130 
    3231/** 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/PhotoInterpTest.java

    r6026 r6128  
    2323package loci.formats.utests.tiff; 
    2424 
    25 import static org.testng.AssertJUnit.*; 
     25import static org.testng.AssertJUnit.assertEquals; 
     26import loci.common.enumeration.EnumException; 
     27import loci.formats.tiff.PhotoInterp; 
    2628 
    2729import org.testng.annotations.Test; 
    28  
    29 import loci.common.enumeration.EnumException; 
    30 import loci.formats.tiff.PhotoInterp; 
    3130 
    3231/** 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffCompressionCompressTest.java

    r6026 r6128  
    2424package loci.formats.utests.tiff; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertNotNull; 
    2728 
    2829import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffCompressionDecompressTest.java

    r6026 r6128  
    2424package loci.formats.utests.tiff; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertNotNull; 
     27import static org.testng.AssertJUnit.fail; 
    2728 
    2829import java.io.EOFException; 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffCompressionTest.java

    r6026 r6128  
    2323package loci.formats.utests.tiff; 
    2424 
    25 import static org.testng.AssertJUnit.*; 
     25import static org.testng.AssertJUnit.assertEquals; 
     26import loci.common.enumeration.EnumException; 
     27import loci.formats.tiff.TiffCompression; 
    2628 
    2729import org.testng.annotations.Test; 
    28  
    29 import loci.common.enumeration.EnumException; 
    30 import loci.formats.tiff.TiffCompression; 
    3130 
    3231/** 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffParserTest.java

    r6026 r6128  
    2323package loci.formats.utests.tiff; 
    2424 
    25 import static org.testng.AssertJUnit.*; 
     25import static org.testng.AssertJUnit.assertEquals; 
     26import static org.testng.AssertJUnit.assertFalse; 
     27import static org.testng.AssertJUnit.assertNotNull; 
     28import static org.testng.AssertJUnit.assertTrue; 
     29import static org.testng.AssertJUnit.fail; 
    2630 
    2731import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffPixelsTest.java

    r6026 r6128  
    2424package loci.formats.utests.tiff; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
     26import static org.testng.AssertJUnit.assertEquals; 
    2727 
    2828import java.io.IOException; 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffRationalTest.java

    r6026 r6128  
    2424package loci.formats.utests.tiff; 
    2525 
    26 import static org.testng.AssertJUnit.*; 
    27  
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertTrue; 
    2828import loci.formats.tiff.TiffRational; 
    2929 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffSaverTest.java

    r6026 r6128  
    2323package loci.formats.utests.tiff; 
    2424 
    25 import static org.testng.AssertJUnit.*; 
     25import static org.testng.AssertJUnit.assertEquals; 
     26import static org.testng.AssertJUnit.assertFalse; 
     27import static org.testng.AssertJUnit.assertTrue; 
    2628 
    2729import java.io.IOException; 
     
    3234import loci.formats.FormatException; 
    3335import loci.formats.tiff.IFD; 
    34 import loci.formats.tiff.PhotoInterp; 
    3536import loci.formats.tiff.TiffParser; 
    3637import loci.formats.tiff.TiffSaver; 
  • trunk/components/common/src/loci/common/ByteArrayHandle.java

    r6050 r6128  
    2424package loci.common; 
    2525 
    26 import java.nio.BufferUnderflowException; 
    2726import java.io.EOFException; 
    2827import java.io.IOException; 
     28import java.nio.BufferUnderflowException; 
    2929import java.nio.ByteBuffer; 
    3030import java.nio.ByteOrder; 
  • trunk/components/common/src/loci/common/StreamHandle.java

    r6121 r6128  
    2828import java.io.EOFException; 
    2929import java.io.IOException; 
    30  
    3130import java.nio.ByteBuffer; 
    3231import java.nio.ByteOrder; 
  • trunk/components/common/src/loci/common/URLHandle.java

    r6050 r6128  
    2626import java.io.BufferedInputStream; 
    2727import java.io.DataInputStream; 
    28 import java.io.DataOutputStream; 
    2928import java.io.IOException; 
     29import java.net.URL; 
    3030import java.net.URLConnection; 
    31 import java.net.URL; 
    3231 
    3332/** 
  • trunk/components/common/src/loci/common/services/ServiceFactory.java

    r6050 r6128  
    3131import java.util.Set; 
    3232import java.util.Map.Entry; 
    33  
    3433 
    3534import org.slf4j.Logger; 
  • trunk/components/common/src/loci/common/xml/XMLTools.java

    r6050 r6128  
    6060import org.slf4j.Logger; 
    6161import org.slf4j.LoggerFactory; 
    62  
    6362import org.w3c.dom.Document; 
    6463import org.xml.sax.InputSource; 
  • trunk/components/common/test/loci/common/utests/BufferAlignmentReadTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.EOFException; 
    2729import java.io.IOException; 
     
    3032import loci.common.utests.providers.IRandomAccessProvider; 
    3133import loci.common.utests.providers.IRandomAccessProviderFactory; 
    32  
    33 import static org.testng.AssertJUnit.*; 
    3434 
    3535import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/BufferAlignmentWriteTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729import java.nio.ByteBuffer; 
     
    3032import loci.common.utests.providers.IRandomAccessProvider; 
    3133import loci.common.utests.providers.IRandomAccessProviderFactory; 
    32  
    33 import static org.testng.AssertJUnit.*; 
    3434 
    3535import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/EndiannessTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729import java.nio.ByteOrder; 
     
    3032import loci.common.utests.providers.IRandomAccessProvider; 
    3133import loci.common.utests.providers.IRandomAccessProviderFactory; 
    32  
    33 import static org.testng.AssertJUnit.*; 
    3434 
    3535import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/LocationTest.java

    r6026 r6128  
    2323 
    2424package loci.common.utests; 
     25 
     26import static org.testng.AssertJUnit.assertEquals; 
    2527 
    2628import java.io.File; 
     
    3133 
    3234import loci.common.Location; 
    33  
    34 import static org.testng.AssertJUnit.*; 
    3535 
    3636import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadByteArrayTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadByteBufferTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729import java.nio.ByteBuffer; 
     
    3032import loci.common.utests.providers.IRandomAccessProvider; 
    3133import loci.common.utests.providers.IRandomAccessProviderFactory; 
    32  
    33 import static org.testng.AssertJUnit.*; 
    3434 
    3535import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadByteSubArrayTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadByteTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadCharTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.assertTrue; 
     28 
    2629import java.io.IOException; 
    2730 
     
    2932import loci.common.utests.providers.IRandomAccessProvider; 
    3033import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3334 
    3435import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadDoubleTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadFloatTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadIntTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadLineTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadLongTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadShortTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadUnsignedByteTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/ReadUnsignedShortTest.java

    r6026 r6128  
    2323package loci.common.utests; 
    2424 
     25import static org.testng.AssertJUnit.assertEquals; 
     26 
    2527import java.io.IOException; 
    2628 
     
    2830import loci.common.utests.providers.IRandomAccessProvider; 
    2931import loci.common.utests.providers.IRandomAccessProviderFactory; 
    30  
    31 import static org.testng.AssertJUnit.*; 
    3232 
    3333import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/SkipBytesTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/TypeDetectionTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.File; 
    2729import java.io.IOException; 
     
    3032import loci.common.GZipHandle; 
    3133import loci.common.ZipHandle; 
    32  
    33 import static org.testng.AssertJUnit.*; 
    3434 
    3535import org.testng.annotations.Test; 
  • trunk/components/common/test/loci/common/utests/URLHandleTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.EOFException; 
    2729import java.io.IOException; 
     
    2931import loci.common.HandleException; 
    3032import loci.common.URLHandle; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteByteArrayTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.fail; 
     28 
    2629import java.io.IOException; 
    2730 
     
    2932import loci.common.utests.providers.IRandomAccessProvider; 
    3033import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3334 
    3435import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteByteBufferTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27import static org.testng.AssertJUnit.fail; 
     28 
    2629import java.io.IOException; 
    2730import java.nio.ByteBuffer; 
     
    3033import loci.common.utests.providers.IRandomAccessProvider; 
    3134import loci.common.utests.providers.IRandomAccessProviderFactory; 
    32  
    33 import static org.testng.AssertJUnit.*; 
    3435 
    3536import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteByteTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteBytesTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteCharTest.java

    r6060 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteCharsTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteDoubleTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteFloatTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteIntTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteLongTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteShortTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteUTFTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteUnsignedByteTest.java

    r6026 r6128  
    2424package loci.common.utests; 
    2525 
     26import static org.testng.AssertJUnit.assertEquals; 
     27 
    2628import java.io.IOException; 
    2729 
     
    2931import loci.common.utests.providers.IRandomAccessProvider; 
    3032import loci.common.utests.providers.IRandomAccessProviderFactory; 
    31  
    32 import static org.testng.AssertJUnit.*; 
    3333 
    3434import org.testng.annotations.BeforeMethod; 
  • trunk/components/common/test/loci/common/utests/WriteUnsignedShortTest.java

    r6026 r6128  
    2323package loci.common.utests; 
    2424 
     25import static org.testng.AssertJUnit.assertEquals; 
     26 
    2527import java.io.IOException; 
    2628 
     
    2830import loci.common.utests.providers.IRandomAccessProvider; 
    2931import loci.common.utests.providers.IRandomAccessProviderFactory; 
    30  
    31 import static org.testng.AssertJUnit.*; 
    3232 
    3333import org.testng.annotations.BeforeMethod; 
  • trunk/components/loci-plugins/src/loci/plugins/config/ConfigWindow.java

    r6007 r6128  
    605605  } 
    606606 
    607   private static final Class[] PARAMS = {String.class, boolean.class}; 
     607  private static final Class<?>[] PARAMS = {String.class, boolean.class}; 
    608608 
    609609  private Object invokeMethod(String fieldName, String methodName, 
  • trunk/components/loci-plugins/src/loci/plugins/config/FormatEntry.java

    r6007 r6128  
    7474    String fwClassName = "loci.plugins.config." + readerName + "Widgets"; 
    7575    try { 
    76       Class fwClass = Class.forName(fwClassName); 
     76      Class<?> fwClass = Class.forName(fwClassName); 
    7777      fw = (IFormatWidgets) fwClass.newInstance(); 
    7878      log.println("Initialized extra widgets for " + readerName + " reader."); 
  • trunk/components/loci-plugins/src/loci/plugins/config/LibraryEntry.java

    r5111 r6128  
    9292    // check library status 
    9393    try { 
    94       Class c = Class.forName(libClass); 
     94      Class<?> c = Class.forName(libClass); 
    9595      if (version == null) { 
    9696        // try to detect version from the package 
  • trunk/components/loci-plugins/src/loci/plugins/exporter/Exporter.java

    r6026 r6128  
    5858import loci.formats.IFormatWriter; 
    5959import loci.formats.ImageWriter; 
    60 import loci.formats.MetadataTools; 
    6160import loci.formats.gui.AWTImageTools; 
    6261import loci.formats.gui.ExtensionFileFilter; 
     
    344343      // convert and save slices 
    345344 
    346       Class c = null; 
     345      Class<?> c = null; 
    347346      try { 
    348347        c = Class.forName("ij.CompositeImage"); 
  • trunk/components/loci-plugins/src/loci/plugins/importer/Importer.java

    r6114 r6128  
    4444import java.io.IOException; 
    4545import java.util.ArrayList; 
    46 import java.util.Arrays; 
    47 import java.util.Collections; 
    48 import java.util.Enumeration; 
    49 import java.util.Hashtable; 
    5046 
    5147import javax.xml.parsers.ParserConfigurationException; 
     
    6460import loci.formats.gui.XMLWindow; 
    6561import loci.formats.meta.IMetadata; 
    66 import loci.formats.meta.MetadataRetrieve; 
    6762import loci.formats.services.OMEXMLService; 
    6863import loci.plugins.Colorizer; 
    6964import loci.plugins.LociImporter; 
    70 import loci.plugins.prefs.OptionsDialog; 
    7165import loci.plugins.util.BF; 
    7266import loci.plugins.util.BFVirtualStack; 
     
    116110  /** Executes the plugin. */ 
    117111  public void run(String arg) { 
    118     ImporterOptions options = parseOptions(arg, false); 
    119  
    120     checkNewVersion(options); 
    121     if (plugin.canceled) return; 
    122  
    123     try { 
    124       harvestAdditionalOptions(options); 
    125       if (plugin.canceled) return; 
    126  
    127       displayMetadata(options); 
    128       if (plugin.canceled) return; 
    129  
    130       readPixelData(options); 
    131       if (plugin.canceled) return; 
    132  
    133       displayROIs(options); 
    134       if (plugin.canceled) return; 
    135  
    136       finishUp(options); 
    137       if (plugin.canceled) return; 
    138     } 
    139     catch (FormatException exc) { 
    140       WindowTools.reportException(exc, options.isQuiet(), 
    141         "Sorry, there was a problem reading the data."); 
    142     } 
    143     catch (IOException exc) { 
    144       WindowTools.reportException(exc, options.isQuiet(), 
    145         "Sorry, there was an I/O problem reading the data."); 
    146     } 
    147   } 
    148  
    149   // -- Helper methods -- 
    150  
    151   // -- CTR BEGIN TEMP helper methods -- 
    152  
    153   // Step 0: parse core options 
    154   private ImporterOptions parseOptions(String arg, boolean quiet) { 
    155     BF.debug("parse core options"); 
    156112    ImporterOptions options = null; 
    157113    try { 
    158       options = new ImporterOptions(); 
     114      BF.debug("parse core options"); 
     115      options = parseOptions(arg, false); 
     116      if (plugin.canceled) return; 
     117 
     118      BF.debug("display option dialogs"); 
     119      showOptionDialogs(options); 
     120      if (plugin.canceled) return; 
     121 
     122      if (options.isShowMetadata()) { 
     123        BF.debug("display metadata"); 
     124        IJ.showStatus("Populating metadata"); 
     125        displayOriginalMetadata(options); 
     126        if (plugin.canceled) return; 
     127      } 
     128      else BF.debug("skip metadata"); 
     129 
     130      if (options.isShowOMEXML()) { 
     131        BF.debug("show OME-XML"); 
     132        displayOMEXML(options); 
     133        if (plugin.canceled) return; 
     134      } 
     135      else BF.debug("skip OME-XML"); 
     136 
     137      if (!options.isViewNone()) { 
     138        BF.debug("read pixel data"); 
     139        readPixelData(options); 
     140        if (plugin.canceled) return; 
     141      } 
     142      else BF.debug("skip pixel data"); // nothing to display 
     143 
     144      if (options.showROIs()) { 
     145        BF.debug("display ROIs"); 
     146        displayROIs(options); 
     147        if (plugin.canceled) return; 
     148      } 
     149      else BF.debug("skip ROIs"); 
     150 
     151      BF.debug("finish"); 
     152      finish(options); 
     153      if (plugin.canceled) return; 
     154    } 
     155    catch (FormatException exc) { 
     156      boolean quiet = options == null ? false : options.isQuiet(); 
     157      WindowTools.reportException(exc, quiet, 
     158        "Sorry, there was a problem during import."); 
    159159    } 
    160160    catch (IOException exc) { 
    161       WindowTools.reportException(exc, quiet); 
    162     } 
     161      boolean quiet = options == null ? false : options.isQuiet(); 
     162      WindowTools.reportException(exc, quiet, 
     163        "Sorry, there was an I/O problem during import."); 
     164    } 
     165  } 
     166 
     167  /** Parses core options. */ 
     168  public ImporterOptions parseOptions(String arg, boolean quiet) 
     169    throws IOException 
     170  { 
     171    ImporterOptions options = new ImporterOptions(); 
    163172    options.loadOptions(); 
    164173    options.parseArg(arg); 
     
    166175  } 
    167176 
    168   // Step 1: check if new version is available 
    169   /** Checks if a new version of the LOCI plugins is available. */ 
    170   private void checkNewVersion(ImporterOptions options) { 
    171     BF.debug("check if new version is available"); 
    172  
    173     UpgradeDialog upgradeDialog = new UpgradeDialog(options); 
    174     int status = upgradeDialog.showDialog(); 
    175     if (!statusOk(status)) return; 
    176   } 
    177  
    178   // Step 2: harvest additional options 
    179   private void harvestAdditionalOptions(ImporterOptions options) 
     177  public void showOptionDialogs(ImporterOptions options) 
    180178    throws FormatException, IOException 
    181179  { 
    182     BF.debug("get parameter values"); 
    183180    boolean success = options.showDialogs(); 
    184     if (!success) { 
    185       plugin.canceled = true; 
    186       return; 
    187     } 
    188     ImagePlusReader r = options.getReader(); 
    189  
    190     BF.debug("analyze and read from data source"); 
    191  
    192     IJ.showStatus("Analyzing " + options.getIdName()); 
    193   } 
    194  
    195   // Step 3: display metadata, if appropriate 
    196   private void displayMetadata(ImporterOptions options) throws IOException { 
    197     if (options.isShowMetadata()) { 
    198       BF.debug("display metadata"); 
    199       IJ.showStatus("Populating metadata"); 
    200  
    201       // display standard metadata in a table in its own window 
    202       ImporterMetadata meta = options.getOriginalMetadata(); 
    203       meta.showMetadataWindow(options.getIdName()); 
    204     } 
    205     else BF.debug("skip metadata"); 
    206  
    207     if (options.isShowOMEXML()) { 
    208       BF.debug("show OME-XML"); 
    209       if (options.isViewBrowser()) { 
    210         // NB: Data Browser has its own internal OME-XML metadata window, 
    211         // which we'll trigger once we have created a Data Browser. 
    212         // So there is no need to pop up a separate OME-XML here. 
    213       } 
    214       else { 
    215         XMLWindow metaWindow = 
    216           new XMLWindow("OME Metadata - " + options.getIdName()); 
    217         Exception exc = null; 
    218         try { 
    219           ServiceFactory factory = new ServiceFactory(); 
    220           OMEXMLService service = factory.getInstance(OMEXMLService.class); 
    221           metaWindow.setXML(service.getOMEXML(options.getOMEMetadata())); 
    222           WindowTools.placeWindow(metaWindow); 
    223           metaWindow.setVisible(true); 
    224         } 
    225         catch (DependencyException e) { exc = e; } 
    226         catch (ServiceException e) { exc = e; } 
    227         catch (ParserConfigurationException e) { exc = e; } 
    228         catch (SAXException e) { exc = e; } 
    229  
    230         if (exc != null) { 
    231           WindowTools.reportException(exc, options.isQuiet(), 
    232             "Sorry, there was a problem displaying the OME metadata"); 
    233         } 
    234       } 
    235     } 
    236     else BF.debug("skip OME-XML"); 
    237   } 
    238  
    239   // Step 5: read pixel data 
    240   private void readPixelData(ImporterOptions options) 
     181    if (!success) plugin.canceled = true; 
     182  } 
     183 
     184  /** Displays standard metadata in a table in its own window. */ 
     185  public void displayOriginalMetadata(ImporterOptions options) 
     186    throws IOException 
     187  { 
     188    ImporterMetadata meta = options.getOriginalMetadata(); 
     189    meta.showMetadataWindow(options.getIdName()); 
     190  } 
     191 
     192  public void displayOMEXML(ImporterOptions options) 
    241193    throws FormatException, IOException 
    242194  { 
    243     if (options.isViewNone()) return; // nothing to display 
    244  
    245     BF.debug("read pixel data"); 
    246  
    247     IJ.showStatus("Reading " + options.getCurrentFile()); 
    248  
     195    if (options.isViewBrowser()) { 
     196      // NB: Data Browser has its own internal OME-XML metadata window, 
     197      // which we'll trigger once we have created a Data Browser. 
     198      // So there is no need to pop up a separate OME-XML here. 
     199    } 
     200    else { 
     201      XMLWindow metaWindow = 
     202        new XMLWindow("OME Metadata - " + options.getIdName()); 
     203      Exception exc = null; 
     204      try { 
     205        ServiceFactory factory = new ServiceFactory(); 
     206        OMEXMLService service = factory.getInstance(OMEXMLService.class); 
     207        metaWindow.setXML(service.getOMEXML(options.getOMEMetadata())); 
     208        WindowTools.placeWindow(metaWindow); 
     209        metaWindow.setVisible(true); 
     210      } 
     211      catch (DependencyException e) { exc = e; } 
     212      catch (ServiceException e) { exc = e; } 
     213      catch (ParserConfigurationException e) { exc = e; } 
     214      catch (SAXException e) { exc = e; } 
     215 
     216      if (exc != null) throw new FormatException(exc); 
     217    } 
     218  } 
     219 
     220  public void readPixelData(ImporterOptions options) 
     221    throws FormatException, IOException 
     222  { 
    249223    ImagePlusReader r = options.getReader(); 
    250224 
     
    519493  } 
    520494 
    521   // Step 6: display ROIs, if necessary 
    522   private void displayROIs(ImporterOptions options) { 
     495  public void displayROIs(ImporterOptions options) { 
    523496    if (options.showROIs()) { 
    524497      BF.debug("display ROIs"); 
     
    530503  } 
    531504 
    532   // Step 7: finish up 
    533   private void finishUp(ImporterOptions options) { 
    534     BF.debug("finish up"); 
    535  
    536     ImagePlusReader r = options.getReader(); 
    537  
    538     try { 
    539       if (!options.isVirtual()) r.close(); 
    540     } 
    541     catch (IOException exc) { 
    542       WindowTools.reportException(exc, options.isQuiet(), 
    543         "Sorry, there was a problem closing the file"); 
    544     } 
    545  
     505  public void finish(ImporterOptions options) throws IOException { 
     506    if (!options.isVirtual()) options.getReader().close(); 
    546507    plugin.success = true; 
    547508  } 
    548509 
    549   // -- CTR END TEMP helper methods -- 
     510  // -- Helper methods -- 
    550511 
    551512  /** 
     
    803764  } 
    804765 
    805   /** Verifies that the given status result is OK. */ 
    806   private boolean statusOk(int status) { 
    807     if (status == OptionsDialog.STATUS_CANCELED) plugin.canceled = true; 
    808     return status == OptionsDialog.STATUS_OK; 
    809   } 
    810  
    811766  // -- Main method -- 
    812767 
  • trunk/components/loci-plugins/src/loci/plugins/importer/ImporterMetadata.java

    r6029 r6128  
    3030import java.util.HashMap; 
    3131import java.util.Hashtable; 
     32 
    3233import loci.formats.FormatTools; 
    3334import loci.formats.IFormatReader; 
  • trunk/components/loci-plugins/src/loci/plugins/importer/ImporterOptions.java

    r6029 r6128  
    3131import java.io.IOException; 
    3232import java.util.Arrays; 
    33 import java.util.StringTokenizer; 
    3433 
    3534import loci.common.Location; 
     
    205204    reader = null; 
    206205 
     206    if (!promptUpgrade()) return false; 
     207 
    207208    if (!promptLocation()) return false; 
    208209    if (!promptId()) return false; 
     
    442443 
    443444  // -- Helper methods -- 
     445 
     446  private boolean promptUpgrade() { 
     447    UpgradeDialog dialog = new UpgradeDialog(this); 
     448    return dialog.showDialog() == OptionsDialog.STATUS_OK; 
     449  } 
    444450 
    445451  private boolean promptLocation() { 
  • trunk/components/loci-plugins/src/loci/plugins/macro/LociFunctions.java

    r6026 r6128  
    4141import loci.formats.IFormatReader; 
    4242import loci.formats.ImageReader; 
    43 import loci.formats.MetadataTools; 
    4443import loci.formats.meta.MetadataRetrieve; 
    4544import loci.formats.services.OMEXMLService; 
  • trunk/components/loci-plugins/src/loci/plugins/macro/MacroFunctions.java

    r5133 r6128  
    7474 
    7575  public String handleExtension(String name, Object[] args) { 
    76     Class[] c = null; 
     76    Class<?>[] c = null; 
    7777    if (args != null) { 
    7878      c = new Class[args.length]; 
     
    110110    ExtensionDescriptor[] desc = new ExtensionDescriptor[m.length]; 
    111111    for (int i=0; i<m.length; i++) { 
    112       Class[] c = m[i].getParameterTypes(); 
     112      Class<?>[] c = m[i].getParameterTypes(); 
    113113      int[] types = new int[c.length]; 
    114114      for (int j=0; j<c.length; j++) { 
  • trunk/components/loci-plugins/src/loci/plugins/shortcut/ShortcutTransferHandler.java

    r6007 r6128  
    3333import java.util.Arrays; 
    3434import java.util.List; 
    35 import java.util.StringTokenizer; 
    3635 
    3736import javax.swing.JComponent; 
  • trunk/components/loci-plugins/src/loci/plugins/util/ImagePlusReader.java

    r6034 r6128  
    4343import loci.formats.ImageTools; 
    4444import loci.formats.MinMaxCalculator; 
    45 import loci.formats.ReaderWrapper; 
    4645import loci.formats.in.ND2Reader; 
    4746import loci.formats.in.PictReader; 
  • trunk/components/loci-plugins/src/loci/plugins/util/ImagePlusTools.java

    r5886 r6128  
    3535import ij.process.ImageProcessor; 
    3636import ij.process.ShortProcessor; 
     37 
    3738import java.io.IOException; 
     39 
    3840import loci.formats.FormatException; 
    3941import loci.formats.FormatTools; 
  • trunk/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java

    r6026 r6128  
    6666  private ImageProcessor proc; 
    6767  private boolean doRecording; 
    68   private Vector methodStack; 
     68  private Vector<MethodEntry> methodStack; 
    6969  private int sliceNumber; 
    7070 
     
    7676  public RecordedImageProcessor(ImageProcessor proc, int num) { 
    7777    this.proc = proc; 
    78     methodStack = new Vector(); 
     78    methodStack = new Vector<MethodEntry>(); 
    7979    doRecording = true; 
    8080    sliceNumber = num; 
     
    8585  { 
    8686    this.proc = proc; 
    87     methodStack = new Vector(); 
     87    methodStack = new Vector<MethodEntry>(); 
    8888    doRecording = true; 
    8989    sliceNumber = num; 
     
    9898  } 
    9999 
    100   public Vector getMethodStack() { 
     100  public Vector<MethodEntry> getMethodStack() { 
    101101    return methodStack; 
    102102  } 
    103103 
    104   public void applyMethodStack(Vector stack) { 
     104  public void applyMethodStack(Vector<MethodEntry> stack) { 
    105105    for (int i=0; i<stack.size(); i++) { 
    106106      MethodEntry m = (MethodEntry) stack.get(i); 
     
    122122 
    123123  public void abs() { 
    124     record("abs", null, (Class) null); 
     124    record("abs"); 
    125125    proc.abs(); 
    126126  } 
     
    147147 
    148148  public void autoThreshold() { 
    149     record("autoThreshold", null, (Class) null); 
     149    record("autoThreshold"); 
    150150    proc.autoThreshold(); 
    151151  } 
     
    157157 
    158158  public ImageProcessor convertToFloat() { 
    159     record("convertToFloat", null, (Class) null); 
     159    record("convertToFloat"); 
    160160    return proc.convertToFloat(); 
    161161  } 
    162162 
    163163  public ImageProcessor convertToRGB() { 
    164     record("convertToRGB", null, (Class) null); 
     164    record("convertToRGB"); 
    165165    return proc.convertToRGB(); 
    166166  } 
     
    312312 
    313313  public ImageProcessor crop() { 
    314     record("crop", null, (Class) null); 
     314    record("crop"); 
    315315    return proc.crop(); 
    316316  } 
    317317 
    318318  public void dilate() { 
    319     record("dilate", null, (Class) null); 
     319    record("dilate"); 
    320320    proc.dilate(); 
    321321  } 
     
    377377 
    378378  public ImageProcessor duplicate() { 
    379     record("duplicate", null, (Class) null); 
     379    record("duplicate"); 
    380380    return proc.duplicate(); 
    381381  } 
    382382 
    383383  public void erode() { 
    384     record("erode", null, (Class) null); 
     384    record("erode"); 
    385385    proc.erode(); 
    386386  } 
    387387 
    388388  public void exp() { 
    389     record("exp", null, (Class) null); 
     389    record("exp"); 
    390390    proc.exp(); 
    391391  } 
    392392 
    393393  public void fill() { 
    394     record("fill", null, (Class) null); 
     394    record("fill"); 
    395395    proc.fill(); 
    396396  } 
     
    419419 
    420420  public void findEdges() { 
    421     record("findEdges", null, (Class) null); 
     421    record("findEdges"); 
    422422    proc.findEdges(); 
    423423  } 
    424424 
    425425  public void flipHorizontal() { 
    426     record("flipHorizontal", null, (Class) null); 
     426    record("flipHorizontal"); 
    427427    proc.flipHorizontal(); 
    428428  } 
    429429 
    430430  public void flipVertical() { 
    431     record("flipVertical", null, (Class) null); 
     431    record("flipVertical"); 
    432432    proc.flipVertical(); 
    433433  } 
     
    450450 
    451451  public int getAutoThreshold() { 
    452     record("getAutoThreshold", null, (Class) null); 
     452    record("getAutoThreshold"); 
    453453    return proc.getAutoThreshold(); 
    454454  } 
    455455 
    456456  public double getBackgroundValue() { 
    457     record("getBackgroundValue", null, (Class) null); 
     457    record("getBackgroundValue"); 
    458458    return proc.getBackgroundValue(); 
    459459  } 
     
    470470 
    471471  public BufferedImage getBufferedImage() { 
    472     record("getBufferedImage", null, (Class) null); 
     472    record("getBufferedImage"); 
    473473    return proc.getBufferedImage(); 
    474474  } 
    475475 
    476476  public float[] getCalibrationTable() { 
    477     record("getCalibrationTable", null, (Class) null); 
     477    record("getCalibrationTable"); 
    478478    return proc.getCalibrationTable(); 
    479479  } 
    480480 
    481481  public ColorModel getColorModel() { 
    482     record("getColorModel", null, (Class) null); 
     482    record("getColorModel"); 
    483483    return proc.getColorModel(); 
    484484  } 
     
    492492 
    493493  public ColorModel getCurrentColorModel() { 
    494     record("getCurrentColorModel", null, (Class) null); 
     494    record("getCurrentColorModel"); 
    495495    return proc.getCurrentColorModel(); 
    496496  } 
    497497 
    498498  public IndexColorModel getDefaultColorModel() { 
    499     record("getDefaultColorModel", null, (Class) null); 
     499    record("getDefaultColorModel"); 
    500500    return proc.getDefaultColorModel(); 
    501501  } 
     
    513513 
    514514  public float[][] getFloatArray() { 
    515     record("getFloatArray", null, (Class) null); 
     515    record("getFloatArray"); 
    516516    return proc.getFloatArray(); 
    517517  } 
    518518 
    519519  public FontMetrics getFontMetrics() { 
    520     record("getFontMetrics", null, (Class) null); 
     520    record("getFontMetrics"); 
    521521    return proc.getFontMetrics(); 
    522522  } 
    523523 
    524524  public int getHeight() { 
    525     record("getHeight", null, (Class) null); 
     525    record("getHeight"); 
    526526    return proc.getHeight(); 
    527527  } 
    528528 
    529529  public int[] getHistogram() { 
    530     record("getHistogram", null, (Class) null); 
     530    record("getHistogram"); 
    531531    return proc.getHistogram(); 
    532532  } 
    533533 
    534534  public double getHistogramMax() { 
    535     record("getHistogramMax", null, (Class) null); 
     535    record("getHistogramMax"); 
    536536    return proc.getHistogramMax(); 
    537537  } 
    538538 
    539539  public double getHistogramMin() { 
    540     record("getHistogramMin", null, (Class) null); 
     540    record("getHistogramMin"); 
    541541    return proc.getHistogramMin(); 
    542542  } 
    543543 
    544544  public int getHistogramSize() { 
    545     record("getHistogramSize", null, (Class) null); 
     545    record("getHistogramSize"); 
    546546    return proc.getHistogramSize(); 
    547547  } 
    548548 
    549549  public int[][] getIntArray() { 
    550     record("getIntArray", null, (Class) null); 
     550    record("getIntArray"); 
    551551    return proc.getIntArray(); 
    552552  } 
    553553 
    554554  public boolean getInterpolate() { 
    555     record("getInterpolate", null, (Class) null); 
     555    record("getInterpolate"); 
    556556    return proc.getInterpolate(); 
    557557  } 
     
    571571 
    572572  public int getLutUpdateMode() { 
    573     record("getLutUpdateMode", null, (Class) null); 
     573    record("getLutUpdateMode"); 
    574574    return proc.getLutUpdateMode(); 
    575575  } 
    576576 
    577577  public ImageProcessor getMask() { 
    578     record("getMask", null, (Class) null); 
     578    record("getMask"); 
    579579    return proc.getMask(); 
    580580  } 
    581581 
    582582  public byte[] getMaskArray() { 
    583     record("getMaskArray", null, (Class) null); 
     583    record("getMaskArray"); 
    584584    return proc.getMaskArray(); 
    585585  } 
    586586 
    587587  public double getMax() { 
    588     record("getMax", null, (Class) null); 
     588    record("getMax"); 
    589589    return proc.getMax(); 
    590590  } 
    591591 
    592592  public double getMaxThreshold() { 
    593     record("getMaxThreshold", null, (Class) null); 
     593    record("getMaxThreshold"); 
    594594    return proc.getMaxThreshold(); 
    595595  } 
    596596 
    597597  public double getMin() { 
    598     record("getMin", null, (Class) null); 
     598    record("getMin"); 
    599599    return proc.getMin(); 
    600600  } 
    601601 
    602602  public double getMinThreshold() { 
    603     record("getMinThreshold", null, (Class) null); 
     603    record("getMinThreshold"); 
    604604    return proc.getMinThreshold(); 
    605605  } 
    606606 
    607607  public int getNChannels() { 
    608     record("getNChannels", null, (Class) null); 
     608    record("getNChannels"); 
    609609    return proc.getNChannels(); 
    610610  } 
     
    629629 
    630630  public int getPixelCount() { 
    631     record("getPixelCount", null, (Class) null); 
     631    record("getPixelCount"); 
    632632    return proc.getPixelCount(); 
    633633  } 
    634634 
    635635  public Object getPixels() { 
    636     record("getPixels", null, (Class) null); 
     636    record("getPixels"); 
    637637    return proc.getPixels(); 
    638638  } 
    639639 
    640640  public Object getPixelsCopy() { 
    641     record("getPixelsCopy", null, (Class) null); 
     641    record("getPixelsCopy"); 
    642642    return proc.getPixelsCopy(); 
    643643  } 
     
    650650 
    651651  public Rectangle getRoi() { 
    652     record("getRoi", null, (Class) null); 
     652    record("getRoi"); 
    653653    return proc.getRoi(); 
    654654  } 
     
    662662 
    663663  public Object getSnapshotPixels() { 
    664     record("getSnapshotPixels", null, (Class) null); 
     664    record("getSnapshotPixels"); 
    665665    return proc.getSnapshotPixels(); 
    666666  } 
     
    672672 
    673673  public int getWidth() { 
    674     record("getWidth", null, (Class) null); 
     674    record("getWidth"); 
    675675    return proc.getWidth(); 
    676676  } 
     
    683683 
    684684  public void invert() { 
    685     record("invert", null, (Class) null); 
     685    record("invert"); 
    686686    proc.invert(); 
    687687  } 
    688688 
    689689  public void invertLut() { 
    690     record("invertLut", null, (Class) null); 
     690    record("invertLut"); 
    691691    proc.invertLut(); 
    692692  } 
    693693 
    694694  public boolean isColorLut() { 
    695     record("isColorLut", null, (Class) null); 
     695    record("isColorLut"); 
    696696    return proc.isColorLut(); 
    697697  } 
    698698 
    699699  public boolean isInvertedLut() { 
    700     record("isInvertedLut", null, (Class) null); 
     700    record("isInvertedLut"); 
    701701    return proc.isInvertedLut(); 
    702702  } 
    703703 
    704704  public boolean isKillable() { 
    705     record("isKillable", null, (Class) null); 
     705    record("isKillable"); 
    706706    return proc.isKillable(); 
    707707  } 
    708708 
    709709  public boolean isPseudoColorLut() { 
    710     record("isPseudoColorLut", null, (Class) null); 
     710    record("isPseudoColorLut"); 
    711711    return proc.isPseudoColorLut(); 
    712712  } 
     
    719719 
    720720  public void log() { 
    721     record("log", null, (Class) null); 
     721    record("log"); 
    722722    proc.log(); 
    723723  } 
     
    729729 
    730730  public double maxValue() { 
    731     record("maxValue", null, (Class) null); 
     731    record("maxValue"); 
    732732    return proc.maxValue(); 
    733733  } 
    734734 
    735735  public void medianFilter() { 
    736     record("medianFilter", null, (Class) null); 
     736    record("medianFilter"); 
    737737    proc.medianFilter(); 
    738738  } 
     
    744744 
    745745  public double minValue() { 
    746     record("minValue", null, (Class) null); 
     746    record("minValue"); 
    747747    return proc.minValue(); 
    748748  } 
     
    802802 
    803803  public void reset() { 
    804     record("reset", null, (Class) null); 
     804    record("reset"); 
    805805    proc.reset(); 
    806806  } 
     
    812812 
    813813  public void resetBinaryThreshold() { 
    814     record("resetBinaryThreshold", null, (Class) null); 
     814    record("resetBinaryThreshold"); 
    815815    proc.resetBinaryThreshold(); 
    816816  } 
    817817 
    818818  public void resetMinAndMax() { 
    819     record("resetMinAndMax", null, (Class) null); 
     819    record("resetMinAndMax"); 
    820820    proc.resetMinAndMax(); 
    821821  } 
    822822 
    823823  public void resetRoi() { 
    824     record("resetRoi", null, (Class) null); 
     824    record("resetRoi"); 
    825825    proc.resetRoi(); 
    826826  } 
    827827 
    828828  public void resetThreshold() { 
    829     record("resetThreshold", null, (Class) null); 
     829    record("resetThreshold"); 
    830830    proc.resetThreshold(); 
    831831  } 
     
    848848 
    849849  public ImageProcessor rotateLeft() { 
    850     record("rotateLeft", null, (Class) null); 
     850    record("rotateLeft"); 
    851851    return proc.rotateLeft(); 
    852852  } 
    853853 
    854854  public ImageProcessor rotateRight() { 
    855     record("rotateRight", null, (Class) null); 
     855    record("rotateRight"); 
    856856    return proc.rotateRight(); 
    857857  } 
     
    10481048 
    10491049  public void sharpen() { 
    1050     record("sharpen", null, (Class) null); 
     1050    record("sharpen"); 
    10511051    proc.sharpen(); 
    10521052  } 
    10531053 
    10541054  public void smooth() { 
    1055     record("smooth", null, (Class) null); 
     1055    record("smooth"); 
    10561056    proc.smooth(); 
    10571057  } 
    10581058 
    10591059  public void snapshot() { 
    1060     record("snapshot", null, (Class) null); 
     1060    record("snapshot"); 
    10611061    proc.snapshot(); 
    10621062  } 
    10631063 
    10641064  public void sqr() { 
    1065     record("sqr", null, (Class) null); 
     1065    record("sqr"); 
    10661066    proc.sqr(); 
    10671067  } 
    10681068 
    10691069  public void sqrt() { 
    1070     record("sqrt", null, (Class) null); 
     1070    record("sqrt"); 
    10711071    proc.sqrt(); 
    10721072  } 
     
    10841084 
    10851085  public String toString() { 
    1086     record("toString", null, (Class) null); 
     1086    record("toString"); 
    10871087    return proc.toString(); 
    10881088  } 
     
    11081108  // -- Helper methods -- 
    11091109 
    1110   private void record(String method, Object v, Class c) { 
     1110  private void record(String method) { 
     1111    record(method, (Object[]) null, (Class<?>) null); 
     1112  } 
     1113   
     1114  private void record(String method, Object v, Class<?> c) { 
    11111115    record(method, v == null ? null : new Object[] {v}, 
    1112       c == null ? null : new Class[] {c}); 
    1113   } 
    1114  
    1115   private void record(String method, Object[] v, Class[] c) { 
     1116      c == null ? null : new Class<?>[] {c}); 
     1117  } 
     1118 
     1119  private void record(String method, Object[] v, Class<?>[] c) { 
    11161120    if (!doRecording) return; 
    11171121 
Note: See TracChangeset for help on using the changeset viewer.