mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 08:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various typos fixed.

Browse Source
This commit is contained in:
U-BASIS\dgrove 2018-07-25 16:17:19 -04:00
parent 04cc3de219
commit d11dbd7b37
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/src/org/sleuthkit/autopsy/casemodule/services/Blackboard.java
View File

@ -21,12 +21,9 @@ package org.sleuthkit.autopsy.casemodule.services;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.openide.util.Exceptions;
import org.openide.util.Lookup; import org.openide.util.Lookup;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService; import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifact;
@ -174,7 +171,7 @@ public final class Blackboard implements Closeable {
try { try {
if (checkIfAttributesMatch(artifact.getAttributes(), attributesMap)) { if (checkIfAttributesMatch(artifact.getAttributes(), attributesMap)) {
/* /*
* The exact artifact exists, so we don't need to look at * The exact artifact exists, so we don't need to look any
* further. * further.
*/ */
return true; return true;
@ -187,18 +184,20 @@ public final class Blackboard implements Closeable {
/* /*
* None of the artifacts have the exact set of attribute type/value * None of the artifacts have the exact set of attribute type/value
* combinations. The provided file does not the artifact being sought. * combinations. The provided file does not have the artifact being
* sought.
*/ */
return false; return false;
} }
/** /**
* Determine if a list of attributes all match a given set of values. * Determine if the supplied attribute type/value combinations can all be
* found in the supplied attributes list.
* *
* @param attributesList The list of attributes to analyze. * @param attributesList The list of attributes to analyze.
* @param attributesMap The attribute values with which to compare. * @param attributesMap The attribute type/value combinations to check for.
* *
* @return True if all attributes match; otherwise false. * @return True if all attributes are found; otherwise false.
*/ */
private static boolean checkIfAttributesMatch(List<BlackboardAttribute> attributesList, Map<BlackboardAttribute.Type, String> attributesMap) { private static boolean checkIfAttributesMatch(List<BlackboardAttribute> attributesList, Map<BlackboardAttribute.Type, String> attributesMap) {
for (Map.Entry<BlackboardAttribute.Type, String> mapEntry : attributesMap.entrySet()) { for (Map.Entry<BlackboardAttribute.Type, String> mapEntry : attributesMap.entrySet()) {
@ -222,7 +221,7 @@ public final class Blackboard implements Closeable {
*/ */
return false; return false;
} }
}; }
/* /*
* All attribute type/value combinations were found in the provided * All attribute type/value combinations were found in the provided

13
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java
View File

@ -160,22 +160,16 @@ public class HashDbIngestModule implements FileIngestModule {
@Messages({ @Messages({
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.fileReadErrorMsg=Read Error: {0}", "HashDbIngestModule.fileReadErrorMsg=Read Error: {0}",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.calcHashValueErr=Error encountered while calculating the hash value for {0}.", "HashDbIngestModule.calcHashValueErr=Error encountered while calculating the hash value for {0}.",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.hashLookupErrorMsg=Hash Lookup Error: {0}", "HashDbIngestModule.hashLookupErrorMsg=Hash Lookup Error: {0}",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.lookingUpKnownBadHashValueErr=Error encountered while looking up notable hash value for {0}.", "HashDbIngestModule.lookingUpKnownBadHashValueErr=Error encountered while looking up notable hash value for {0}.",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.lookingUpKnownHashValueErr=Error encountered while looking up known hash value for {0}.", "HashDbIngestModule.lookingUpKnownHashValueErr=Error encountered while looking up known hash value for {0}.",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.dialogTitle.errorFindingArtifacts=Error Finding Artifacts: {0}", "HashDbIngestModule.dialogTitle.errorFindingArtifacts=Error Finding Artifacts: {0}",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.errorMessage.lookingForFileArtifacts=Error encountered while looking for existing artifacts for {0}." "HashDbIngestModule.errorMessage.lookingForFileArtifacts=Error encountered while looking for existing artifacts for {0}."
}) })
@ -276,7 +270,7 @@ public class HashDbIngestModule implements FileIngestModule {
} }
/* /*
* We have a match! Now create an artifact for it is * We have a match. Now create an artifact if it is
* determined that one hasn't been created yet. * determined that one hasn't been created yet.
*/ */
Map<BlackboardAttribute.Type, String> attributeMap = new HashMap<>(); Map<BlackboardAttribute.Type, String> attributeMap = new HashMap<>();
@ -290,7 +284,7 @@ public class HashDbIngestModule implements FileIngestModule {
} catch (BlackboardException ex) { } catch (BlackboardException ex) {
logger.log(Level.SEVERE, String.format( logger.log(Level.SEVERE, String.format(
"A problem occurred while trying checking for existing artifacts for file '%s' (id=%d).", name, fileId), ex); //NON-NLS "A problem occurred while checking for existing artifacts for file '%s' (id=%d).", name, fileId), ex); //NON-NLS
services.postMessage(IngestMessage.createErrorMessage( services.postMessage(IngestMessage.createErrorMessage(
HashLookupModuleFactory.getModuleName(), HashLookupModuleFactory.getModuleName(),
Bundle.HashDbIngestModule_dialogTitle_errorFindingArtifacts(name), Bundle.HashDbIngestModule_dialogTitle_errorFindingArtifacts(name),
@ -337,7 +331,7 @@ public class HashDbIngestModule implements FileIngestModule {
} }
/** /**
* Post hash set hit to the blackboard. * Post a hash set hit to the blackboard.
* *
* @param abstractFile The file to be processed. * @param abstractFile The file to be processed.
* @param md5Hash The MD5 hash value of the file. * @param md5Hash The MD5 hash value of the file.
@ -351,7 +345,6 @@ public class HashDbIngestModule implements FileIngestModule {
"HashDbIngestModule.postToBB.fileName=File Name", "HashDbIngestModule.postToBB.fileName=File Name",
"HashDbIngestModule.postToBB.md5Hash=MD5 Hash", "HashDbIngestModule.postToBB.md5Hash=MD5 Hash",
"HashDbIngestModule.postToBB.hashsetName=Hash Set Name", "HashDbIngestModule.postToBB.hashsetName=Hash Set Name",
"# {0} - File name", "# {0} - File name",
"HashDbIngestModule.postToBB.knownBadMsg=Notable: {0}" "HashDbIngestModule.postToBB.knownBadMsg=Notable: {0}"
}) })