dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Put getExtension back into ImageUtil. There were too many dependencies necessary when including FileUtil in the build process

Browse Source
This commit is contained in:
nathan 2016-02-21 01:52:55 +01:00
parent dc41acbbed
commit 3add3419a8
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/dorkbox/systemTray/ImageUtil.java
View File

@ -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) {

7
src/dorkbox/systemTray/swing/SwingMenuEntry.java
View File

@ -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 {