From 972066af5f92279491cdee351a81efe68fbfc111 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 24 Jun 2020 18:52:53 -0400 Subject: [PATCH 1/6] 6558 add scroll pane to discovery error dialog --- .../autopsy/discovery/DiscoveryUiUtils.java | 12 +++++++++++- .../autopsy/discovery/OpenDiscoveryAction.java | 11 +++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java index 3890751dc7..74e543a4f1 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java @@ -18,6 +18,7 @@ */ package org.sleuthkit.autopsy.discovery; +import java.awt.BorderLayout; import java.awt.Component; import java.awt.Point; import java.util.ArrayList; @@ -29,6 +30,8 @@ import java.util.logging.Level; import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.JTextPane; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.Case; @@ -224,7 +227,14 @@ final class DiscoveryUiUtils { message += dsmodulesWrapper.getMessage(); } if (!message.isEmpty()) { - JOptionPane.showMessageDialog(dialog, message, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.INFORMATION_MESSAGE); + JScrollPane messageScrollPane = new JScrollPane(); + JTextPane messageTextPane = new JTextPane(); + messageTextPane.setText(message); + messageTextPane.setVisible(true); + messageTextPane.setEditable(false); + messageTextPane.setCaretPosition(0); + messageScrollPane.setViewportView(messageTextPane); + JOptionPane.showMessageDialog(dialog, messageScrollPane, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.INFORMATION_MESSAGE); } } catch (NoCurrentCaseException | TskCoreException ex) { logger.log(Level.WARNING, "Exception while determining which modules have been run for Discovery", ex); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java index 9ef7d5dfe6..09a963f18d 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.discovery; import java.awt.Component; import javax.swing.ImageIcon; import javax.swing.JButton; +import javax.swing.SwingUtilities; import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; @@ -65,10 +66,12 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P @Override public void performAction() { - final DiscoveryDialog discDialog = DiscoveryDialog.getDiscoveryDialogInstance(); - discDialog.cancelSearch(); - discDialog.setVisible(true); - DiscoveryUiUtils.displayErrorMessage(discDialog); + SwingUtilities.invokeLater(() -> { + final DiscoveryDialog discDialog = DiscoveryDialog.getDiscoveryDialogInstance(); + discDialog.cancelSearch(); + DiscoveryUiUtils.displayErrorMessage(discDialog); + discDialog.setVisible(true); + }); } /** From aee5705c4f8543609db8e20426bf2ff698789702 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 24 Jun 2020 18:54:13 -0400 Subject: [PATCH 2/6] 6558 remove unused import --- Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java index 74e543a4f1..06e24b53b7 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java @@ -18,7 +18,6 @@ */ package org.sleuthkit.autopsy.discovery; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.Point; import java.util.ArrayList; From c66ed7485f2b7b1d559003af1fa4273dddda82da Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 25 Jun 2020 11:48:09 -0400 Subject: [PATCH 3/6] 6558 add max size to scroll pane --- Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java index 06e24b53b7..c0a5876a7d 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java @@ -19,6 +19,7 @@ package org.sleuthkit.autopsy.discovery; import java.awt.Component; +import java.awt.Dimension; import java.awt.Point; import java.util.ArrayList; import java.util.Collections; @@ -232,6 +233,8 @@ final class DiscoveryUiUtils { messageTextPane.setVisible(true); messageTextPane.setEditable(false); messageTextPane.setCaretPosition(0); + messageScrollPane.setMaximumSize(new Dimension(600, 100)); + messageScrollPane.setPreferredSize(new Dimension(600, 100)); messageScrollPane.setViewportView(messageTextPane); JOptionPane.showMessageDialog(dialog, messageScrollPane, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.INFORMATION_MESSAGE); } From 87629c26850bf0b5afa76eacfab194df498a8de0 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 25 Jun 2020 12:29:40 -0400 Subject: [PATCH 4/6] 6558 Remove icon --- Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java index c0a5876a7d..55392f54f2 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java @@ -236,7 +236,7 @@ final class DiscoveryUiUtils { messageScrollPane.setMaximumSize(new Dimension(600, 100)); messageScrollPane.setPreferredSize(new Dimension(600, 100)); messageScrollPane.setViewportView(messageTextPane); - JOptionPane.showMessageDialog(dialog, messageScrollPane, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(dialog, messageScrollPane, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.PLAIN_MESSAGE); } } catch (NoCurrentCaseException | TskCoreException ex) { logger.log(Level.WARNING, "Exception while determining which modules have been run for Discovery", ex); From 9d1524d709c521468671506656b200d64dec3df1 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 25 Jun 2020 13:14:56 -0400 Subject: [PATCH 5/6] 6558 rename warning message about incomplete results --- .../org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED | 2 +- .../org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java | 2 +- .../autopsy/modules/interestingitems/Bundle.properties-MERGED | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED index 0779798a6e..999e11aed7 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED @@ -186,7 +186,7 @@ GroupsListPanel.noResults.title.text=No results found ImageThumbnailPanel.isDeleted.text=All instances of file are deleted. # {0} - otherInstanceCount ImageThumbnailPanel.nameLabel.more.text=\ and {0} more -OpenDiscoveryAction.resultsIncomplete.text=Results may be incomplete +OpenDiscoveryAction.resultsIncomplete.text=Discovery results may be incomplete ResultFile.score.interestingResult.description=At least one instance of the file has an interesting result associated with it. ResultFile.score.notableFile.description=At least one instance of the file was recognized as notable. ResultFile.score.notableTaggedFile.description=At least one instance of the file is tagged with a notable tag. diff --git a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java index 09a963f18d..04530f8ad2 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java @@ -62,7 +62,7 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P return Case.isCaseOpen(); } - @NbBundle.Messages({"OpenDiscoveryAction.resultsIncomplete.text=Results may be incomplete"}) + @NbBundle.Messages({"OpenDiscoveryAction.resultsIncomplete.text=Discovery results may be incomplete"}) @Override public void performAction() { diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED index 45adf1bd1e..7ff32e083c 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED @@ -144,4 +144,4 @@ FilesSetDefsPanel.pathLabel.text=Path Substring: FilesSetDefsPanel.mimeTypeLabel.text=MIME Type: FilesSetDefsPanel.fileSizeLabel.text=File Size: # {0} - filesSetName -StandardInterestingFileSetsLoader.customSuffixed={0} (Custom) \ No newline at end of file +StandardInterestingFileSetsLoader.customSuffixed={0} (Custom) From a99c3f94db2be884f6395715917cd9b7192460aa Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 25 Jun 2020 13:16:08 -0400 Subject: [PATCH 6/6] 6558 undo accidental commit of other MERGED file --- .../autopsy/modules/interestingitems/Bundle.properties-MERGED | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED index 7ff32e083c..45adf1bd1e 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED @@ -144,4 +144,4 @@ FilesSetDefsPanel.pathLabel.text=Path Substring: FilesSetDefsPanel.mimeTypeLabel.text=MIME Type: FilesSetDefsPanel.fileSizeLabel.text=File Size: # {0} - filesSetName -StandardInterestingFileSetsLoader.customSuffixed={0} (Custom) +StandardInterestingFileSetsLoader.customSuffixed={0} (Custom) \ No newline at end of file