From 35859d7b758373b8e10e74b002d5fdd472aaa50f Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 17 Jul 2014 13:00:27 +0000 Subject: [PATCH] * workaround Java compiler issues --- source/net/filebot/ui/analyze/AttributeTool.java | 3 +-- source/net/filebot/ui/analyze/ExtractTool.java | 3 +-- source/net/filebot/ui/analyze/FileTree.java | 3 ++- source/net/filebot/ui/analyze/SplitTool.java | 3 +-- source/net/filebot/ui/analyze/TypeTool.java | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/source/net/filebot/ui/analyze/AttributeTool.java b/source/net/filebot/ui/analyze/AttributeTool.java index d8021c05..1edc3968 100644 --- a/source/net/filebot/ui/analyze/AttributeTool.java +++ b/source/net/filebot/ui/analyze/AttributeTool.java @@ -5,7 +5,6 @@ import static net.filebot.MediaTypes.*; import java.awt.Color; import java.io.File; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -45,7 +44,7 @@ class AttributeTool extends Tool { @Override protected TableModel createModelInBackground(File root) throws InterruptedException { - List files = (root != null) ? FileUtilities.listFiles(root) : Collections.emptyList(); + List files = (root != null) ? FileUtilities.listFiles(root) : new ArrayList(0); FileAttributesTableModel model = new FileAttributesTableModel(); for (File file : files) { diff --git a/source/net/filebot/ui/analyze/ExtractTool.java b/source/net/filebot/ui/analyze/ExtractTool.java index cbef89ae..742fa3c8 100644 --- a/source/net/filebot/ui/analyze/ExtractTool.java +++ b/source/net/filebot/ui/analyze/ExtractTool.java @@ -12,7 +12,6 @@ import java.beans.PropertyChangeEvent; import java.io.File; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -73,7 +72,7 @@ class ExtractTool extends Tool { @Override protected TableModel createModelInBackground(File root) throws InterruptedException { - List files = (root != null) ? FileUtilities.listFiles(root) : Collections.emptyList(); + List files = (root != null) ? FileUtilities.listFiles(root) : new ArrayList(0); List entries = new ArrayList(); try { diff --git a/source/net/filebot/ui/analyze/FileTree.java b/source/net/filebot/ui/analyze/FileTree.java index 7a2f2749..2b631c6f 100644 --- a/source/net/filebot/ui/analyze/FileTree.java +++ b/source/net/filebot/ui/analyze/FileTree.java @@ -9,6 +9,7 @@ import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; +import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.Iterator; @@ -250,7 +251,7 @@ public class FileTree extends JTree { * Creates a root node (no parent, no title, empty list of children) */ public FolderNode() { - this(null, "", emptyList()); + this(null, "", new ArrayList(0)); } public FolderNode(String title, List children) { diff --git a/source/net/filebot/ui/analyze/SplitTool.java b/source/net/filebot/ui/analyze/SplitTool.java index 2e5b4137..66cbb604 100644 --- a/source/net/filebot/ui/analyze/SplitTool.java +++ b/source/net/filebot/ui/analyze/SplitTool.java @@ -3,7 +3,6 @@ package net.filebot.ui.analyze; import java.awt.Color; import java.io.File; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.swing.JLabel; @@ -71,7 +70,7 @@ class SplitTool extends Tool { int nextPart = 1; long splitSize = getSplitSize(); - List files = (root != null) ? FileUtilities.listFiles(root) : Collections.emptyList(); + List files = (root != null) ? FileUtilities.listFiles(root) : new ArrayList(0); List rootGroup = new ArrayList(); List currentPart = new ArrayList(); diff --git a/source/net/filebot/ui/analyze/TypeTool.java b/source/net/filebot/ui/analyze/TypeTool.java index 2fadc88b..fc5a4ec1 100644 --- a/source/net/filebot/ui/analyze/TypeTool.java +++ b/source/net/filebot/ui/analyze/TypeTool.java @@ -49,7 +49,7 @@ class TypeTool extends Tool { @Override protected TreeModel createModelInBackground(File root) throws InterruptedException { - List filesAndFolders = (root != null) ? listFiles(singleton(root), FILE_WALK_MAX_DEPTH, false, true, true) : emptyList(); + List filesAndFolders = (root != null) ? listFiles(singleton(root), FILE_WALK_MAX_DEPTH, false, true, true) : new ArrayList(0); List groups = new ArrayList(); for (Entry it : getMetaTypes().entrySet()) {