Skip to content
Snippets Groups Projects
Commit 88dd66c0 authored by tpylak's avatar tpylak
Browse files

minor: refactoring to make debugging easier

SVN: 23322
parent 543e5c72
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,11 @@ public class ImageReaderFactory ...@@ -43,6 +43,11 @@ public class ImageReaderFactory
private static List<IImageReaderLibrary> libraries; private static List<IImageReaderLibrary> libraries;
static static
{
libraries = getAvailableReaders();
}
private static List<IImageReaderLibrary> getAvailableReaders()
{ {
Iterator<IImageReaderLibrary> librariesIterator; Iterator<IImageReaderLibrary> librariesIterator;
try try
...@@ -52,33 +57,37 @@ public class ImageReaderFactory ...@@ -52,33 +57,37 @@ public class ImageReaderFactory
{ {
operationLog.warn("Image reader plugins not available (JRE < 1.6), " operationLog.warn("Image reader plugins not available (JRE < 1.6), "
+ "fallback to built-in readers.", ex); + "fallback to built-in readers.", ex);
IImageReaderLibrary reader; librariesIterator = getBuiltInReaders();
}
return CollectionUtils.asList(librariesIterator);
}
List<IImageReaderLibrary> readers = new ArrayList<IImageReaderLibrary>(); private static Iterator<IImageReaderLibrary> getBuiltInReaders()
reader = tryCreateReader("ch.systemsx.cisd.imagereaders.imageio.ImageIOReaderLibrary"); {
if (reader != null) IImageReaderLibrary reader;
{ List<IImageReaderLibrary> readers = new ArrayList<IImageReaderLibrary>();
readers.add(reader); reader = tryCreateReader("ch.systemsx.cisd.imagereaders.imageio.ImageIOReaderLibrary");
} if (reader != null)
reader = tryCreateReader("ch.systemsx.cisd.imagereaders.ij.ImageJReaderLibrary"); {
if (reader != null) readers.add(reader);
{ }
readers.add(reader); reader = tryCreateReader("ch.systemsx.cisd.imagereaders.ij.ImageJReaderLibrary");
} if (reader != null)
reader = tryCreateReader("ch.systemsx.cisd.imagereaders.jai.JAIReaderLibrary"); {
if (reader != null) readers.add(reader);
{ }
readers.add(reader); reader = tryCreateReader("ch.systemsx.cisd.imagereaders.jai.JAIReaderLibrary");
} if (reader != null)
reader = {
tryCreateReader("ch.systemsx.cisd.imagereaders.bioformats.BioFormatsReaderLibrary"); readers.add(reader);
if (reader != null) }
{ reader =
readers.add(reader); tryCreateReader("ch.systemsx.cisd.imagereaders.bioformats.BioFormatsReaderLibrary");
} if (reader != null)
librariesIterator = readers.iterator(); {
readers.add(reader);
} }
libraries = CollectionUtils.asList(librariesIterator); return readers.iterator();
} }
private static IImageReaderLibrary tryCreateReader(String className) private static IImageReaderLibrary tryCreateReader(String className)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment