Version 1.3.4

Update dependencies and optimize image processing

Removed imgscalr-lib and added simple-png-javafx as a dependency to enhance image processing and remove dependency on AWT and Swing. Optimized the image resizing process in 'ProcessFile' by reusing the last resized image when the next image size is the same as the last one. Unnecessary print statements were removed, and project version was updated to 1.3.4.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.simtechdata</groupId>
     <artifactId>MacIcns</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -42,16 +42,16 @@
             <artifactId>javafx-swing</artifactId>
             <version>${javafx.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.imgscalr</groupId>
-            <artifactId>imgscalr-lib</artifactId>
-            <version>4.2</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.15.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.glavo</groupId>
+            <artifactId>simple-png-javafx</artifactId>
+            <version>0.2.0</version>
+        </dependency>
         <dependency>
             <groupId>com.simtechdata</groupId>
             <artifactId>JavaProc</artifactId>

src/main/java/com/simtechdata/ProcessFile.java

@@ -1,13 +1,12 @@
 package com.simtechdata;
 
-import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
 import javafx.scene.image.WritableImage;
 import javafx.scene.paint.Color;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.glavo.png.javafx.PNGJavaFXUtils;
 
-import javax.imageio.ImageIO;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -133,22 +132,38 @@ public Job(Image original, Path path, int size) {
             this.size = size;
         }
 
+        public static WritableImage lastImage;
         private final Image original;
         private final Path path;
         private final int size;
+        private int lastSize = 0;
 
         public void saveFile() {
             try {
-                WritableImage finalImage = getImage();
-                ImageIO.write(SwingFXUtils.fromFXImage(finalImage, null), "PNG", path.toFile());
+                PNGJavaFXUtils.writeImage(getImage(), path);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         }
 
         private WritableImage getImage() {
             try {
-                return resizeImage(original, size, size);
+                WritableImage writableImage;
+                if(lastImage == null) {
+                    writableImage = resizeImage(original, size, size);
+                    lastImage = writableImage;
+                    lastSize = size;
+                }
+                else {
+                    if(size == lastSize) {
+                        writableImage = lastImage;
+                    }
+                    else {
+                        writableImage = resizeImage(lastImage, size, size);
+                        lastSize = size;
+                    }
+                }
+                return writableImage;
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

src/main/java/com/simtechdata/Run.java

@@ -23,7 +23,6 @@ public int run() {
                 .withNoTimeout()
                 .ignoreExitStatus()
                 .run();
-        System.out.println(result.getCommandLine());
         return result.getExitValue();
     }
 }

src/main/java/com/simtechdata/utils/Shell.java

@@ -11,7 +11,6 @@ public static int run(String command, String[] args) {
                 .withNoTimeout()
                 .ignoreExitStatus()
                 .run();
-        System.out.println(r.getCommandLine());
         return r.getExitValue();
     }
 }

src/main/java/module-info.java

@@ -3,7 +3,7 @@
     requires javafx.swing;
     requires java.desktop;
     requires org.apache.commons.io;
-    requires imgscalr.lib;
+    requires org.glavo.png.javafx;
     requires java.prefs;
     requires JavaProc;