Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft version of a modularized twelvemonkeys #685

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/common-image/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module com.twelvemonkeys.common.image {
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;

requires transitive java.desktop;
requires static jmagick; //Optional, assumed not transitive.

exports com.twelvemonkeys.image;

}

13 changes: 13 additions & 0 deletions common/common-io/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module com.twelvemonkeys.common.io {
requires transitive com.twelvemonkeys.common.lang;
requires transitive java.desktop;
requires transitive java.xml;

exports com.twelvemonkeys.io;
exports com.twelvemonkeys.io.enc;
exports com.twelvemonkeys.io.ole2;
exports com.twelvemonkeys.net;
exports com.twelvemonkeys.xml;

}

10 changes: 10 additions & 0 deletions common/common-lang/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module com.twelvemonkeys.common.lang {
requires transitive java.desktop;
requires transitive java.sql;

exports com.twelvemonkeys.lang;
exports com.twelvemonkeys.util;
exports com.twelvemonkeys.util.convert;
exports com.twelvemonkeys.util.regex;
exports com.twelvemonkeys.util.service;
}
14 changes: 14 additions & 0 deletions contrib/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module com.twelvemonkeys.contrib {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.lang;
requires com.twelvemonkeys.imageio.core;
requires com.twelvemonkeys.imageio.metadata;
requires java.xml;

requires transitive java.desktop;

exports com.twelvemonkeys.contrib.exif;
exports com.twelvemonkeys.contrib.tiff;

}

28 changes: 28 additions & 0 deletions imageio/imageio-batik/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module com.twelvemonkeys.imageio.batik {
requires batik.anim;
requires batik.awt.util;
requires batik.bridge;
requires batik.dom;
requires batik.gvt;
requires batik.parser;
requires batik.transcoder;
requires batik.util;
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.lang;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

// Dependency from an automatic module.
// com.twelvemonkeys.imageio.plugins.svg.SVGImageReader$Rasterizer -> org.w3c.dom.svg.SVGSVGElement
requires xml.apis.ext;

exports com.twelvemonkeys.imageio.plugins.svg;
exports com.twelvemonkeys.imageio.plugins.wmf;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.svg.SVGImageReaderSpi,
com.twelvemonkeys.imageio.plugins.wmf.WMFImageReaderSpi;

}
21 changes: 21 additions & 0 deletions imageio/imageio-bmp/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module com.twelvemonkeys.imageio.bmp {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.bmp;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.bmp.BMPImageReaderSpi,
com.twelvemonkeys.imageio.plugins.bmp.CURImageReaderSpi,
com.twelvemonkeys.imageio.plugins.bmp.ICOImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.bmp.BMPImageWriterSpi,
com.twelvemonkeys.imageio.plugins.bmp.ICOImageWriterSpi;

}

11 changes: 11 additions & 0 deletions imageio/imageio-clippath/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module com.twelvemonkeys.imageio.clippath {
requires com.twelvemonkeys.common.lang;
requires com.twelvemonkeys.imageio.core;
requires com.twelvemonkeys.imageio.metadata;
requires java.xml;

requires transitive java.desktop;

exports com.twelvemonkeys.imageio.path;

}
21 changes: 21 additions & 0 deletions imageio/imageio-core/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module com.twelvemonkeys.imageio.core {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires java.datatransfer;

requires transitive java.desktop;
requires transitive java.xml;

exports com.twelvemonkeys.imageio;
exports com.twelvemonkeys.imageio.color;
exports com.twelvemonkeys.imageio.spi;
exports com.twelvemonkeys.imageio.stream;
exports com.twelvemonkeys.imageio.util;

provides javax.imageio.spi.ImageInputStreamSpi with
com.twelvemonkeys.imageio.stream.BufferedFileImageInputStreamSpi,
com.twelvemonkeys.imageio.stream.BufferedRAFImageInputStreamSpi,
com.twelvemonkeys.imageio.color.ProfileDeferralActivator.Spi;

}
14 changes: 14 additions & 0 deletions imageio/imageio-hdr/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module com.twelvemonkeys.imageio.hdr {
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.hdr;
exports com.twelvemonkeys.imageio.plugins.hdr.tonemap;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.hdr.HDRImageReaderSpi;

}

16 changes: 16 additions & 0 deletions imageio/imageio-icns/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module com.twelvemonkeys.imageio.icns {
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.icns;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.icns.ICNSImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.icns.ICNSImageWriterSpi;

}

