mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3326-MultiUserCaseOffEDT

Browse Source
This commit is contained in:
William Schaefer 2017-12-15 10:54:47 -05:00
commit ad341af7ab
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java
View File

@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.casemodule.services;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@ -196,9 +196,9 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
* @return A set of tag name definition objects. * @return A set of tag name definition objects.
*/ */
static synchronized Set<TagNameDefinition> getTagNameDefinitions() { static synchronized Set<TagNameDefinition> getTagNameDefinitions() {
Set<TagNameDefinition> tagNames = new HashSet<>(); Set<TagNameDefinition> tagNames = new LinkedHashSet<>();
//modifiable copy of default tags list for us to keep track of which default tags have already been created //modifiable copy of default tags list for us to keep track of which default tags have already been created
Set<String> standardTags = new HashSet<>(STANDARD_TAG_DISPLAY_NAMES); Set<String> standardTags = new LinkedHashSet<>(STANDARD_TAG_DISPLAY_NAMES);
String setting = ModuleSettings.getConfigSetting(TAGS_SETTINGS_NAME, TAG_NAMES_SETTING_KEY); String setting = ModuleSettings.getConfigSetting(TAGS_SETTINGS_NAME, TAG_NAMES_SETTING_KEY);
if (null != setting && !setting.isEmpty()) { if (null != setting && !setting.isEmpty()) {
List<String> tagNameTuples = Arrays.asList(setting.split(";")); List<String> tagNameTuples = Arrays.asList(setting.split(";"));
@ -239,7 +239,7 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
* @return tagNames a list of TagNameDefinitions * @return tagNames a list of TagNameDefinitions
*/ */
private static Set<TagNameDefinition> upgradeTagPropertiesFile(List<String> tagProperties, Set<String> standardTagsToBeCreated) { private static Set<TagNameDefinition> upgradeTagPropertiesFile(List<String> tagProperties, Set<String> standardTagsToBeCreated) {
Set<TagNameDefinition> tagNames = new HashSet<>(); Set<TagNameDefinition> tagNames = new LinkedHashSet<>();
List<String> legacyNotableTags = new ArrayList<>(); List<String> legacyNotableTags = new ArrayList<>();
String badTagsStr = ModuleSettings.getConfigSetting("CentralRepository", "db.badTags"); // NON-NLS String badTagsStr = ModuleSettings.getConfigSetting("CentralRepository", "db.badTags"); // NON-NLS
if (badTagsStr == null || badTagsStr.isEmpty()) { //if there were no bad tags in the central repo properties file use the default list if (badTagsStr == null || badTagsStr.isEmpty()) { //if there were no bad tags in the central repo properties file use the default list
@ -273,7 +273,7 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
* @return tagNames a list of TagNameDefinitions * @return tagNames a list of TagNameDefinitions
*/ */
private static Set<TagNameDefinition> readCurrentTagPropertiesFile(List<String> tagProperties, Set<String> standardTagsToBeCreated) { private static Set<TagNameDefinition> readCurrentTagPropertiesFile(List<String> tagProperties, Set<String> standardTagsToBeCreated) {
Set<TagNameDefinition> tagNames = new HashSet<>(); Set<TagNameDefinition> tagNames = new LinkedHashSet<>();
for (String tagNameTuple : tagProperties) { for (String tagNameTuple : tagProperties) {
String[] tagNameAttributes = tagNameTuple.split(","); //get the attributes String[] tagNameAttributes = tagNameTuple.split(","); //get the attributes
standardTagsToBeCreated.remove(tagNameAttributes[0]); //remove the tag from the list of standard tags which have not been created standardTagsToBeCreated.remove(tagNameAttributes[0]); //remove the tag from the list of standard tags which have not been created

2
Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java
View File

@ -494,6 +494,7 @@ public class MessageContentViewer extends javax.swing.JPanel implements DataCont
htmlbodyTextPane.setText(""); htmlbodyTextPane.setText("");
textbodyTextArea.setText(""); textbodyTextArea.setText("");
drp.setNode(null); drp.setNode(null);
showImagesToggleButton.setEnabled(false);
msgbodyTabbedPane.setEnabled(false); msgbodyTabbedPane.setEnabled(false);
} }
@ -599,6 +600,7 @@ public class MessageContentViewer extends javax.swing.JPanel implements DataCont
directionText.setEnabled(false); directionText.setEnabled(false);
ccLabel.setEnabled(true); ccLabel.setEnabled(true);
showImagesToggleButton.setEnabled(true);
showImagesToggleButton.setText("Show Images"); showImagesToggleButton.setText("Show Images");
showImagesToggleButton.setSelected(false); showImagesToggleButton.setSelected(false);