From bd9555c2dbcbb0752cd5991dc0eaeb28d891e311 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 5 May 2017 11:29:35 -0400 Subject: [PATCH] 2635-remove adding of shortcut text to remove bookmark tag --- .../actions/DeleteFileBlackboardArtifactTagAction.java | 4 ---- .../autopsy/actions/DeleteFileContentTagAction.java | 6 ------ 2 files changed, 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/actions/DeleteFileBlackboardArtifactTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/DeleteFileBlackboardArtifactTagAction.java index afb17804b7..d9fd5d364f 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/DeleteFileBlackboardArtifactTagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/DeleteFileBlackboardArtifactTagAction.java @@ -174,10 +174,6 @@ public class DeleteFileBlackboardArtifactTagAction extends AbstractAction implem for(BlackboardArtifactTag artifactTag : existingTagsList) { if(tagDisplayName.equals(artifactTag.getName().getDisplayName())) { 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) -> { deleteTag(tagName, artifactTag, artifact.getArtifactID()); }); diff --git a/Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java index 5cc37e3900..e49e0f9170 100755 --- a/Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java @@ -159,8 +159,6 @@ public class DeleteFileContentTagAction extends AbstractAction implements Presen // a tag with the associated tag name. if (null != tagNamesMap && !tagNamesMap.isEmpty()) { try { - /*List existingTagsList = - Case.getCurrentCase().getServices().getTagsManager().getBlackboardArtifactTagsByArtifact(artifact);*/ List existingTagsList = Case.getCurrentCase().getServices().getTagsManager() .getContentTagsByContent(file); @@ -172,10 +170,6 @@ public class DeleteFileContentTagAction extends AbstractAction implements Presen for(ContentTag contentTag : existingTagsList) { if(tagDisplayName.equals(contentTag.getName().getDisplayName())) { 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) -> { deleteTag(tagName, contentTag, file.getId()); });