diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java index 29e3a6349d..0998b89f46 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java +++ b/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.MessageContentViewer; +import org.sleuthkit.autopsy.contentviewers.MessageArtifactViewer; import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.AbstractFile; @@ -44,7 +44,7 @@ import org.sleuthkit.datamodel.TskCoreException; * solution to a very similar problem. * */ -final class MessageDataContent extends MessageContentViewer implements DataContent, ExplorerManager.Provider { +final class MessageDataContent extends MessageArtifactViewer implements DataContent, ExplorerManager.Provider { private static final Logger LOGGER = Logger.getLogger(MessageDataContent.class.getName()); diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties index 97348e7b56..3793bfdc16 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties @@ -63,22 +63,7 @@ Metadata.toolTip=Displays metadata about the file. Metadata.nodeText.nonFilePassedIn=Non-file passed in Metadata.nodeText.text=From The Sleuth Kit istat Tool: Metadata.nodeText.exceptionNotice.text=Error getting file metadata: -MessageContentViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF -MessageContentViewer.headersScrollPane.TabConstraints.tabTitle=Headers MessageContentViewer.textbodyScrollPane.TabConstraints.tabTitle=Text -MessageContentViewer.htmlPane.TabConstraints.tabTitle=HTML -MessageContentViewer.fromText.text=from address goes here -MessageContentViewer.fromLabel.text=From: -MessageContentViewer.datetimeText.text=date goes here -MessageContentViewer.toText.text=to list goes here -MessageContentViewer.toLabel.text=To: -MessageContentViewer.ccText.text=cc list goes here -MessageContentViewer.subjectLabel.text=Subject: -MessageContentViewer.subjectText.text=subject goes here -MessageContentViewer.directionText.text=direction -MessageContentViewer.ccLabel.text=CC: -MessageContentViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments -MessageContentViewer.viewInNewWindowButton.text=View in New Window JPEGViewerDummy.jLabel1.text=You are looking at a JPEG file: JPEGViewerDummy.jTextField1.text=jTextField1 SQLiteViewer.nextPageButton.text= @@ -976,3 +961,18 @@ 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 diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED index a0526646bb..bd7c84e443 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED @@ -35,6 +35,13 @@ AnnotationsContentViewer.title=Annotations AnnotationsContentViewer.toolTip=Displays tags and comments associated with the selected content. ApplicationContentViewer.title=Application ApplicationContentViewer.toolTip=Displays file contents. +CallLogArtifactViewer_number_from=From +CallLogArtifactViewer_number_to=To +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 @@ -86,8 +93,6 @@ MediaViewVideoPanel.infoLabel.text=info MediaViewImagePanel.imgFileTooLarge.msg=Could not load image file (too large): {0} MessageContentViewer.AtrachmentsPanel.title=Attachments -MessageContentViewer.title=Message -MessageContentViewer.toolTip=Displays messages. Metadata.nodeText.none=None Metadata.nodeText.truncated=(results truncated) Metadata.nodeText.unknown=Unknown @@ -119,22 +124,7 @@ Metadata.toolTip=Displays metadata about the file. Metadata.nodeText.nonFilePassedIn=Non-file passed in Metadata.nodeText.text=From The Sleuth Kit istat Tool: Metadata.nodeText.exceptionNotice.text=Error getting file metadata: -MessageContentViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF -MessageContentViewer.headersScrollPane.TabConstraints.tabTitle=Headers MessageContentViewer.textbodyScrollPane.TabConstraints.tabTitle=Text -MessageContentViewer.htmlPane.TabConstraints.tabTitle=HTML -MessageContentViewer.fromText.text=from address goes here -MessageContentViewer.fromLabel.text=From: -MessageContentViewer.datetimeText.text=date goes here -MessageContentViewer.toText.text=to list goes here -MessageContentViewer.toLabel.text=To: -MessageContentViewer.ccText.text=cc list goes here -MessageContentViewer.subjectLabel.text=Subject: -MessageContentViewer.subjectText.text=subject goes here -MessageContentViewer.directionText.text=direction -MessageContentViewer.ccLabel.text=CC: -MessageContentViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments -MessageContentViewer.viewInNewWindowButton.text=View in New Window JPEGViewerDummy.jLabel1.text=You are looking at a JPEG file: JPEGViewerDummy.jTextField1.text=jTextField1 PDFViewer.encryptedDialog=This document is password protected. @@ -1045,3 +1035,40 @@ 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 diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties index 18fdb5ce50..c5e6cc6eb4 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties @@ -92,22 +92,7 @@ Metadata.toolTip=\u30d5\u30a1\u30a4\u30eb\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u3 Metadata.nodeText.nonFilePassedIn=\u30d5\u30a1\u30a4\u30eb\u4ee5\u5916\u306e\u3082\u306e\u304c\u901a\u904e\u3057\u307e\u3057\u305f Metadata.nodeText.text=\u9001\u4fe1\u5143\u306eSleuth Kit\u306eistat\u30c4\u30fc\u30eb: Metadata.nodeText.exceptionNotice.text=\u30d5\u30a1\u30a4\u30eb\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: -MessageContentViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF -MessageContentViewer.headersScrollPane.TabConstraints.tabTitle=\u30d8\u30c3\u30c0\u30fc MessageContentViewer.textbodyScrollPane.TabConstraints.tabTitle=\u30c6\u30ad\u30b9\u30c8 -MessageContentViewer.htmlPane.TabConstraints.tabTitle=HTML -MessageContentViewer.fromText.text=\u9001\u4fe1\u5143\u30a2\u30c9\u30ec\u30b9\u3092\u3053\u3053\u306b\u8868\u793a -MessageContentViewer.fromLabel.text=\u5dee\u51fa\u4eba: -MessageContentViewer.datetimeText.text=\u65e5\u4ed8\u3092\u3053\u3053\u306b\u8868\u793a -MessageContentViewer.toText.text=\u5b9b\u5148\u306eTO\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a -MessageContentViewer.toLabel.text=\u5b9b\u5148: -MessageContentViewer.ccText.text=\u5b9b\u5148\u306eCC\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a -MessageContentViewer.subjectLabel.text=\u4ef6\u540d: -MessageContentViewer.subjectText.text=\u4ef6\u540d\u3092\u3053\u3053\u306b\u8868\u793a -MessageContentViewer.directionText.text=\u9001\u53d7\u4fe1\u306e\u7a2e\u5225 -MessageContentViewer.ccLabel.text=CC: -MessageContentViewer.attachmentsPanel.TabConstraints.tabTitle=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb -MessageContentViewer.viewInNewWindowButton.text=\u65b0\u3057\u3044\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u8868\u793a JPEGViewerDummy.jLabel1.text=JPEG\u30d5\u30a1\u30a4\u30eb\u304c\u8868\u793a\u3055\u308c\u3066\u3044\u307e\u3059: JPEGViewerDummy.jTextField1.text=jTextField1 PListNode.KeyCol=\u30ad\u30fc @@ -166,3 +151,18 @@ SQLiteViewer.readTable.errorText=\u6b21\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u884 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 diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.form similarity index 89% rename from Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.form rename to Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.form index c8ff9674c7..b529e85146 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.form +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.form @@ -120,7 +120,7 @@ - + @@ -128,28 +128,28 @@ - + - + - + - + @@ -160,14 +160,14 @@ - + - + @@ -177,14 +177,14 @@ - + - + @@ -195,7 +195,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -311,7 +311,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.java similarity index 93% rename from Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.java index edff2a1c2e..1a5d79403e 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.java @@ -81,7 +81,7 @@ import org.sleuthkit.datamodel.blackboardutils.attributes.MessageAttachments.URL */ @ServiceProvider(service = ArtifactContentViewer.class) @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives -public class MessageContentViewer extends javax.swing.JPanel implements ArtifactContentViewer { +public class MessageArtifactViewer extends javax.swing.JPanel implements ArtifactContentViewer { /** * This is a text component viewer to be a child component to be placed in a @@ -117,7 +117,7 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact } private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(MessageContentViewer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageArtifactViewer.class.getName()); private static final BlackboardAttribute.Type TSK_ASSOCIATED_TYPE = new BlackboardAttribute.Type(TSK_ASSOCIATED_ARTIFACT); private static final int HDR_TAB_INDEX = 0; @@ -140,15 +140,14 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact * Creates new MessageContentViewer */ @NbBundle.Messages("MessageContentViewer.AtrachmentsPanel.title=Attachments") - public MessageContentViewer() { + public MessageArtifactViewer() { initComponents(); htmlPane.add(htmlPanel); envelopePanel.setBackground(new Color(0, 0, 0, 38)); drp = DataResultPanel.createInstanceUninitialized(Bundle.MessageContentViewer_AtrachmentsPanel_title(), "", new TableFilterNode(Node.EMPTY, false), 0, null); attachmentsScrollPane.setViewportView(drp); - msgbodyTabbedPane.insertTab( - NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.textbodyScrollPane.TabConstraints.tabTitle"), + msgbodyTabbedPane.insertTab(NbBundle.getMessage(MessageArtifactViewer.class, "MessageContentViewer.textbodyScrollPane.TabConstraints.tabTitle"), null, textPanel, null, @@ -209,31 +208,31 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact envelopePanel.setBackground(new java.awt.Color(204, 204, 204)); - org.openide.awt.Mnemonics.setLocalizedText(fromLabel, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.fromLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(fromLabel, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.fromLabel.text")); // NOI18N datetimeText.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); - org.openide.awt.Mnemonics.setLocalizedText(datetimeText, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.datetimeText.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(datetimeText, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.datetimeText.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(fromText, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.fromText.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(fromText, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.fromText.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(toLabel, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.toLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(toLabel, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.toLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(toText, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.toText.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(toText, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.toText.text")); // NOI18N toText.setAutoscrolls(true); toText.setMinimumSize(new java.awt.Dimension(27, 14)); - org.openide.awt.Mnemonics.setLocalizedText(ccLabel, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.ccLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(ccLabel, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.ccLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(ccText, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.ccText.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(ccText, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.ccText.text")); // NOI18N ccText.setMinimumSize(new java.awt.Dimension(27, 14)); - org.openide.awt.Mnemonics.setLocalizedText(subjectLabel, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.subjectLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(subjectLabel, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.subjectLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(subjectText, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.subjectText.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(subjectText, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.subjectText.text")); // NOI18N subjectText.setMinimumSize(new java.awt.Dimension(26, 14)); directionText.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); - org.openide.awt.Mnemonics.setLocalizedText(directionText, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.directionText.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(directionText, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.directionText.text")); // NOI18N javax.swing.GroupLayout envelopePanelLayout = new javax.swing.GroupLayout(envelopePanel); envelopePanel.setLayout(envelopePanelLayout); @@ -300,19 +299,19 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact headersTextArea.setWrapStyleWord(true); headersScrollPane.setViewportView(headersTextArea); - msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.headersScrollPane.TabConstraints.tabTitle"), headersScrollPane); // NOI18N + msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle"), headersScrollPane); // NOI18N htmlPane.setLayout(new java.awt.BorderLayout()); - msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.htmlPane.TabConstraints.tabTitle"), htmlPane); // NOI18N + msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.htmlPane.TabConstraints.tabTitle"), htmlPane); // NOI18N rtfbodyScrollPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); rtfbodyTextPane.setEditable(false); rtfbodyScrollPane.setViewportView(rtfbodyTextPane); - msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.rtfbodyScrollPane.TabConstraints.tabTitle"), rtfbodyScrollPane); // NOI18N + msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle"), rtfbodyScrollPane); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(viewInNewWindowButton, org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.viewInNewWindowButton.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(viewInNewWindowButton, org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.viewInNewWindowButton.text")); // NOI18N viewInNewWindowButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { viewInNewWindowButtonActionPerformed(evt); @@ -341,7 +340,7 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact .addGap(0, 0, 0)) ); - msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageContentViewer.class, "MessageContentViewer.attachmentsPanel.TabConstraints.tabTitle"), attachmentsPanel); // NOI18N + msgbodyTabbedPane.addTab(org.openide.util.NbBundle.getMessage(MessageArtifactViewer.class, "MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle"), attachmentsPanel); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -363,8 +362,6 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact .addComponent(msgbodyTabbedPane) .addGap(5, 5, 5)) ); - - msgbodyTabbedPane.getAccessibleContext().setAccessibleParent(null); }// //GEN-END:initComponents private void viewInNewWindowButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_viewInNewWindowButtonActionPerformed @@ -480,7 +477,7 @@ public class MessageContentViewer extends javax.swing.JPanel implements Artifact //if the artifact is a keyword hit, check if its associated artifact is a message or email. if (artifact.getArtifactTypeID() == TSK_KEYWORD_HIT.getTypeID()) { try { - if (getAssociatedArtifact(artifact).map(MessageContentViewer::isMessageArtifact).orElse(false)) { + if (getAssociatedArtifact(artifact).map(MessageArtifactViewer::isMessageArtifact).orElse(false)) { return true; } } catch (TskCoreException ex) {