Merge pull request #6017 from raman-bt/6434-non-public-artifactviewers

6434 non public artifactviewers

Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogDataViewer.java

@@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.communications.relationships;
 import java.beans.PropertyChangeEvent;
 import org.openide.explorer.ExplorerManager;
 import org.openide.nodes.Node;
-import org.sleuthkit.autopsy.contentviewers.CallLogArtifactViewer;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.CallLogArtifactViewer;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 

Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDataViewer.java

@@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.communications.relationships;
 import java.beans.PropertyChangeEvent;
 import org.openide.explorer.ExplorerManager;
 import org.openide.nodes.Node;
-import org.sleuthkit.autopsy.contentviewers.ContactArtifactViewer;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.ContactArtifactViewer;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 

Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java

@@ -25,7 +25,7 @@ import org.openide.explorer.ExplorerManager;
 import org.openide.nodes.Node;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
-import org.sleuthkit.autopsy.contentviewers.MessageArtifactViewer;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.MessageArtifactViewer;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;

Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties

@@ -939,45 +939,4 @@ manager.properties.lafError  =\
 manager.properties.brokenProperty =  Broken default property {0} value: {1}
 
 manager.properties.missingProperty =  Missing default property {0} value: {1}
-DefaultArtifactContentViewer.copyMenuItem.text=Copy
+
-DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
-ContactArtifactViewer.contactNameLabel.text=Joanna Doe
-ContactArtifactViewer.phonesLabel.text=Phone
-ContactArtifactViewer.emailsLabel.text=Email
-ContactArtifactViewer.othersLabel.text=Other
-DefaultArtifactContentViewer.copyMenuItem.text=Copy
-DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
-CallLogArtifactViewer.dataSourceNameLabel.text=data source name
-CallLogArtifactViewer.jLabel2.text=Device Id
-CallLogArtifactViewer.deviceIdLabel.text=device id
-CallLogArtifactViewer.localAccountIdLabel.text=local account
-CallLogArtifactViewer.localAccountLabel.text=Local Account
-CallLogArtifactViewer.jLabel4.text=Data Source Name
-CallLogArtifactViewer.otherInfoLabel.text=Other Information
-CallLogArtifactViewer.sourceSectionLabel.text=Source
-CallLogArtifactViewer.callDetailsLabel.text=Call Details
-CallLogArtifactViewer.durationLabel.text=Duration....
-CallLogArtifactViewer.dateTimeLabel.text=Date/Time.....
-CallLogArtifactViewer.directionLabel.text=Direction
-CallLogArtifactViewer.onLabel.text=On
-CallLogArtifactViewer.callLabel.text=call
-MessageArtifactViewer.fromText.text=from address goes here
-MessageArtifactViewer.datetimeText.text=date goes here
-MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers
-MessageArtifactViewer.fromLabel.text=From:
-MessageArtifactViewer.directionText.text=direction
-MessageArtifactViewer.subjectText.text=subject goes here
-MessageArtifactViewer.viewInNewWindowButton.text=View in New Window
-MessageArtifactViewer.subjectLabel.text=Subject:
-MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments
-MessageArtifactViewer.ccText.text=cc list goes here
-MessageArtifactViewer.ccLabel.text=CC:
-MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
-MessageArtifactViewer.toText.text=to list goes here
-MessageArtifactViewer.toLabel.text=To:
-MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML
-CallLogArtifactViewer.localAccountPersonaLabel.text=Persona
-CallLogArtifactViewer.localAccountPersonaNameLabel.text=jLabel1
-CallLogArtifactViewer.localAccountPersonaButton.text=jButton1
-ContactArtifactViewer.personasLabel.text=Personas
-MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts

Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED

@@ -35,50 +35,6 @@ AnnotationsContentViewer.title=Annotations
 AnnotationsContentViewer.toolTip=Displays tags and comments associated with the selected content.
 ApplicationContentViewer.title=Application
 ApplicationContentViewer.toolTip=Displays file contents.
-CalllogArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas.
-CallLogArtifactViewer_heading_metadata=Metadata
-CallLogArtifactViewer_heading_others=Other Attributes
-CallLogArtifactViewer_heading_parties=Parties
-CallLogArtifactViewer_heading_Source=Source
-CallLogArtifactViewer_label_datasource=Data Source
-CallLogArtifactViewer_label_date=Date
-CallLogArtifactViewer_label_direction=Direction
-CallLogArtifactViewer_label_duration=Duration
-CallLogArtifactViewer_label_from=From
-CallLogArtifactViewer_label_to=To
-CallLogArtifactViewer_suffix_local=(Local)
-CallLogArtifactViewer_value_unknown=Unknown
-CommunicationArtifactViewerHelper_menuitem_copy=Copy
-CommunicationArtifactViewerHelper_persona_button_create=Create
-CommunicationArtifactViewerHelper_persona_button_view=View
-CommunicationArtifactViewerHelper_persona_label=Persona: 
-CommunicationArtifactViewerHelper_persona_searching=Searching...
-CommunicationArtifactViewerHelper_persona_unknown=Unknown
-ContactArtifactViewer.contactImage.text=
-ContactArtifactViewer_contactname_unknown=Unknown
-ContactArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas.
-ContactArtifactViewer_emails_header=Email
-ContactArtifactViewer_found_all_accounts_label=All accounts found.
-ContactArtifactViewer_heading_Source=Source
-ContactArtifactViewer_label_datasource=Data Source
-ContactArtifactViewer_missing_account_label=Missing contact account
-ContactArtifactViewer_others_header=Other
-ContactArtifactViewer_persona_account_justification=Account found in Contact artifact
-ContactArtifactViewer_persona_button_new=Create
-ContactArtifactViewer_persona_button_view=View
-ContactArtifactViewer_persona_header=Persona
-ContactArtifactViewer_persona_label=Persona 
-ContactArtifactViewer_persona_match_num=Match 
-ContactArtifactViewer_persona_no_match=No matches found
-ContactArtifactViewer_persona_searching=Searching...
-ContactArtifactViewer_persona_unknown=Unknown
-ContactArtifactViewer_phones_header=Phone
-ContactArtifactViewer_plural_suffix=s
-DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database
-DataContentViewerArtifact.failedToGetSourcePath.message=Failed to get source file path from case database
-DefaultArtifactContentViewer.attrsTableHeader.sources=Source(s)
-DefaultArtifactContentViewer.attrsTableHeader.type=Type
-DefaultArtifactContentViewer.attrsTableHeader.value=Value
 FXVideoPanel.pauseButton.infoLabel.playbackErr=Unable to play video.
 FXVideoPanel.progress.bufferingCancelled=media buffering was canceled
 FXVideoPanel.progress.bufferingInterrupted=media buffering was interrupted
@@ -129,11 +85,6 @@ MediaViewVideoPanel.progressLabel.text=00:00
 MediaViewVideoPanel.infoLabel.text=info
 MediaViewImagePanel.imgFileTooLarge.msg=Could not load image file (too large): {0}
 
-MessageAccountPanel_button_create_label=Create
-MessageAccountPanel_button_view_label=View
-MessageAccountPanel_persona_label=Persona:
-MessageAccountPanel_unknown_label=Unknown
-MessageArtifactViewer.AttachmentPanel.title=Attachments
 Metadata.nodeText.none=None
 Metadata.nodeText.truncated=(results truncated)
 Metadata.nodeText.unknown=Unknown
@@ -170,8 +121,6 @@ JPEGViewerDummy.jLabel1.text=You are looking at a JPEG file:
 JPEGViewerDummy.jTextField1.text=jTextField1
 PDFViewer.encryptedDialog=This document is password protected.
 PDFViewer.errorDialog=An error occurred while opening this PDF document. Check the logs for more information. You may continue to use this feature on other PDF documents.
