You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/12/24 15:15:17 UTC

(commons-imaging) 02/02: Convert cascading if-else to switch

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit 10482709d987cd24261f40bcab6558346a1eefa8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 24 10:14:47 2023 -0500

    Convert cascading if-else to switch
---
 .../imaging/formats/pnm/PnmImageParser.java        | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
index 19f2c8cc..5ab17a84 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
@@ -314,25 +314,28 @@ public class PnmImageParser extends AbstractImageParser<PnmImagingParameters> {
 
             final ImageFormats subtype = params.getSubtype();
             if (subtype != null) {
-                if (subtype.equals(ImageFormats.PBM)) {
+                switch (subtype) {
+                case PBM:
                     writer = new PbmWriter(useRawbits);
-                } else if (subtype.equals(ImageFormats.PGM)) {
+                    break;
+                case PGM:
                     writer = new PgmWriter(useRawbits);
-                } else if (subtype.equals(ImageFormats.PPM)) {
+                    break;
+                case PPM:
                     writer = new PpmWriter(useRawbits);
-                } else if (subtype.equals(ImageFormats.PAM)) {
+                    break;
+                case PAM:
                     writer = new PamWriter();
+                    break;
+                default:
+                    // see null-check below
+                    break;
                 }
             }
         }
 
         if (writer == null) {
-            final boolean hasAlpha = new PaletteFactory().hasTransparency(src);
-            if (hasAlpha) {
-                writer = new PamWriter();
-            } else {
-                writer = new PpmWriter(useRawbits);
-            }
+            writer = new PaletteFactory().hasTransparency(src) ? new PamWriter() : new PpmWriter(useRawbits);
         }
 
         writer.writeImage(src, os, params);