From b0010f48d33fb740a3e389f0dddc67533d064a2e Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Wed, 21 Aug 2019 13:45:57 -0400
Subject: [PATCH] 5372 add helper method for creating empty image list

---
 .../autopsy/filequery/FileSearch.java         | 50 ++++++++-----------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
index 1fff506fa3..f5e8c817ed 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
@@ -348,12 +348,7 @@ class FileSearch {
                 0,
                 0,
                 0};
-            List<Image> videoThumbnails = new ArrayList<>();
-            videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-            videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-            videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-            videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-            return new ThumbnailsWrapper(videoThumbnails, framePositions, file);
+            return new ThumbnailsWrapper(createDefaultThumbnailList(), framePositions, file);
         }
         if (tempFile.exists() == false || tempFile.length() < file.getSize()) {
             ProgressHandle progress = ProgressHandle.createHandle(Bundle.FileSearch_genVideoThumb_progress_text(file.getName()));
@@ -366,12 +361,7 @@ class FileSearch {
                         0,
                         0,
                         0};
-                    List<Image> videoThumbnails = new ArrayList<>();
-                    videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                    videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                    videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                    videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                    return new ThumbnailsWrapper(videoThumbnails, framePositions, file);
+                    return new ThumbnailsWrapper(createDefaultThumbnailList(), framePositions, file);
                 }
                 ContentUtils.writeToFile(file, tempFile, progress, null, true);
             } catch (IOException ex) {
@@ -391,12 +381,7 @@ class FileSearch {
                     0,
                     0,
                     0};
-                List<Image> videoThumbnails = new ArrayList<>();
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                return new ThumbnailsWrapper(videoThumbnails, framePositions, file);
+                return new ThumbnailsWrapper(createDefaultThumbnailList(), framePositions, file);
             }
             double fps = videoFile.get(5); // gets frame per second
             double totalFrames = videoFile.get(7); // gets total frames
@@ -407,12 +392,7 @@ class FileSearch {
                     0,
                     0,
                     0};
-                List<Image> videoThumbnails = new ArrayList<>();
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                return new ThumbnailsWrapper(videoThumbnails, framePositions, file);
+                return new ThumbnailsWrapper(createDefaultThumbnailList(), framePositions, file);
             }
             if (Thread.interrupted()) {
                 int[] framePositions = new int[]{
@@ -420,12 +400,7 @@ class FileSearch {
                     0,
                     0,
                     0};
-                List<Image> videoThumbnails = new ArrayList<>();
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                videoThumbnails.add(ImageUtils.getDefaultThumbnail());
-                return new ThumbnailsWrapper(videoThumbnails, framePositions, file);
+                return new ThumbnailsWrapper(createDefaultThumbnailList(), framePositions, file);
             }
 
             double duration = 1000 * (totalFrames / fps); //total milliseconds
@@ -502,6 +477,21 @@ class FileSearch {
         }
     }
 
+    /**
+     * Private helper method for creating video thumbnails, for use when no
+     * thumbnails are created.
+     *
+     * @return List containing the default thumbnail.s
+     */
+    private static List<Image> createDefaultThumbnailList() {
+        List<Image> videoThumbnails = new ArrayList<>();
+        videoThumbnails.add(ImageUtils.getDefaultThumbnail());
+        videoThumbnails.add(ImageUtils.getDefaultThumbnail());
+        videoThumbnails.add(ImageUtils.getDefaultThumbnail());
+        videoThumbnails.add(ImageUtils.getDefaultThumbnail());
+        return videoThumbnails;
+    }
+
     /**
      * Clear the cache used to store search results by group.
      */