From 3add3419a87dc35597e5aa069e3a37eb2be2e2fd Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Sun, 21 Feb 2016 01:52:55 +0100
Subject: [PATCH] Put getExtension back into ImageUtil. There were too many
 dependencies necessary when including FileUtil in the build process

---
 src/dorkbox/systemTray/ImageUtil.java         | 19 ++++++++++++-------
 .../systemTray/swing/SwingMenuEntry.java      |  7 +++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/dorkbox/systemTray/ImageUtil.java b/src/dorkbox/systemTray/ImageUtil.java
index 4c16bb3..bb43c7e 100644
--- a/src/dorkbox/systemTray/ImageUtil.java
+++ b/src/dorkbox/systemTray/ImageUtil.java
@@ -15,7 +15,6 @@
  */
 package dorkbox.systemTray;
 
-import dorkbox.util.FileUtil;
 import dorkbox.util.LocationResolver;
 import dorkbox.util.OS;
 
@@ -172,12 +171,7 @@ class ImageUtil {
         // can be wimpy, only one at a time
         String hash = hashName(bytes);
 
-        String extension = FileUtil.getExtension(cacheName);
-        if (extension == null) {
-            extension = "";
-        }
-
-
+        String extension = getExtension(cacheName);
         newFile = new File(TEMP_DIR, "SYSTRAY_" + hash + '.' + extension).getAbsoluteFile();
         if (SystemTray.isKDE) {
             // KDE is unique per run, so this prevents buildup
@@ -216,6 +210,17 @@ class ImageUtil {
         return newFile.getAbsolutePath();
     }
 
+    public static
+    String getExtension(final String fileName) {
+
+        String extension = "";
+        int dot = fileName.lastIndexOf('.');
+        if (dot > -1) {
+            extension = fileName.substring(dot + 1);
+        }
+        return extension;
+    }
+
     // must be called from synchronized block
     private static
     String hashName(byte[] nameChars) {
diff --git a/src/dorkbox/systemTray/swing/SwingMenuEntry.java b/src/dorkbox/systemTray/swing/SwingMenuEntry.java
index 02292a7..1d5305a 100644
--- a/src/dorkbox/systemTray/swing/SwingMenuEntry.java
+++ b/src/dorkbox/systemTray/swing/SwingMenuEntry.java
@@ -20,7 +20,6 @@ import dorkbox.systemTray.ImageUtil;
 import dorkbox.systemTray.MenuEntry;
 import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.SystemTrayMenuAction;
-import dorkbox.util.FileUtil;
 import dorkbox.util.SwingUtil;
 
 import javax.imageio.ImageIO;
@@ -157,9 +156,9 @@ class SwingMenuEntry implements MenuEntry {
 
                     if (delete) {
                         // now write out the new one
-                        String extension = FileUtil.getExtension(imagePath);
-                        if (extension == null) {
-                            extension = ".png"; // this is just made up
+                        String extension = ImageUtil.getExtension(imagePath);
+                        if (extension.equals("")) {
+                            extension = "png"; // made up
                         }
                         BufferedImage bufferedImage = getBufferedImage(image);
                         try {