-# {0} - Persona count
-PersonaDisplayTask_persona_count_suffix=(1 of {0})
 PListNode.KeyCol=Key
 PListNode.TypeCol=Type
 PListNode.ValueCol=Value
@@ -1078,45 +1027,4 @@ manager.properties.lafError  =\
 manager.properties.brokenProperty =  Broken default property {0} value: {1}
 
 manager.properties.missingProperty =  Missing default property {0} value: {1}
-DefaultArtifactContentViewer.copyMenuItem.text=Copy
+
-DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
-ContactArtifactViewer.contactNameLabel.text=Joanna Doe
-ContactArtifactViewer.phonesLabel.text=Phone
-ContactArtifactViewer.emailsLabel.text=Email
-ContactArtifactViewer.othersLabel.text=Other
-DefaultArtifactContentViewer.copyMenuItem.text=Copy
-DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
-CallLogArtifactViewer.dataSourceNameLabel.text=data source name
-CallLogArtifactViewer.jLabel2.text=Device Id
-CallLogArtifactViewer.deviceIdLabel.text=device id
-CallLogArtifactViewer.localAccountIdLabel.text=local account
-CallLogArtifactViewer.localAccountLabel.text=Local Account
-CallLogArtifactViewer.jLabel4.text=Data Source Name
-CallLogArtifactViewer.otherInfoLabel.text=Other Information
-CallLogArtifactViewer.sourceSectionLabel.text=Source
-CallLogArtifactViewer.callDetailsLabel.text=Call Details
-CallLogArtifactViewer.durationLabel.text=Duration....
-CallLogArtifactViewer.dateTimeLabel.text=Date/Time.....
-CallLogArtifactViewer.directionLabel.text=Direction
-CallLogArtifactViewer.onLabel.text=On
-CallLogArtifactViewer.callLabel.text=call
-MessageArtifactViewer.fromText.text=from address goes here
-MessageArtifactViewer.datetimeText.text=date goes here
-MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers
-MessageArtifactViewer.fromLabel.text=From:
-MessageArtifactViewer.directionText.text=direction
-MessageArtifactViewer.subjectText.text=subject goes here
-MessageArtifactViewer.viewInNewWindowButton.text=View in New Window
-MessageArtifactViewer.subjectLabel.text=Subject:
-MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments
-MessageArtifactViewer.ccText.text=cc list goes here
-MessageArtifactViewer.ccLabel.text=CC:
-MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
-MessageArtifactViewer.toText.text=to list goes here
-MessageArtifactViewer.toLabel.text=To:
-MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML
-CallLogArtifactViewer.localAccountPersonaLabel.text=Persona
-CallLogArtifactViewer.localAccountPersonaNameLabel.text=jLabel1
-CallLogArtifactViewer.localAccountPersonaButton.text=jButton1
-ContactArtifactViewer.personasLabel.text=Personas
-MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts

Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties

@@ -149,20 +149,3 @@ MediaViewImagePanel.tagsMenu.text_1=\u30bf\u30b0\u30e1\u30cb\u30e5\u30fc
 SQLiteViewer.readTable.errorText=\u6b21\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u884c\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
 # {0} - tableName
 SQLiteViewer.selectTable.errorText=\u6b21\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u884c\u30ab\u30a6\u30f3\u30c8\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
