From f227e875b3a140abaabeba80c112c9949918705f Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Fri, 28 Mar 2014 15:26:55 +0100 Subject: [PATCH] renamed packages to fit into psi structure Added plugins.config file --- Readme.md | 9 ++++++++- .../{imcacat/jcbf => ch/psi/imagej/cbf}/Base64.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/ByteArrayCbfData.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfCompression.java | 2 +- .../{imcacat/jcbf => ch/psi/imagej/cbf}/CbfData.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfElementType.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfImageReadParam.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfImageReader.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfImageReaderSpi.java | 5 +++-- .../jcbf => ch/psi/imagej/cbf}/CbfImageWriteParam.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfImageWriter.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfImageWriterSpi.java | 5 +++-- .../jcbf => ch/psi/imagej/cbf}/CbfMetadata.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/CbfMetadataFormat.java | 2 +- .../psi/imagej/cbf}/ImageInputStreamCbfData.java | 2 +- .../jcbf => ch/psi/imagej/cbf}/ImageJCbfReader.java | 2 +- .../{imcacat/jcbf => ch/psi/imagej/cbf}/Version.java | 2 +- src/main/resources/plugins.config | 1 + .../jcbf => ch/psi/imagej/cbf}/Base64Test.java | 4 +++- .../jcbf => ch/psi/imagej/cbf}/CbfCompressionTest.java | 4 +++- .../jcbf => ch/psi/imagej/cbf}/CbfElementTypeTest.java | 4 +++- .../psi/imagej/cbf}/CbfImageReaderSpiTest.java | 4 +++- .../jcbf => ch/psi/imagej/cbf}/CbfImageReaderTest.java | 9 ++++++++- .../psi/imagej/cbf}/CbfImageWriterSpiTest.java | 4 +++- .../jcbf => ch/psi/imagej/cbf}/CbfImageWriterTest.java | 10 +++++++++- .../jcbf => ch/psi/imagej/cbf}/CbfMetadataTest.java | 6 ++++-- .../{imcacat/jcbf => ch/psi/imagej/cbf}/TestUtils.java | 8 +++++++- 27 files changed, 72 insertions(+), 29 deletions(-) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/Base64.java (99%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/ByteArrayCbfData.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfCompression.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfData.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfElementType.java (99%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageReadParam.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageReader.java (99%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageReaderSpi.java (96%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageWriteParam.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageWriter.java (99%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageWriterSpi.java (96%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfMetadata.java (99%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfMetadataFormat.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/ImageInputStreamCbfData.java (98%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/ImageJCbfReader.java (99%) rename src/main/java/{imcacat/jcbf => ch/psi/imagej/cbf}/Version.java (97%) create mode 100644 src/main/resources/plugins.config rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/Base64Test.java (98%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfCompressionTest.java (94%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfElementTypeTest.java (94%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageReaderSpiTest.java (97%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageReaderTest.java (99%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageWriterSpiTest.java (95%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfImageWriterTest.java (99%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/CbfMetadataTest.java (96%) rename src/test/java/{imcacat/jcbf => ch/psi/imagej/cbf}/TestUtils.java (98%) diff --git a/Readme.md b/Readme.md index f9d213a..26ac7af 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,13 @@ +# Overview Jcbf ([J]ava [C]rystallographic [B]inary [F]ile) is a pure Java library for reading and writing minimal CBF (miniCBF) image files using the MIME "mini-header" and the "none" or "byte_offset" compression algorithm, as produced by DECTRIS PILATUS detectors. +It was initially developed by J. Lewis Muir (IMCA-CAT). + + +# Development +To build the code run following maven command/goals: +`mvn clean compile assembly:single` + -Written in March 2011 by J. Lewis Muir (IMCA-CAT). diff --git a/src/main/java/imcacat/jcbf/Base64.java b/src/main/java/ch/psi/imagej/cbf/Base64.java similarity index 99% rename from src/main/java/imcacat/jcbf/Base64.java rename to src/main/java/ch/psi/imagej/cbf/Base64.java index 0ecdacd..766d5c4 100644 --- a/src/main/java/imcacat/jcbf/Base64.java +++ b/src/main/java/ch/psi/imagej/cbf/Base64.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.nio.ByteBuffer; diff --git a/src/main/java/imcacat/jcbf/ByteArrayCbfData.java b/src/main/java/ch/psi/imagej/cbf/ByteArrayCbfData.java similarity index 98% rename from src/main/java/imcacat/jcbf/ByteArrayCbfData.java rename to src/main/java/ch/psi/imagej/cbf/ByteArrayCbfData.java index 3f76033..8472fd2 100644 --- a/src/main/java/imcacat/jcbf/ByteArrayCbfData.java +++ b/src/main/java/ch/psi/imagej/cbf/ByteArrayCbfData.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/imcacat/jcbf/CbfCompression.java b/src/main/java/ch/psi/imagej/cbf/CbfCompression.java similarity index 98% rename from src/main/java/imcacat/jcbf/CbfCompression.java rename to src/main/java/ch/psi/imagej/cbf/CbfCompression.java index 09a9ac2..f3698ad 100644 --- a/src/main/java/imcacat/jcbf/CbfCompression.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfCompression.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.text.ParseException; diff --git a/src/main/java/imcacat/jcbf/CbfData.java b/src/main/java/ch/psi/imagej/cbf/CbfData.java similarity index 98% rename from src/main/java/imcacat/jcbf/CbfData.java rename to src/main/java/ch/psi/imagej/cbf/CbfData.java index 19b9637..7483328 100644 --- a/src/main/java/imcacat/jcbf/CbfData.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfData.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.io.IOException; import java.nio.ByteOrder; diff --git a/src/main/java/imcacat/jcbf/CbfElementType.java b/src/main/java/ch/psi/imagej/cbf/CbfElementType.java similarity index 99% rename from src/main/java/imcacat/jcbf/CbfElementType.java rename to src/main/java/ch/psi/imagej/cbf/CbfElementType.java index 545e8d5..457bbf7 100644 --- a/src/main/java/imcacat/jcbf/CbfElementType.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfElementType.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.awt.image.DataBuffer; import java.text.ParseException; diff --git a/src/main/java/imcacat/jcbf/CbfImageReadParam.java b/src/main/java/ch/psi/imagej/cbf/CbfImageReadParam.java similarity index 98% rename from src/main/java/imcacat/jcbf/CbfImageReadParam.java rename to src/main/java/ch/psi/imagej/cbf/CbfImageReadParam.java index 4f3b953..ace02ac 100644 --- a/src/main/java/imcacat/jcbf/CbfImageReadParam.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfImageReadParam.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import javax.imageio.ImageReadParam; diff --git a/src/main/java/imcacat/jcbf/CbfImageReader.java b/src/main/java/ch/psi/imagej/cbf/CbfImageReader.java similarity index 99% rename from src/main/java/imcacat/jcbf/CbfImageReader.java rename to src/main/java/ch/psi/imagej/cbf/CbfImageReader.java index 58664e8..74b5dc5 100644 --- a/src/main/java/imcacat/jcbf/CbfImageReader.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfImageReader.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.awt.Rectangle; import java.awt.color.ColorSpace; diff --git a/src/main/java/imcacat/jcbf/CbfImageReaderSpi.java b/src/main/java/ch/psi/imagej/cbf/CbfImageReaderSpi.java similarity index 96% rename from src/main/java/imcacat/jcbf/CbfImageReaderSpi.java rename to src/main/java/ch/psi/imagej/cbf/CbfImageReaderSpi.java index f0b4cff..1cdeb6f 100644 --- a/src/main/java/imcacat/jcbf/CbfImageReaderSpi.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfImageReaderSpi.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.io.EOFException; import java.io.IOException; @@ -39,7 +39,8 @@ public class CbfImageReaderSpi extends ImageReaderSpi { private static final String METADATA_FORMAT_NAME = "imcacat.jcbf.CbfMetadataFormat_1.0"; private static final String METADATA_FORMAT_CLASS_NAME = "imcacat.jcbf.CbfMetadataFormat"; - public CbfImageReaderSpi() { + @SuppressWarnings("deprecation") +public CbfImageReaderSpi() { super(VENDOR_NAME, VERSION, FORMAT_NAMES, FORMAT_SUFFIXES, MIME_TYPES, READER_CLASS_NAME, STANDARD_INPUT_TYPE, WRITER_SPI_CLASS_NAMES, false, null, null, null, null, false, METADATA_FORMAT_NAME, METADATA_FORMAT_CLASS_NAME, null, null); diff --git a/src/main/java/imcacat/jcbf/CbfImageWriteParam.java b/src/main/java/ch/psi/imagej/cbf/CbfImageWriteParam.java similarity index 98% rename from src/main/java/imcacat/jcbf/CbfImageWriteParam.java rename to src/main/java/ch/psi/imagej/cbf/CbfImageWriteParam.java index cd03894..6664608 100644 --- a/src/main/java/imcacat/jcbf/CbfImageWriteParam.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfImageWriteParam.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import javax.imageio.ImageWriteParam; diff --git a/src/main/java/imcacat/jcbf/CbfImageWriter.java b/src/main/java/ch/psi/imagej/cbf/CbfImageWriter.java similarity index 99% rename from src/main/java/imcacat/jcbf/CbfImageWriter.java rename to src/main/java/ch/psi/imagej/cbf/CbfImageWriter.java index ca59a92..c311620 100644 --- a/src/main/java/imcacat/jcbf/CbfImageWriter.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfImageWriter.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.awt.Rectangle; import java.awt.image.BufferedImage; diff --git a/src/main/java/imcacat/jcbf/CbfImageWriterSpi.java b/src/main/java/ch/psi/imagej/cbf/CbfImageWriterSpi.java similarity index 96% rename from src/main/java/imcacat/jcbf/CbfImageWriterSpi.java rename to src/main/java/ch/psi/imagej/cbf/CbfImageWriterSpi.java index e5725b4..149fcd0 100644 --- a/src/main/java/imcacat/jcbf/CbfImageWriterSpi.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfImageWriterSpi.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.awt.image.BufferedImage; import java.io.IOException; @@ -38,7 +38,8 @@ public class CbfImageWriterSpi extends ImageWriterSpi { private static final String METADATA_FORMAT_NAME = "imcacat.jcbf.CbfMetadata_1.0"; private static final String METADATA_FORMAT_CLASS_NAME = "imcacat.jcbf.CbfMetadataFormat"; - public CbfImageWriterSpi() { + @SuppressWarnings("deprecation") +public CbfImageWriterSpi() { super(VENDOR_NAME, VERSION, FORMAT_NAMES, FORMAT_SUFFIXES, MIME_TYPES, WRITER_CLASS_NAME, STANDARD_OUTPUT_TYPE, READER_SPI_CLASS_NAMES, false, null, null, null, null, false, METADATA_FORMAT_NAME, METADATA_FORMAT_CLASS_NAME, null, null); diff --git a/src/main/java/imcacat/jcbf/CbfMetadata.java b/src/main/java/ch/psi/imagej/cbf/CbfMetadata.java similarity index 99% rename from src/main/java/imcacat/jcbf/CbfMetadata.java rename to src/main/java/ch/psi/imagej/cbf/CbfMetadata.java index 4190daa..c73b8c6 100644 --- a/src/main/java/imcacat/jcbf/CbfMetadata.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfMetadata.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.nio.ByteOrder; import java.text.DateFormat; diff --git a/src/main/java/imcacat/jcbf/CbfMetadataFormat.java b/src/main/java/ch/psi/imagej/cbf/CbfMetadataFormat.java similarity index 98% rename from src/main/java/imcacat/jcbf/CbfMetadataFormat.java rename to src/main/java/ch/psi/imagej/cbf/CbfMetadataFormat.java index 8c9b6b8..c0616ca 100644 --- a/src/main/java/imcacat/jcbf/CbfMetadataFormat.java +++ b/src/main/java/ch/psi/imagej/cbf/CbfMetadataFormat.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import javax.imageio.ImageTypeSpecifier; import javax.imageio.metadata.IIOMetadataFormatImpl; diff --git a/src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java b/src/main/java/ch/psi/imagej/cbf/ImageInputStreamCbfData.java similarity index 98% rename from src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java rename to src/main/java/ch/psi/imagej/cbf/ImageInputStreamCbfData.java index bed91cc..9004138 100644 --- a/src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java +++ b/src/main/java/ch/psi/imagej/cbf/ImageInputStreamCbfData.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.io.IOException; import java.nio.ByteOrder; diff --git a/src/main/java/imcacat/jcbf/ImageJCbfReader.java b/src/main/java/ch/psi/imagej/cbf/ImageJCbfReader.java similarity index 99% rename from src/main/java/imcacat/jcbf/ImageJCbfReader.java rename to src/main/java/ch/psi/imagej/cbf/ImageJCbfReader.java index c531e79..ccfb506 100644 --- a/src/main/java/imcacat/jcbf/ImageJCbfReader.java +++ b/src/main/java/ch/psi/imagej/cbf/ImageJCbfReader.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import java.awt.image.BufferedImage; import java.awt.image.DataBuffer; diff --git a/src/main/java/imcacat/jcbf/Version.java b/src/main/java/ch/psi/imagej/cbf/Version.java similarity index 97% rename from src/main/java/imcacat/jcbf/Version.java rename to src/main/java/ch/psi/imagej/cbf/Version.java index 087746e..373f835 100644 --- a/src/main/java/imcacat/jcbf/Version.java +++ b/src/main/java/ch/psi/imagej/cbf/Version.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; /** * I provide the version identifier for this library. diff --git a/src/main/resources/plugins.config b/src/main/resources/plugins.config new file mode 100644 index 0000000..1f6c3f5 --- /dev/null +++ b/src/main/resources/plugins.config @@ -0,0 +1 @@ +File>Import, "CBF...", imcacat.jcbf.ImageJCbfReader diff --git a/src/test/java/imcacat/jcbf/Base64Test.java b/src/test/java/ch/psi/imagej/cbf/Base64Test.java similarity index 98% rename from src/test/java/imcacat/jcbf/Base64Test.java rename to src/test/java/ch/psi/imagej/cbf/Base64Test.java index fb06067..4d3374f 100644 --- a/src/test/java/imcacat/jcbf/Base64Test.java +++ b/src/test/java/ch/psi/imagej/cbf/Base64Test.java @@ -14,13 +14,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import org.junit.Test; +import ch.psi.imagej.cbf.Base64; + /** * I test Base64. */ diff --git a/src/test/java/imcacat/jcbf/CbfCompressionTest.java b/src/test/java/ch/psi/imagej/cbf/CbfCompressionTest.java similarity index 94% rename from src/test/java/imcacat/jcbf/CbfCompressionTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfCompressionTest.java index 6ead94f..c0f8f10 100644 --- a/src/test/java/imcacat/jcbf/CbfCompressionTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfCompressionTest.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertEquals; @@ -22,6 +22,8 @@ import java.text.ParseException; import org.junit.Test; +import ch.psi.imagej.cbf.CbfCompression; + /** * I test CbfCompression. */ diff --git a/src/test/java/imcacat/jcbf/CbfElementTypeTest.java b/src/test/java/ch/psi/imagej/cbf/CbfElementTypeTest.java similarity index 94% rename from src/test/java/imcacat/jcbf/CbfElementTypeTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfElementTypeTest.java index 9bfa3c5..d30801f 100644 --- a/src/test/java/imcacat/jcbf/CbfElementTypeTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfElementTypeTest.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertEquals; @@ -22,6 +22,8 @@ import java.text.ParseException; import org.junit.Test; +import ch.psi.imagej.cbf.CbfElementType; + /** * I test CbfElementType. */ diff --git a/src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java b/src/test/java/ch/psi/imagej/cbf/CbfImageReaderSpiTest.java similarity index 97% rename from src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfImageReaderSpiTest.java index ec67eed..bcfe237 100644 --- a/src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfImageReaderSpiTest.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,6 +25,8 @@ import javax.imageio.stream.ImageInputStream; import org.junit.Test; +import ch.psi.imagej.cbf.CbfImageReaderSpi; + /** * I test CbfImageReaderSpi. */ diff --git a/src/test/java/imcacat/jcbf/CbfImageReaderTest.java b/src/test/java/ch/psi/imagej/cbf/CbfImageReaderTest.java similarity index 99% rename from src/test/java/imcacat/jcbf/CbfImageReaderTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfImageReaderTest.java index 953a3e9..ff67993 100644 --- a/src/test/java/imcacat/jcbf/CbfImageReaderTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfImageReaderTest.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -45,6 +45,13 @@ import javax.imageio.stream.ImageInputStream; import org.junit.Test; +import ch.psi.imagej.cbf.Base64; +import ch.psi.imagej.cbf.CbfCompression; +import ch.psi.imagej.cbf.CbfElementType; +import ch.psi.imagej.cbf.CbfImageReader; +import ch.psi.imagej.cbf.CbfImageReaderSpi; +import ch.psi.imagej.cbf.CbfMetadata; + /** * I test CbfImageReader. */ diff --git a/src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java b/src/test/java/ch/psi/imagej/cbf/CbfImageWriterSpiTest.java similarity index 95% rename from src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfImageWriterSpiTest.java index e142ebe..a34c024 100644 --- a/src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfImageWriterSpiTest.java @@ -14,12 +14,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertTrue; import org.junit.Test; +import ch.psi.imagej.cbf.CbfImageWriterSpi; + /** * I test CbfImageWriterSpi. */ diff --git a/src/test/java/imcacat/jcbf/CbfImageWriterTest.java b/src/test/java/ch/psi/imagej/cbf/CbfImageWriterTest.java similarity index 99% rename from src/test/java/imcacat/jcbf/CbfImageWriterTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfImageWriterTest.java index 05d48f3..5df8426 100644 --- a/src/test/java/imcacat/jcbf/CbfImageWriterTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfImageWriterTest.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -51,6 +51,14 @@ import javax.imageio.stream.MemoryCacheImageOutputStream; import org.junit.Test; +import ch.psi.imagej.cbf.CbfCompression; +import ch.psi.imagej.cbf.CbfElementType; +import ch.psi.imagej.cbf.CbfImageReader; +import ch.psi.imagej.cbf.CbfImageWriteParam; +import ch.psi.imagej.cbf.CbfImageWriter; +import ch.psi.imagej.cbf.CbfImageWriterSpi; +import ch.psi.imagej.cbf.CbfMetadata; + /** * I test CbfImageWriter. */ diff --git a/src/test/java/imcacat/jcbf/CbfMetadataTest.java b/src/test/java/ch/psi/imagej/cbf/CbfMetadataTest.java similarity index 96% rename from src/test/java/imcacat/jcbf/CbfMetadataTest.java rename to src/test/java/ch/psi/imagej/cbf/CbfMetadataTest.java index 812a62a..0b7fc8a 100644 --- a/src/test/java/imcacat/jcbf/CbfMetadataTest.java +++ b/src/test/java/ch/psi/imagej/cbf/CbfMetadataTest.java @@ -14,13 +14,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertEquals; import org.junit.Test; +import ch.psi.imagej.cbf.CbfMetadata; + /** * I test CbfMetadata. */ diff --git a/src/test/java/imcacat/jcbf/TestUtils.java b/src/test/java/ch/psi/imagej/cbf/TestUtils.java similarity index 98% rename from src/test/java/imcacat/jcbf/TestUtils.java rename to src/test/java/ch/psi/imagej/cbf/TestUtils.java index 2e9ece2..cf1281b 100644 --- a/src/test/java/imcacat/jcbf/TestUtils.java +++ b/src/test/java/ch/psi/imagej/cbf/TestUtils.java @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -package imcacat.jcbf; +package ch.psi.imagej.cbf; import static org.junit.Assert.fail; @@ -39,6 +39,12 @@ import javax.imageio.stream.ImageOutputStream; import javax.imageio.stream.MemoryCacheImageInputStream; import javax.imageio.stream.MemoryCacheImageOutputStream; +import ch.psi.imagej.cbf.CbfImageReader; +import ch.psi.imagej.cbf.CbfImageReaderSpi; +import ch.psi.imagej.cbf.CbfImageWriter; +import ch.psi.imagej.cbf.CbfImageWriterSpi; +import ch.psi.imagej.cbf.CbfMetadata; + /** * I provide utility methods for use in testing. */