From 6361ae591e5dbaf9536d4c204d4d906a000ff173 Mon Sep 17 00:00:00 2001 From: Raman Date: Tue, 6 Mar 2018 08:07:11 -0500 Subject: [PATCH 1/2] 3594: Move Application viewer tab to left - Reordered content viewers --- Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java | 2 +- Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java | 2 +- .../autopsy/corecomponents/DataContentViewerArtifact.java | 2 +- .../sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java index 395f2aa7e5..1d2a1a2a5b 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java @@ -36,7 +36,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.FileTypeViewer; /** * Generic Application content viewer */ -@ServiceProvider(service = DataContentViewer.class, position = 5) +@ServiceProvider(service = DataContentViewer.class, position = 3) public class FileViewer extends javax.swing.JPanel implements DataContentViewer { private static final int CONFIDENCE_LEVEL = 7; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java index df1db76507..060280ed08 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java @@ -35,7 +35,7 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; * shows the same data that can also be found in the ResultViewer table, just a * different order and allows the full path to be visible in the bottom area. */ -@ServiceProvider(service = DataContentViewer.class, position = 3) +@ServiceProvider(service = DataContentViewer.class, position = 6) public class Metadata extends javax.swing.JPanel implements DataContentViewer { /** diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java index c4f35e9b8a..a3e33ef02e 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java @@ -62,7 +62,7 @@ import org.netbeans.swing.etable.ETable; * Content represented by a Node. Each BlackboardArtifact is rendered displayed * in a JTable representation of its BlackboardAttributes. */ -@ServiceProvider(service = DataContentViewer.class, position = 3) +@ServiceProvider(service = DataContentViewer.class, position = 7) public class DataContentViewerArtifact extends javax.swing.JPanel implements DataContentViewer { @NbBundle.Messages({ diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java index 08b2d0a7bb..2c348efc7a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java @@ -49,7 +49,7 @@ import org.sleuthkit.datamodel.TskCoreException; * A content viewer that displays the indexed text associated with a file or an * artifact, possibly marked up with HTML to highlight keyword hits. */ -@ServiceProvider(service = DataContentViewer.class, position = 4) +@ServiceProvider(service = DataContentViewer.class, position = 5) public class ExtractedContentViewer implements DataContentViewer { private static final Logger logger = Logger.getLogger(ExtractedContentViewer.class.getName()); From 5917545641047e969faa1311a5d5a0eed0ac330a Mon Sep 17 00:00:00 2001 From: Raman Date: Tue, 6 Mar 2018 09:33:08 -0500 Subject: [PATCH 2/2] 3594: Move Application viewer tab to left Swapped positions for Message veiwer and Indexed text viewer --- .../sleuthkit/autopsy/contentviewers/MessageContentViewer.java | 2 +- .../sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java index 228dc09c13..cd3722fa93 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java @@ -70,7 +70,7 @@ import org.sleuthkit.datamodel.TskCoreException; /** * Shows SMS/MMS/EMail messages */ -@ServiceProvider(service = DataContentViewer.class, position = 4) +@ServiceProvider(service = DataContentViewer.class, position = 5) public class MessageContentViewer extends javax.swing.JPanel implements DataContentViewer { private static final long serialVersionUID = 1L; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java index 2c348efc7a..08b2d0a7bb 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java @@ -49,7 +49,7 @@ import org.sleuthkit.datamodel.TskCoreException; * A content viewer that displays the indexed text associated with a file or an * artifact, possibly marked up with HTML to highlight keyword hits. */ -@ServiceProvider(service = DataContentViewer.class, position = 5) +@ServiceProvider(service = DataContentViewer.class, position = 4) public class ExtractedContentViewer implements DataContentViewer { private static final Logger logger = Logger.getLogger(ExtractedContentViewer.class.getName());