From 3f65c370a5d287ddf2eec0e29a9eab7a77bb3b03 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sun, 26 Jul 2015 11:52:11 +0000
Subject: [PATCH] * refactor

---
 .../ui/rename/ExpressionFileFilter.java       | 31 +++++++++++++++++++
 source/net/filebot/ui/rename/RenamePanel.java |  9 +-----
 2 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 source/net/filebot/ui/rename/ExpressionFileFilter.java

diff --git a/source/net/filebot/ui/rename/ExpressionFileFilter.java b/source/net/filebot/ui/rename/ExpressionFileFilter.java
new file mode 100644
index 00000000..8c642e82
--- /dev/null
+++ b/source/net/filebot/ui/rename/ExpressionFileFilter.java
@@ -0,0 +1,31 @@
+package net.filebot.ui.rename;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import net.filebot.format.ExpressionFilter;
+import net.filebot.format.MediaBindingBean;
+
+public class ExpressionFileFilter implements FileFilter {
+
+	private final ExpressionFilter filter;
+	private final boolean errorResult;
+
+	public ExpressionFileFilter(ExpressionFilter filter, boolean errorResult) {
+		this.filter = filter;
+		this.errorResult = errorResult;
+	}
+
+	@Override
+	public boolean accept(File f) {
+		try {
+			return filter.matches(new MediaBindingBean(f, f));
+		} catch (Exception e) {
+			Logger.getLogger(ExpressionFileFilter.class.getName()).log(Level.WARNING, e.toString());
+			return errorResult;
+		}
+	}
+
+}
diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java
index 54b1f1df..932e66bc 100644
--- a/source/net/filebot/ui/rename/RenamePanel.java
+++ b/source/net/filebot/ui/rename/RenamePanel.java
@@ -708,14 +708,7 @@ public class RenamePanel extends JComponent {
 				input.addAll(FileUtilities.listFiles(preset.getInputFolder()));
 				ExpressionFilter filter = preset.getIncludeFilter();
 				if (filter != null) {
-					input = FileUtilities.filter(input, (File f) -> {
-						try {
-							return filter.matches(new MediaBindingBean(f, f));
-						} catch (Exception e) {
-							Logger.getLogger(RenamePanel.class.getName()).log(Level.WARNING, e.toString());
-							return false;
-						}
-					});
+					input = FileUtilities.filter(input, new ExpressionFileFilter(filter, false));
 				}
 				renameModel.clear();
 				renameModel.files().addAll(input);