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

Merge pull request #2786 from sleuthkit/release-4.4.0

Browse Source 
Merge in release 4.4.0 branch
This commit is contained in:
Richard Cordovano 2017-05-05 12:14:12 -04:00 committed by GitHub
commit f0c96524d5
7 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/actions/DeleteFileBlackboardArtifactTagAction.java
View File

@ -174,10 +174,6 @@ public class DeleteFileBlackboardArtifactTagAction extends AbstractAction implem
for(BlackboardArtifactTag artifactTag : existingTagsList) { for(BlackboardArtifactTag artifactTag : existingTagsList) {
if(tagDisplayName.equals(artifactTag.getName().getDisplayName())) { if(tagDisplayName.equals(artifactTag.getName().getDisplayName())) {
JMenuItem tagNameItem = new JMenuItem(tagDisplayName); JMenuItem tagNameItem = new JMenuItem(tagDisplayName);
// for the bookmark tag name only, added shortcut label
if (tagDisplayName.equals(NbBundle.getMessage(AddTagAction.class, "AddBookmarkTagAction.bookmark.text"))) {
tagNameItem.setAccelerator(AddBookmarkTagAction.BOOKMARK_SHORTCUT);
}
tagNameItem.addActionListener((ActionEvent e) -> { tagNameItem.addActionListener((ActionEvent e) -> {
deleteTag(tagName, artifactTag, artifact.getArtifactID()); deleteTag(tagName, artifactTag, artifact.getArtifactID());
}); });

6
Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java
View File

@ -159,8 +159,6 @@ public class DeleteFileContentTagAction extends AbstractAction implements Presen
// a tag with the associated tag name. // a tag with the associated tag name.
if (null != tagNamesMap && !tagNamesMap.isEmpty()) { if (null != tagNamesMap && !tagNamesMap.isEmpty()) {
try { try {
/*List<BlackboardArtifactTag> existingTagsList =
Case.getCurrentCase().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact);*/
List<ContentTag> existingTagsList = List<ContentTag> existingTagsList =
Case.getCurrentCase().getServices().getTagsManager() Case.getCurrentCase().getServices().getTagsManager()
.getContentTagsByContent(file); .getContentTagsByContent(file);
@ -172,10 +170,6 @@ public class DeleteFileContentTagAction extends AbstractAction implements Presen
for(ContentTag contentTag : existingTagsList) { for(ContentTag contentTag : existingTagsList) {
if(tagDisplayName.equals(contentTag.getName().getDisplayName())) { if(tagDisplayName.equals(contentTag.getName().getDisplayName())) {
JMenuItem tagNameItem = new JMenuItem(tagDisplayName); JMenuItem tagNameItem = new JMenuItem(tagDisplayName);
// for the bookmark tag name only, added shortcut label
if (tagDisplayName.equals(NbBundle.getMessage(AddTagAction.class, "AddBookmarkTagAction.bookmark.text"))) {
tagNameItem.setAccelerator(AddBookmarkTagAction.BOOKMARK_SHORTCUT);
}
tagNameItem.addActionListener((ActionEvent e) -> { tagNameItem.addActionListener((ActionEvent e) -> {
deleteTag(tagName, contentTag, file.getId()); deleteTag(tagName, contentTag, file.getId());
}); });

2
Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
View File

@ -382,8 +382,8 @@ public class HashsetHits implements AutopsyVisitableItem {
if (!artifactHits.containsKey(id)) { if (!artifactHits.containsKey(id)) {
BlackboardArtifact art = skCase.getBlackboardArtifact(id); BlackboardArtifact art = skCase.getBlackboardArtifact(id);
artifactHits.put(id, art); artifactHits.put(id, art);
list.add(id);
} }
list.add(id);
} catch (TskException ex) { } catch (TskException ex) {
logger.log(Level.SEVERE, "TSK Exception occurred", ex); //NON-NLS logger.log(Level.SEVERE, "TSK Exception occurred", ex); //NON-NLS
} }

5
Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
View File

@ -356,10 +356,9 @@ public class InterestingHits implements AutopsyVisitableItem {
try { try {
if (!artifactHits.containsKey(id)) { if (!artifactHits.containsKey(id)) {
BlackboardArtifact art = skCase.getBlackboardArtifact(id); BlackboardArtifact art = skCase.getBlackboardArtifact(id);
artifactHits.put(id, art);
artifactHits.put(id, art);
list.add(id);
} }
list.add(id);
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "TSK Exception occurred", ex); //NON-NLS logger.log(Level.SEVERE, "TSK Exception occurred", ex); //NON-NLS
} }

9
Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
View File

@ -708,18 +708,17 @@ public class KeywordHits implements AutopsyVisitableItem {
for (Long id : keywordResults.getArtifactIds(setName, keyword, DEFAULT_INSTANCE_NAME) ) { for (Long id : keywordResults.getArtifactIds(setName, keyword, DEFAULT_INSTANCE_NAME) ) {
RegExpInstanceKey key = new RegExpInstanceKey(id); RegExpInstanceKey key = new RegExpInstanceKey(id);
if (!nodesMap.containsKey(key)) { if (!nodesMap.containsKey(key)) {
nodesMap.put(key, createNode(key)); nodesMap.put(key, createNode(key));
list.add(key);
} }
list.add(key);
} }
} else { } else {
for (String instance : instances) { for (String instance : instances) {
RegExpInstanceKey key = new RegExpInstanceKey(instance); RegExpInstanceKey key = new RegExpInstanceKey(instance);
if (!nodesMap.containsKey(key)) { if (!nodesMap.containsKey(key)) {
nodesMap.put(key, createNode(key)); nodesMap.put(key, createNode(key));
list.add(key);
} }
list.add(key);
} }
} }
@ -904,8 +903,8 @@ public class KeywordHits implements AutopsyVisitableItem {
for (Long id : keywordResults.getArtifactIds(setName, keyword, instance) ) { for (Long id : keywordResults.getArtifactIds(setName, keyword, instance) ) {
if (!nodesMap.containsKey(id)) { if (!nodesMap.containsKey(id)) {
nodesMap.put(id, createBlackboardArtifactNode(id)); nodesMap.put(id, createBlackboardArtifactNode(id));
list.add(id);
} }
list.add(id);
} }
return true; return true;
} }

4
Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
View File

@ -102,14 +102,14 @@ public class EventRootNode extends DisplayableItemNode {
for (Long eventId: eventIDs){ for (Long eventId: eventIDs){
if (!nodesMap.containsKey(eventId)) { if (!nodesMap.containsKey(eventId)) {
nodesMap.put(eventId, createNode(eventId)); nodesMap.put(eventId, createNode(eventId));
toPopulate.add(eventId);
} }
toPopulate.add(eventId);
} }
} else { } else {
if (!nodesMap.containsKey(-1L)) { if (!nodesMap.containsKey(-1L)) {
nodesMap.put(-1L, createNode(-1L)); nodesMap.put(-1L, createNode(-1L));
toPopulate.add(-1L);
} }
toPopulate.add(-1L);
} }
return true; return true;
} }

3
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/OpenAction.java
View File

@ -35,6 +35,7 @@ import org.openide.util.actions.Presenter;
import org.openide.windows.WindowManager; import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.core.Installer; import org.sleuthkit.autopsy.core.Installer;
import org.sleuthkit.autopsy.core.RuntimeProperties;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryModule; import org.sleuthkit.autopsy.imagegallery.ImageGalleryModule;
@ -64,7 +65,7 @@ public final class OpenAction extends CallableSystemAction implements Presenter.
toolbarButton.addActionListener(actionEvent -> performAction()); toolbarButton.addActionListener(actionEvent -> performAction());
pcl = (PropertyChangeEvent evt) -> { pcl = (PropertyChangeEvent evt) -> {
if (evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())) { if (evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())) {
setEnabled(evt.getNewValue() != null); setEnabled(RuntimeProperties.runningWithGUI() && evt.getNewValue() != null);
} }
}; };
Case.addPropertyChangeListener(pcl); Case.addPropertyChangeListener(pcl);