From 88dd66c09f3ae0eb566157be43d3e7496a3050b4 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 14 Oct 2011 06:49:12 +0000
Subject: [PATCH] minor: refactoring to make debugging easier
SVN: 23322
---
.../cisd/imagereaders/ImageReaderFactory.java | 59 +++++++++++--------
1 file changed, 34 insertions(+), 25 deletions(-)
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java b/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
index f3cf229eeee..5f15f0acffa 100644
--- a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
+++ b/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
@@ -43,6 +43,11 @@ public class ImageReaderFactory
private static List<IImageReaderLibrary> libraries;
static
+ {
+ libraries = getAvailableReaders();
+ }
+
+ private static List<IImageReaderLibrary> getAvailableReaders()
{
Iterator<IImageReaderLibrary> librariesIterator;
try
@@ -52,33 +57,37 @@ public class ImageReaderFactory
{
operationLog.warn("Image reader plugins not available (JRE < 1.6), "
+ "fallback to built-in readers.", ex);
- IImageReaderLibrary reader;
+ librariesIterator = getBuiltInReaders();
+ }
+ return CollectionUtils.asList(librariesIterator);
+ }
- List<IImageReaderLibrary> readers = new ArrayList<IImageReaderLibrary>();
- reader = tryCreateReader("ch.systemsx.cisd.imagereaders.imageio.ImageIOReaderLibrary");
- if (reader != null)
- {
- readers.add(reader);
- }
- reader = tryCreateReader("ch.systemsx.cisd.imagereaders.ij.ImageJReaderLibrary");
- if (reader != null)
- {
- readers.add(reader);
- }
- reader = tryCreateReader("ch.systemsx.cisd.imagereaders.jai.JAIReaderLibrary");
- if (reader != null)
- {
- readers.add(reader);
- }
- reader =
- tryCreateReader("ch.systemsx.cisd.imagereaders.bioformats.BioFormatsReaderLibrary");
- if (reader != null)
- {
- readers.add(reader);
- }
- librariesIterator = readers.iterator();
+ private static Iterator<IImageReaderLibrary> getBuiltInReaders()
+ {
+ IImageReaderLibrary reader;
+ List<IImageReaderLibrary> readers = new ArrayList<IImageReaderLibrary>();
+ reader = tryCreateReader("ch.systemsx.cisd.imagereaders.imageio.ImageIOReaderLibrary");
+ if (reader != null)
+ {
+ readers.add(reader);
+ }
+ reader = tryCreateReader("ch.systemsx.cisd.imagereaders.ij.ImageJReaderLibrary");
+ if (reader != null)
+ {
+ readers.add(reader);
+ }
+ reader = tryCreateReader("ch.systemsx.cisd.imagereaders.jai.JAIReaderLibrary");
+ if (reader != null)
+ {
+ readers.add(reader);
+ }
+ reader =
+ tryCreateReader("ch.systemsx.cisd.imagereaders.bioformats.BioFormatsReaderLibrary");
+ if (reader != null)
+ {
+ readers.add(reader);
}
- libraries = CollectionUtils.asList(librariesIterator);
+ return readers.iterator();
}
private static IImageReaderLibrary tryCreateReader(String className)
--
GitLab