mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-12 07:56:16 +00:00
Merge pull request #6014 from wschaeferB/6558-AddScrollPaneToDiscoveryErrorDialog
6558 add scroll pane to discovery error dialog
This commit is contained in:
commit
f47e09f09b
@ -191,7 +191,7 @@ GroupsListPanel.noResults.title.text=No results found
|
|||||||
ImageThumbnailPanel.isDeleted.text=All instances of file are deleted.
|
ImageThumbnailPanel.isDeleted.text=All instances of file are deleted.
|
||||||
# {0} - otherInstanceCount
|
# {0} - otherInstanceCount
|
||||||
ImageThumbnailPanel.nameLabel.more.text=\ and {0} more
|
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.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.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.
|
ResultFile.score.notableTaggedFile.description=At least one instance of the file is tagged with a notable tag.
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
package org.sleuthkit.autopsy.discovery;
|
package org.sleuthkit.autopsy.discovery;
|
||||||
|
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
|
import java.awt.Dimension;
|
||||||
import java.awt.Point;
|
import java.awt.Point;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -29,6 +30,8 @@ import java.util.logging.Level;
|
|||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JComponent;
|
import javax.swing.JComponent;
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
|
import javax.swing.JScrollPane;
|
||||||
|
import javax.swing.JTextPane;
|
||||||
import org.openide.util.ImageUtilities;
|
import org.openide.util.ImageUtilities;
|
||||||
import org.openide.util.NbBundle;
|
import org.openide.util.NbBundle;
|
||||||
import org.sleuthkit.autopsy.casemodule.Case;
|
import org.sleuthkit.autopsy.casemodule.Case;
|
||||||
@ -224,7 +227,16 @@ final class DiscoveryUiUtils {
|
|||||||
message += dsmodulesWrapper.getMessage();
|
message += dsmodulesWrapper.getMessage();
|
||||||
}
|
}
|
||||||
if (!message.isEmpty()) {
|
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.setMaximumSize(new Dimension(600, 100));
|
||||||
|
messageScrollPane.setPreferredSize(new Dimension(600, 100));
|
||||||
|
messageScrollPane.setViewportView(messageTextPane);
|
||||||
|
JOptionPane.showMessageDialog(dialog, messageScrollPane, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.PLAIN_MESSAGE);
|
||||||
}
|
}
|
||||||
} catch (NoCurrentCaseException | TskCoreException ex) {
|
} catch (NoCurrentCaseException | TskCoreException ex) {
|
||||||
logger.log(Level.WARNING, "Exception while determining which modules have been run for Discovery", ex);
|
logger.log(Level.WARNING, "Exception while determining which modules have been run for Discovery", ex);
|
||||||
|
@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.discovery;
|
|||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
|
import javax.swing.SwingUtilities;
|
||||||
import org.openide.awt.ActionID;
|
import org.openide.awt.ActionID;
|
||||||
import org.openide.awt.ActionReference;
|
import org.openide.awt.ActionReference;
|
||||||
import org.openide.awt.ActionReferences;
|
import org.openide.awt.ActionReferences;
|
||||||
@ -61,14 +62,16 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P
|
|||||||
return Case.isCaseOpen();
|
return Case.isCaseOpen();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NbBundle.Messages({"OpenDiscoveryAction.resultsIncomplete.text=Results may be incomplete"})
|
@NbBundle.Messages({"OpenDiscoveryAction.resultsIncomplete.text=Discovery results may be incomplete"})
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void performAction() {
|
public void performAction() {
|
||||||
|
SwingUtilities.invokeLater(() -> {
|
||||||
final DiscoveryDialog discDialog = DiscoveryDialog.getDiscoveryDialogInstance();
|
final DiscoveryDialog discDialog = DiscoveryDialog.getDiscoveryDialogInstance();
|
||||||
discDialog.cancelSearch();
|
discDialog.cancelSearch();
|
||||||
discDialog.setVisible(true);
|
|
||||||
DiscoveryUiUtils.displayErrorMessage(discDialog);
|
DiscoveryUiUtils.displayErrorMessage(discDialog);
|
||||||
|
discDialog.setVisible(true);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user