From 00261361d556330c65a89592670cdda1b9d87fee Mon Sep 17 00:00:00 2001 From: Raman Date: Thu, 22 Feb 2018 15:12:23 -0500 Subject: [PATCH] 3544: Integrate Media content viewer into Application content viewer - Moved FileTypeViewer to corecomponentinterfaces --- Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java | 2 ++ .../org/sleuthkit/autopsy/contentviewers/JPEGViewerDummy.java | 2 ++ .../org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java | 1 + .../FileTypeViewer.java | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) rename Core/src/org/sleuthkit/autopsy/{contentviewers => corecomponentinterfaces}/FileTypeViewer.java (93%) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java index db13e523e5..81a6dfe76a 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java @@ -18,6 +18,7 @@ */ package org.sleuthkit.autopsy.contentviewers; + import com.google.common.base.Strings; import java.awt.Component; import java.util.HashMap; @@ -30,6 +31,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector; import org.sleuthkit.datamodel.AbstractFile; +import org.sleuthkit.autopsy.corecomponentinterfaces.FileTypeViewer; /** * Generic Application content viewer diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/JPEGViewerDummy.java b/Core/src/org/sleuthkit/autopsy/contentviewers/JPEGViewerDummy.java index 8aea7540e1..479eefab99 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/JPEGViewerDummy.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/JPEGViewerDummy.java @@ -5,10 +5,12 @@ */ package org.sleuthkit.autopsy.contentviewers; + import java.awt.Component; import java.util.Arrays; import java.util.List; import org.sleuthkit.datamodel.AbstractFile; +import org.sleuthkit.autopsy.corecomponentinterfaces.FileTypeViewer; public class JPEGViewerDummy extends javax.swing.JPanel implements FileTypeViewer { diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java index 627d30e87c..b1ed014ee9 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java @@ -45,6 +45,7 @@ import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.datamodel.ContentUtils; import org.sleuthkit.datamodel.AbstractFile; +import org.sleuthkit.autopsy.corecomponentinterfaces.FileTypeViewer; public class SQLiteViewer extends javax.swing.JPanel implements FileTypeViewer { diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/FileTypeViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/FileTypeViewer.java similarity index 93% rename from Core/src/org/sleuthkit/autopsy/contentviewers/FileTypeViewer.java rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/FileTypeViewer.java index f4a677c4f4..b3ae7210a2 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/FileTypeViewer.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/FileTypeViewer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.corecomponentinterfaces; import java.awt.Component; import java.util.List; @@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.AbstractFile; * Defines an interface for application specific content viewer * */ -interface FileTypeViewer { +public interface FileTypeViewer { /** * Returns list of MIME types supported by this viewer