From 38bc994638f0889a6192295d96b927763ee5e360 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 10 Aug 2016 00:49:17 +0800 Subject: [PATCH] Refactor MetaAttributeView --- source/net/filebot/MetaAttributeView.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/source/net/filebot/MetaAttributeView.java b/source/net/filebot/MetaAttributeView.java index ab5f0ab4..ba2f0511 100644 --- a/source/net/filebot/MetaAttributeView.java +++ b/source/net/filebot/MetaAttributeView.java @@ -17,15 +17,14 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import net.filebot.mac.xattr.XAttrUtil; - import com.sun.jna.Platform; +import net.filebot.mac.xattr.XAttrUtil; + public class MetaAttributeView extends AbstractMap { - // UserDefinedFileAttributeView (for Windows and Linux) OR our own xattr.h JNA wrapper via MacXattrView (for Mac) because UserDefinedFileAttributeView is not supported (Oracle Java 7/8) private Object xattr; - private Charset encoding; + private Charset encoding = UTF_8; public MetaAttributeView(File file) throws IOException { Path path = file.getCanonicalFile().toPath(); @@ -37,17 +36,15 @@ public class MetaAttributeView extends AbstractMap { path = link; } - xattr = Files.getFileAttributeView(path, UserDefinedFileAttributeView.class); + // UserDefinedFileAttributeView (for Windows and Linux) OR our own xattr.h JNA wrapper via MacXattrView (for Mac) because UserDefinedFileAttributeView is not supported (Oracle Java 7/8) + if (Platform.isMac()) { + xattr = new MacXattrView(path); + } else { + xattr = Files.getFileAttributeView(path, UserDefinedFileAttributeView.class); - if (xattr == null) { - if (Platform.isMac()) { - xattr = new MacXattrView(path); - } else { + if (xattr == null) { throw new IOException("UserDefinedFileAttributeView is not supported"); } - } else { - // UserDefinedFileAttributeView - this.encoding = UTF_8; } }