[
https://issues.apache.org/jira/browse/IMAGING-159?focusedWorklogId=624096&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-624096
]
ASF GitHub Bot logged work on IMAGING-159:
------------------------------------------
Author: ASF GitHub Bot
Created on: 18/Jul/21 10:26
Start Date: 18/Jul/21 10:26
Worklog Time Spent: 10m
Work Description: kinow commented on a change in pull request #116:
URL: https://github.com/apache/commons-imaging/pull/116#discussion_r671819743
##########
File path: src/main/java/org/apache/commons/imaging/ImageFormats.java
##########
@@ -16,40 +16,92 @@
*/
package org.apache.commons.imaging;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.imaging.formats.bmp.BmpImagingParameters;
+import org.apache.commons.imaging.formats.gif.GifImagingParameters;
+import org.apache.commons.imaging.formats.icns.IcnsImagingParameters;
+import org.apache.commons.imaging.formats.ico.IcoImagingParameters;
+import org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
+import org.apache.commons.imaging.formats.pcx.PcxImagingParameters;
+import org.apache.commons.imaging.formats.png.PngImagingParameters;
+import org.apache.commons.imaging.formats.pnm.PnmImagingParameters;
+import org.apache.commons.imaging.formats.psd.PsdImagingParameters;
+import org.apache.commons.imaging.formats.rgbe.RgbeImagingParameters;
+import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
+import org.apache.commons.imaging.formats.wbmp.WbmpImagingParameters;
+import org.apache.commons.imaging.formats.xbm.XbmImagingParameters;
+import org.apache.commons.imaging.formats.xpm.XpmImagingParameters;
+
/**
* Enum of known image formats.
*/
public enum ImageFormats implements ImageFormat {
- UNKNOWN,
- BMP,
- DCX,
- GIF,
- ICNS,
- ICO,
- JBIG2,
- JPEG,
- PAM,
- PSD,
- PBM,
- PGM,
- PNM,
- PPM,
- PCX,
- PNG,
- RGBE,
- TGA,
- TIFF,
- WBMP,
- XBM,
- XPM;
+ UNKNOWN(ImagingParameters.class),
+ BMP(BmpImagingParameters.class, "bmp", "dib"),
+ DCX(PcxImagingParameters.class, "dcx"),
+ GIF(GifImagingParameters.class, "gif"),
+ ICNS(IcnsImagingParameters.class, "icns"),
+ ICO(IcoImagingParameters.class, "ico"),
+ JBIG2(ImagingParameters.class),
+ JPEG(JpegImagingParameters.class, "jpg", "jpeg"),
+ PAM(PnmImagingParameters.class, "pam"),
+ PSD(PsdImagingParameters.class, "psd"),
+ PBM(PnmImagingParameters.class, "pbm"),
+ PGM(PnmImagingParameters.class, "pgm"),
+ PNM(PnmImagingParameters.class, "pnm"),
+ PPM(PnmImagingParameters.class, "ppm"),
+ PCX(PcxImagingParameters.class, "pcx", "pcc"),
+ PNG(PngImagingParameters.class, "png"),
+ RGBE(RgbeImagingParameters.class, "rgbe"),
+ TGA(ImagingParameters.class),
+ TIFF(TiffImagingParameters.class, "tif", "tiff"),
+ WBMP(WbmpImagingParameters.class, "wbmp"),
+ XBM(XbmImagingParameters.class, "xbm"),
+ XPM(XpmImagingParameters.class, "xpm");
+
+ private static final Logger LOGGER =
Logger.getLogger(ImageFormats.class.getName());
+
+ private String[] extensions;
+ private Class<? extends ImagingParameters> parametersClass;
+
+ ImageFormats(Class<? extends ImagingParameters> parametersClass, String
...extensions) {
+ this.extensions = extensions;
+ this.parametersClass = parametersClass;
+ }
@Override
public String getName() {
return name();
}
@Override
- public String getExtension() {
- return name();
+ public String[] getExtensions() {
+ return this.extensions.clone();
+ }
+
+ @Override
+ public String getDefaultExtension() {
+ return this.extensions[0];
+ }
+
+ @Override
+ public ImagingParameters createImagingParameters() {
+ ImagingParameters parameters = null;
+ if (this.parametersClass != null) {
+ Constructor<?> ctor;
+ try {
+ ctor = this.parametersClass.getConstructor();
+ parameters = (ImagingParameters) ctor.newInstance();
+ } catch (NoSuchMethodException | SecurityException |
InstantiationException | IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
+ LOGGER.log(Level.WARNING, "Failed to create imaging
parameters: " + e.getMessage(), e);
+ parameters = new ImagingParameters();
+ }
+ parameters.setImageFormat(this);
+ }
+ return parameters;
Review comment:
This was a great advice, and I'm super happy for having asked for
feedback in the mailing list @darkma773r. It simplified a lot the code. Got to
remember this trick next time I have a similar situation, I feel like my brain
is still tuned to use reflections in cases like this...
Thanks!!!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 624096)
Time Spent: 6h 10m (was: 6h)
> There should be a Parameters class
> ----------------------------------
>
> Key: IMAGING-159
> URL: https://issues.apache.org/jira/browse/IMAGING-159
> Project: Commons Imaging
> Issue Type: Improvement
> Components: imaging.*
> Affects Versions: 1.0-alpha2
> Reporter: Benedikt Ritter
> Assignee: Bruno P. Kinoshita
> Priority: Major
> Labels: github
> Fix For: 1.0-alpha3
>
> Time Spent: 6h 10m
> Remaining Estimate: 0h
>
> Currently options for image I/O are defined as Maps. The leads to the problem
> that our code has to validate parameter types when they are used:
> {code:java}
> final Object value = params.get(PARAM_KEY_COMPRESSION);
> if (value != null) {
> if (!(value instanceof Number)) {
> throw new ImageWriteException(
> "Invalid compression parameter, must be numeric: "
> + value);
> }
> compression = ((Number) value).intValue();
> }
> {code}
> This can be simplified if we define a Parameters class that provides
> additional methods like {{public int getInt(String key)}}. The implementation
> could then look up the value from the map through an exception if it is null
> or not a number.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