18 changes: 18 additions & 0 deletions imageio/imageio-iff/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module com.twelvemonkeys.imageio.iff {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.iff;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.iff.IFFImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.iff.IFFImageWriterSpi;

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module com.twelvemonkeys.imageio.jpeg.jaiinterop {
//NULL
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module com.twelvemonkeys.imageio.jpeg.jep262interop {
//NULL
}

18 changes: 18 additions & 0 deletions imageio/imageio-jpeg/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module com.twelvemonkeys.imageio.jpeg {
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires com.twelvemonkeys.imageio.metadata;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.jpeg;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageWriterSpi;

}

16 changes: 16 additions & 0 deletions imageio/imageio-metadata/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module com.twelvemonkeys.imageio.metadata {
requires com.twelvemonkeys.common.lang;
requires com.twelvemonkeys.imageio.core;
requires java.xml;

requires transitive java.desktop;

exports com.twelvemonkeys.imageio.metadata;
exports com.twelvemonkeys.imageio.metadata.exif;
exports com.twelvemonkeys.imageio.metadata.iptc;
exports com.twelvemonkeys.imageio.metadata.jpeg;
exports com.twelvemonkeys.imageio.metadata.psd;
exports com.twelvemonkeys.imageio.metadata.tiff;
exports com.twelvemonkeys.imageio.metadata.xmp;

}
Binary file modified imageio/imageio-metadata/src/test/resources/exif/exif-loop.bin
Binary file not shown.
15 changes: 15 additions & 0 deletions imageio/imageio-pcx/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module com.twelvemonkeys.imageio.pcx {
requires com.twelvemonkeys.common.io;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.dcx;
exports com.twelvemonkeys.imageio.plugins.pcx;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.pcx.PCXImageReaderSpi,
com.twelvemonkeys.imageio.plugins.dcx.DCXImageReaderSpi;

}
3 changes: 3 additions & 0 deletions imageio/imageio-pdf/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module com.twelvemonkeys.imageio.pdf {
//todo: Implement... things
}
20 changes: 20 additions & 0 deletions imageio/imageio-pict/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module com.twelvemonkeys.imageio.pict {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.pict;
exports com.twelvemonkeys.imageio.plugins.pntg;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.pntg.PNTGImageReaderSpi,
com.twelvemonkeys.imageio.plugins.pict.PICTImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.pict.PICTImageWriterSpi;

}

19 changes: 19 additions & 0 deletions imageio/imageio-pnm/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module com.twelvemonkeys.imageio.pnm {
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.pnm;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.pnm.PNMImageReaderSpi,
com.twelvemonkeys.imageio.plugins.pnm.PAMImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.pnm.PNMImageWriterSpi,
com.twelvemonkeys.imageio.plugins.pnm.PAMImageWriterSpi;

}

18 changes: 18 additions & 0 deletions imageio/imageio-psd/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module com.twelvemonkeys.imageio.psd {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires com.twelvemonkeys.imageio.metadata;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;
requires transitive java.xml;

exports com.twelvemonkeys.imageio.plugins.psd;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.psd.PSDImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.psd.PSDImageWriterSpi;

}
3 changes: 3 additions & 0 deletions imageio/imageio-reference/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module com.twelvemonkeys.imageio.reference {
//NULL
}
13 changes: 13 additions & 0 deletions imageio/imageio-sgi/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module com.twelvemonkeys.imageio.sgi {
requires com.twelvemonkeys.common.io;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.sgi;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.sgi.SGIImageReaderSpi;

}
16 changes: 16 additions & 0 deletions imageio/imageio-tga/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module com.twelvemonkeys.imageio.tga {
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;
requires java.xml;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.tga;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.tga.TGAImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.tga.TGAImageWriterSpi;

}
13 changes: 13 additions & 0 deletions imageio/imageio-thumbsdb/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module com.twelvemonkeys.imageio.thumbsdb {
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive java.desktop;

exports com.twelvemonkeys.imageio.plugins.thumbsdb;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.thumbsdb.ThumbsDBImageReaderSpi;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module com.twelvemonkeys.imageio.tiff.jaiinterop {
//NULL
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module com.twelvemonkeys.imageio.tiff.jdkinterop {
//NULL
}

20 changes: 20 additions & 0 deletions imageio/imageio-tiff/src/main/java/module-info.java9
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module com.twelvemonkeys.imageio.tiff {
requires com.twelvemonkeys.common.image;
requires com.twelvemonkeys.common.io;
requires com.twelvemonkeys.common.lang;

requires transitive com.twelvemonkeys.imageio.core;
requires transitive com.twelvemonkeys.imageio.metadata;
requires transitive java.desktop;
requires transitive java.xml;

exports com.twelvemonkeys.imageio.plugins.tiff;

provides javax.imageio.spi.ImageReaderSpi with
com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi,
com.twelvemonkeys.imageio.plugins.tiff.BigTIFFImageReaderSpi;
provides javax.imageio.spi.ImageWriterSpi with
com.twelvemonkeys.imageio.plugins.tiff.TIFFImageWriterSpi,
com.twelvemonkeys.imageio.plugins.tiff.BigTIFFImageWriterSpi;

}
Loading