-DefaultArtifactContentViewer.selectAllMenuItem.text=\u3059\u3079\u3066\u3092\u9078\u629e
-DefaultArtifactContentViewer.copyMenuItem.text=\u30b3\u30d4\u30fc
-MessageArtifactViewer.fromText.text=\u9001\u4fe1\u5143\u30a2\u30c9\u30ec\u30b9\u3092\u3053\u3053\u306b\u8868\u793a
-MessageArtifactViewer.datetimeText.text=\u65e5\u4ed8\u3092\u3053\u3053\u306b\u8868\u793a
-MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=\u30d8\u30c3\u30c0\u30fc
-MessageArtifactViewer.fromLabel.text=\u5dee\u51fa\u4eba:
-MessageArtifactViewer.directionText.text=\u9001\u53d7\u4fe1\u306e\u7a2e\u5225
-MessageArtifactViewer.subjectText.text=\u4ef6\u540d\u3092\u3053\u3053\u306b\u8868\u793a
-MessageArtifactViewer.viewInNewWindowButton.text=\u65b0\u3057\u3044\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u8868\u793a
-MessageArtifactViewer.subjectLabel.text=\u4ef6\u540d:
-MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb
-MessageArtifactViewer.ccText.text=\u5b9b\u5148\u306eCC\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a
-MessageArtifactViewer.ccLabel.text=CC:
-MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
-MessageArtifactViewer.toText.text=\u5b9b\u5148\u306eTO\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a
-MessageArtifactViewer.toLabel.text=\u5b9b\u5148:
-MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML

Core/src/org/sleuthkit/autopsy/contentviewers/HtmlPanel.java

@@ -42,7 +42,7 @@ import org.w3c.dom.events.EventTarget;
  * A file content viewer for HTML files.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-final class HtmlPanel extends javax.swing.JPanel {
+public final class HtmlPanel extends javax.swing.JPanel {
 
     private static final Logger logger = Logger.getLogger(HtmlPanel.class.getName());
     private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@ final class HtmlPanel extends javax.swing.JPanel {
     /**
      * Creates new form HtmlViewerPanel
      */
-    HtmlPanel() {
+    public HtmlPanel() {
         initComponents();
         Platform.runLater(() -> {
             webView = new WebView();
@@ -83,7 +83,7 @@ final class HtmlPanel extends javax.swing.JPanel {
      *
      * @param htmlText The HTML text to be applied to the text pane.
      */
-    void setHtmlText(String htmlText) {
+    public void setHtmlText(String htmlText) {
         this.htmlText = htmlText;
         refresh();
     }
@@ -91,7 +91,7 @@ final class HtmlPanel extends javax.swing.JPanel {
     /**
      * Clear the HTML in the text pane and disable the show/hide button.
      */
-    void reset() {
+    public void reset() {
         Platform.runLater(() -> {
             webView.getEngine().loadContent("", TEXT_TYPE);
         });

Core/src/org/sleuthkit/autopsy/contentviewers/TranslatablePanel.java

@@ -37,14 +37,14 @@ import org.sleuthkit.autopsy.texttranslation.ui.TranslateTextTask;
 /**
  * This is a panel for translation with a subcomponent that allows for translation.
  */
-class TranslatablePanel extends JPanel {
+public class TranslatablePanel extends JPanel {
     
     /**
      * This is an exception that can occur during the normal operation of the translatable 
      * panel. For instance, this exception can be thrown if it is not possible to set the child
      * content to the provided content string.
      */
-    class TranslatablePanelException extends Exception {
+    public class TranslatablePanelException extends Exception {
         public static final long serialVersionUID = 1L;
 
         TranslatablePanelException(String message) {
@@ -61,7 +61,7 @@ class TranslatablePanel extends JPanel {
      * This describes a child component to be placed as a child of this panel.  The child received
      * from {@link #getRootComponent() getRootComponent() } will listen for content updates from setContent().
      */
-    interface ContentComponent {
+    public interface ContentComponent {
         /**
          * This method gets root component of the translation panel.
          * @return      the root component to insert into the translatable panel
@@ -191,7 +191,7 @@ class TranslatablePanel extends JPanel {
 
     @Messages({"TranslatablePanel.comboBoxOption.originalText=Original Text",
         "TranslatablePanel.comboBoxOption.translatedText=Translated Text"})
-    TranslatablePanel(ContentComponent contentComponent) {
+    public TranslatablePanel(ContentComponent contentComponent) {
         this(
             contentComponent,
             Bundle.TranslatablePanel_comboBoxOption_originalText(),
@@ -263,7 +263,7 @@ class TranslatablePanel extends JPanel {
      * This resets the component to an empty state and sets the translation bar visibility
      * based on whether there is a provider.
      */
-    final void reset() {
+    public final void reset() {
         setContent(null, null);
     }
 
@@ -272,7 +272,7 @@ class TranslatablePanel extends JPanel {
      * @param content               the content for the panel
      * @param contentDescriptor     the content descriptor to be used in error messages
      */
-    void setContent(String content, String contentDescriptor) {
+    public void setContent(String content, String contentDescriptor) {
         cancelPendingTranslation();
         setTranslationEnabled();
         this.translateComboBox.setSelectedIndex(0);

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/AccountPersonaSearcherData.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.contentviewers.artifactviewers;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ArtifactContentViewer.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.contentviewers.artifactviewers;
 
 import java.awt.Component;
 import org.sleuthkit.datamodel.BlackboardArtifact;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties

@@ -0,0 +1,34 @@
+# Copyright 2020 Basis Technology Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an "AS
+# IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+#
+
+DefaultArtifactContentViewer.copyMenuItem.text=Copy
+DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
+MessageArtifactViewer.ccLabel.text=CC:
+MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
+MessageArtifactViewer.toText.text=to list goes here
+MessageArtifactViewer.toLabel.text=To:
+MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML
+MessageArtifactViewer.fromText.text=from address goes here
+MessageArtifactViewer.datetimeText.text=date goes here
+MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers
+MessageArtifactViewer.fromLabel.text=From:
+MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts
+MessageArtifactViewer.directionText.text=direction
+MessageArtifactViewer.subjectText.text=subject goes here
+MessageArtifactViewer.viewInNewWindowButton.text=View in New Window
+MessageArtifactViewer.subjectLabel.text=Subject:
+MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments
+MessageArtifactViewer.ccText.text=cc list goes here
+MessageArtifactViewer.textbodyScrollPane.TabConstraints.tabTitle=Text

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED

@@ -0,0 +1,85 @@
+# Copyright 2020 Basis Technology Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an "AS
+# IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+#
+
+CalllogArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas.
+CallLogArtifactViewer_heading_metadata=Metadata
+CallLogArtifactViewer_heading_others=Other Attributes
+CallLogArtifactViewer_heading_parties=Parties
+CallLogArtifactViewer_heading_Source=Source
+CallLogArtifactViewer_label_datasource=Data Source
+CallLogArtifactViewer_label_date=Date
+CallLogArtifactViewer_label_direction=Direction
+CallLogArtifactViewer_label_duration=Duration
+CallLogArtifactViewer_label_from=From
+CallLogArtifactViewer_label_to=To
+CallLogArtifactViewer_suffix_local=(Local)
+CallLogArtifactViewer_value_unknown=Unknown
+CommunicationArtifactViewerHelper_menuitem_copy=Copy
+CommunicationArtifactViewerHelper_persona_button_create=Create
+CommunicationArtifactViewerHelper_persona_button_view=View
+CommunicationArtifactViewerHelper_persona_label=Persona: 
+CommunicationArtifactViewerHelper_persona_searching=Searching...
+CommunicationArtifactViewerHelper_persona_unknown=Unknown
+ContactArtifactViewer.contactImage.text=
+ContactArtifactViewer_contactname_unknown=Unknown
+ContactArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas.
+ContactArtifactViewer_emails_header=Email
+ContactArtifactViewer_found_all_accounts_label=All accounts found.
+ContactArtifactViewer_heading_Source=Source
+ContactArtifactViewer_label_datasource=Data Source
+ContactArtifactViewer_missing_account_label=Missing contact account
+ContactArtifactViewer_others_header=Other
+ContactArtifactViewer_persona_account_justification=Account found in Contact artifact
+ContactArtifactViewer_persona_button_new=Create
+ContactArtifactViewer_persona_button_view=View
+ContactArtifactViewer_persona_header=Persona
+ContactArtifactViewer_persona_label=Persona 
+ContactArtifactViewer_persona_match_num=Match 
+ContactArtifactViewer_persona_no_match=No matches found
+ContactArtifactViewer_persona_searching=Searching...
+ContactArtifactViewer_persona_unknown=Unknown
+ContactArtifactViewer_phones_header=Phone
+ContactArtifactViewer_plural_suffix=s
+DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database
+DataContentViewerArtifact.failedToGetSourcePath.message=Failed to get source file path from case database
+DefaultArtifactContentViewer.attrsTableHeader.sources=Source(s)
+DefaultArtifactContentViewer.attrsTableHeader.type=Type
+DefaultArtifactContentViewer.attrsTableHeader.value=Value
+DefaultArtifactContentViewer.copyMenuItem.text=Copy
+DefaultArtifactContentViewer.selectAllMenuItem.text=Select All
+MessageAccountPanel_button_create_label=Create
+MessageAccountPanel_button_view_label=View
+MessageAccountPanel_persona_label=Persona:
+MessageAccountPanel_unknown_label=Unknown
+MessageArtifactViewer.AttachmentPanel.title=Attachments
+MessageArtifactViewer.ccLabel.text=CC:
+MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
+MessageArtifactViewer.toText.text=to list goes here
+MessageArtifactViewer.toLabel.text=To:
+MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML
+MessageArtifactViewer.fromText.text=from address goes here
+MessageArtifactViewer.datetimeText.text=date goes here
+MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers
+MessageArtifactViewer.fromLabel.text=From:
+MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts
+MessageArtifactViewer.directionText.text=direction
+MessageArtifactViewer.subjectText.text=subject goes here
+MessageArtifactViewer.viewInNewWindowButton.text=View in New Window
+MessageArtifactViewer.subjectLabel.text=Subject:
+MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments
+MessageArtifactViewer.ccText.text=cc list goes here
+MessageArtifactViewer.textbodyScrollPane.TabConstraints.tabTitle=Text
+# {0} - Persona count
+PersonaDisplayTask_persona_count_suffix=(1 of {0})

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle_ja.properties

@@ -0,0 +1,19 @@
+
+DefaultArtifactContentViewer.selectAllMenuItem.text=\u3059\u3079\u3066\u3092\u9078\u629e
+
+DefaultArtifactContentViewer.copyMenuItem.text=\u30b3\u30d4\u30fc
+MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
+MessageArtifactViewer.toText.text=\u5b9b\u5148\u306eTO\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a
+MessageArtifactViewer.toLabel.text=\u5b9b\u5148:
+MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML
+MessageArtifactViewer.fromText.text=\u9001\u4fe1\u5143\u30a2\u30c9\u30ec\u30b9\u3092\u3053\u3053\u306b\u8868\u793a
+MessageArtifactViewer.datetimeText.text=\u65e5\u4ed8\u3092\u3053\u3053\u306b\u8868\u793a
+MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=\u30d8\u30c3\u30c0\u30fc
+MessageArtifactViewer.fromLabel.text=\u5dee\u51fa\u4eba:
+MessageArtifactViewer.directionText.text=\u9001\u53d7\u4fe1\u306e\u7a2e\u5225
+MessageArtifactViewer.subjectText.text=\u4ef6\u540d\u3092\u3053\u3053\u306b\u8868\u793a
+MessageArtifactViewer.viewInNewWindowButton.text=\u65b0\u3057\u3044\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u8868\u793a
+MessageArtifactViewer.subjectLabel.text=\u4ef6\u540d:
+MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb
+MessageArtifactViewer.ccText.text=\u5b9b\u5148\u306eCC\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a
+MessageArtifactViewer.ccLabel.text=CC:

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogArtifactViewer.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.contentviewers.artifactviewers;
 
 import java.awt.Component;
 import java.awt.GridBagConstraints;
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.logging.Level;
 import javax.swing.JScrollPane;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogViewData.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.contentviewers.artifactviewers;
 
 import java.util.ArrayList;
 import java.util.Collection;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CommunicationArtifactViewerHelper.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.contentviewers.artifactviewers;
 
 import java.awt.Dimension;
 import java.awt.Font;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.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.contentviewers.artifactviewers;
 
 import java.awt.Component;
 import java.awt.GridBagConstraints;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.form

@@ -11,14 +11,14 @@
         <MenuItem class="javax.swing.JMenuItem" name="copyMenuItem">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="DefaultArtifactContentViewer.copyMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="DefaultArtifactContentViewer.copyMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </MenuItem>
         <MenuItem class="javax.swing.JMenuItem" name="selectAllMenuItem">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="DefaultArtifactContentViewer.selectAllMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="DefaultArtifactContentViewer.selectAllMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </MenuItem>

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.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.contentviewers.artifactviewers;
 
 import java.awt.Component;
 import java.awt.Cursor;
@@ -54,6 +54,7 @@ import com.google.gson.JsonArray;
 import java.util.Locale;
 import java.util.Map;
 import javax.swing.SwingUtilities;
+//import org.sleuthkit.autopsy.contentviewers.Bundle;
 
 /**
  * This class displays a Blackboard artifact as a table listing all it's 

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageAccountPanel.java

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sleuthkit.autopsy.contentviewers;
+package org.sleuthkit.autopsy.contentviewers.artifactviewers;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.form

@@ -120,7 +120,7 @@
         <Component class="javax.swing.JLabel" name="fromLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.fromLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.fromLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -128,28 +128,28 @@
           <Properties>
             <Property name="horizontalAlignment" type="int" value="4"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.datetimeText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.datetimeText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="fromText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.fromText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.fromText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="toLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.toLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.toLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="toText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.toText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.toText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="autoscrolls" type="boolean" value="true"/>
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -160,14 +160,14 @@
         <Component class="javax.swing.JLabel" name="ccLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.ccLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.ccLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="ccText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.ccText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.ccText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[27, 14]"/>
@@ -177,14 +177,14 @@
         <Component class="javax.swing.JLabel" name="subjectLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.subjectLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.subjectLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="subjectText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.subjectText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.subjectText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[26, 14]"/>
@@ -195,7 +195,7 @@
           <Properties>
             <Property name="horizontalAlignment" type="int" value="4"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.directionText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.directionText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -214,7 +214,7 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Headers">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>
@@ -238,7 +238,7 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="HTML">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.htmlPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.htmlPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>
@@ -254,7 +254,7 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="RTF">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>
@@ -274,7 +274,7 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Attachments">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>
@@ -311,7 +311,7 @@
             <Component class="javax.swing.JButton" name="viewInNewWindowButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.viewInNewWindowButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.viewInNewWindowButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -329,7 +329,7 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Accounts">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/Bundle.properties" key="MessageArtifactViewer.accountsTab.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties" key="MessageArtifactViewer.accountsTab.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.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.contentviewers.artifactviewers;
 
 import org.sleuthkit.autopsy.datamodel.AttachmentNode;
 import java.awt.Color;
@@ -41,7 +41,9 @@ import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
+import org.sleuthkit.autopsy.contentviewers.TranslatablePanel;
 import org.sleuthkit.autopsy.contentviewers.TranslatablePanel.TranslatablePanelException;
+import org.sleuthkit.autopsy.contentviewers.Utilities;
 import org.sleuthkit.autopsy.corecomponents.AutoWrappingJTextPane;
 import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;

Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/PersonaAccountFetcher.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.contentviewers.artifactviewers;
 
 import java.awt.Component;
 import java.awt.event.ActionListener;

Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java

@@ -40,8 +40,8 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskException;
 import java.util.Collections;
 import java.util.HashSet;
-import org.sleuthkit.autopsy.contentviewers.ArtifactContentViewer;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.ArtifactContentViewer;
-import org.sleuthkit.autopsy.contentviewers.DefaultArtifactContentViewer;
+import org.sleuthkit.autopsy.contentviewers.artifactviewers.DefaultArtifactContentViewer;
 
 /**
  * Instances of this class display the BlackboardArtifacts associated with the