Skip to content

Commit e5955ac

Browse files
rcordovanorcordovano
committed
Case.getCurrentOpenCase => getCurrentCaseThrows
1 parent 9664619 commit e5955ac

File tree

173 files changed

+319
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+319
-314
lines changed

‎Core/src/org/sleuthkit/autopsy/actions/AddBlackboardArtifactTagAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected void addTag(TagName tagName, String comment) {
8484
new Thread(() -> {
8585
for (BlackboardArtifact artifact : selectedArtifacts) {
8686
try {
87-
Case.getCurrentOpenCase().getServices().getTagsManager().addBlackboardArtifactTag(artifact, tagName, comment);
87+
Case.getCurrentCaseThrows().getServices().getTagsManager().addBlackboardArtifactTag(artifact, tagName, comment);
8888
} catch (TskCoreException | NoCurrentCaseException ex) {
8989
Logger.getLogger(AddBlackboardArtifactTagAction.class.getName()).log(Level.SEVERE, "Error tagging result", ex); //NON-NLS
9090
SwingUtilities.invokeLater(() -> {

‎Core/src/org/sleuthkit/autopsy/actions/AddBookmarkTagAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class AddBookmarkTagAction extends AbstractAction {
4545
@Override
4646
public void actionPerformed(ActionEvent e) {
4747
try {
48-
Map<String, TagName> tagNamesMap = Case.getCurrentOpenCase().getServices().getTagsManager().getDisplayNamesToTagNamesMap();
48+
Map<String, TagName> tagNamesMap = Case.getCurrentCaseThrows().getServices().getTagsManager().getDisplayNamesToTagNamesMap();
4949
TagName bookmarkTagName = tagNamesMap.get(BOOKMARK);
5050

5151
/*

‎Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ protected void addTag(TagName tagName, String comment) {
140140
}
141141
}
142142

143-
Case.getCurrentOpenCase().getServices().getTagsManager().addContentTag(file, tagName, comment);
143+
Case.getCurrentCaseThrows().getServices().getTagsManager().addContentTag(file, tagName, comment);
144144
} catch (TskCoreException | NoCurrentCaseException ex) {
145145
Logger.getLogger(AddContentTagAction.class.getName()).log(Level.SEVERE, "Error tagging result", ex); //NON-NLS
146146
AbstractFile fileCopy = file;

‎Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private class TagMenu extends JMenu {
9393
// Get the current set of tag names.
9494
Map<String, TagName> tagNamesMap = null;
9595
try {
96-
TagsManager tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
96+
TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
9797
tagNamesMap = new TreeMap<>(tagsManager.getDisplayNamesToTagNamesMap());
9898
} catch (TskCoreException | NoCurrentCaseException ex) {
9999
Logger.getLogger(TagsManager.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex); //NON-NLS
@@ -170,7 +170,7 @@ private class TagMenu extends JMenu {
170170
private void getAndAddTag(String tagDisplayName, TagName tagName, String comment) {
171171
Case openCase;
172172
try {
173-
openCase = Case.getCurrentOpenCase();
173+
openCase = Case.getCurrentCaseThrows();
174174
} catch (NoCurrentCaseException ex) {
175175
Logger.getLogger(AddTagAction.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex); // NON-NLS
176176
return;

‎Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void actionPerformed(ActionEvent event) {
7373
new Thread(() -> {
7474
for (BlackboardArtifactTag tag : selectedTags) {
7575
try {
76-
Case.getCurrentOpenCase().getServices().getTagsManager().deleteBlackboardArtifactTag(tag);
76+
Case.getCurrentCaseThrows().getServices().getTagsManager().deleteBlackboardArtifactTag(tag);
7777
} catch (TskCoreException | NoCurrentCaseException ex) {
7878
Logger.getLogger(DeleteBlackboardArtifactTagAction.class.getName()).log(Level.SEVERE, "Error deleting tag", ex); //NON-NLS
7979
SwingUtilities.invokeLater(() -> {

‎Core/src/org/sleuthkit/autopsy/actions/DeleteContentTagAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void actionPerformed(ActionEvent e) {
7272
new Thread(() -> {
7373
for (ContentTag tag : selectedTags) {
7474
try {
75-
Case.getCurrentOpenCase().getServices().getTagsManager().deleteContentTag(tag);
75+
Case.getCurrentCaseThrows().getServices().getTagsManager().deleteContentTag(tag);
7676
} catch (TskCoreException | NoCurrentCaseException ex) {
7777
Logger.getLogger(DeleteContentTagAction.class.getName()).log(Level.SEVERE, "Error deleting tag", ex); //NON-NLS
7878
SwingUtilities.invokeLater(() -> {

‎Core/src/org/sleuthkit/autopsy/actions/DeleteFileBlackboardArtifactTagAction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected void deleteTag(TagName tagName, BlackboardArtifactTag artifactTag, lon
9898
protected Void doInBackground() throws Exception {
9999
TagsManager tagsManager;
100100
try {
101-
tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
101+
tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
102102
} catch (NoCurrentCaseException ex) {
103103
logger.log(Level.SEVERE, "Error untagging artifact. No open case found.", ex); //NON-NLS
104104
Platform.runLater(()
@@ -155,7 +155,7 @@ private class TagMenu extends JMenu {
155155
Map<String, TagName> tagNamesMap = null;
156156
try {
157157
// Get the current set of tag names.
158-
TagsManager tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
158+
TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
159159

160160
tagNamesMap = new TreeMap<>(tagsManager.getDisplayNamesToTagNamesMap());
161161
} catch (TskCoreException | NoCurrentCaseException ex) {
@@ -168,7 +168,7 @@ private class TagMenu extends JMenu {
168168
if (null != tagNamesMap && !tagNamesMap.isEmpty()) {
169169
try {
170170
List<BlackboardArtifactTag> existingTagsList
171-
= Case.getCurrentOpenCase().getServices().getTagsManager()
171+
= Case.getCurrentCaseThrows().getServices().getTagsManager()
172172
.getBlackboardArtifactTagsByArtifact(artifact);
173173

174174
for (Map.Entry<String, TagName> entry : tagNamesMap.entrySet()) {

‎Core/src/org/sleuthkit/autopsy/actions/DeleteFileContentTagAction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected void deleteTag(TagName tagName, ContentTag contentTag, long fileId) {
9898
protected Void doInBackground() throws Exception {
9999
TagsManager tagsManager;
100100
try {
101-
tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
101+
tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
102102
} catch (NoCurrentCaseException ex) {
103103
logger.log(Level.SEVERE, "Error untagging file. No open case found.", ex); //NON-NLS
104104
Platform.runLater(() ->
@@ -152,7 +152,7 @@ private class TagMenu extends JMenu {
152152
Map<String, TagName> tagNamesMap = null;
153153
try {
154154
// Get the current set of tag names.
155-
TagsManager tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
155+
TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
156156

157157
tagNamesMap = new TreeMap<>(tagsManager.getDisplayNamesToTagNamesMap());
158158
} catch (TskCoreException | NoCurrentCaseException ex) {
@@ -165,7 +165,7 @@ private class TagMenu extends JMenu {
165165
if (null != tagNamesMap && !tagNamesMap.isEmpty()) {
166166
try {
167167
List<ContentTag> existingTagsList =
168-
Case.getCurrentOpenCase().getServices().getTagsManager()
168+
Case.getCurrentCaseThrows().getServices().getTagsManager()
169169
.getContentTagsByContent(file);
170170

171171
for (Map.Entry<String, TagName> entry : tagNamesMap.entrySet()) {

‎Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void actionPerformed(ActionEvent e) {
139139
// Tag name DTOs may be null (user tag names that have not been used do
140140
// not exist in the database).
141141
try {
142-
TagsManager tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
142+
TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
143143
tagNamesSet.addAll(tagsManager.getAllTagNames());
144144

145145
} catch (TskCoreException | NoCurrentCaseException ex) {

‎Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void actionPerformed(ActionEvent e) {
110110
// Get the current set of tag names and hash them for a speedy lookup in
111111
// case the user chooses an existing tag name from the tag names table.
112112
try {
113-
TagsManager tagsManager = Case.getCurrentOpenCase().getServices().getTagsManager();
113+
TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
114114
tagNamesMap.putAll(tagsManager.getDisplayNamesToTagNamesMap());
115115
} catch (TskCoreException | NoCurrentCaseException ex) {
116116
Logger.getLogger(GetTagNameDialog.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex); //NON-NLS
@@ -348,7 +348,7 @@ private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
348348

349349
if (tagName == null) {
350350
try {
351-
tagName = Case.getCurrentOpenCase().getServices().getTagsManager().addTagName(tagDisplayName, userTagDescription, TagName.HTML_COLOR.NONE, status);
351+
tagName = Case.getCurrentCaseThrows().getServices().getTagsManager().addTagName(tagDisplayName, userTagDescription, TagName.HTML_COLOR.NONE, status);
352352
dispose();
353353
} catch (TskCoreException | NoCurrentCaseException ex) {
354354
Logger.getLogger(AddTagAction.class.getName()).log(Level.SEVERE, "Error adding " + tagDisplayName + " tag name", ex); //NON-NLS
@@ -361,7 +361,7 @@ private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
361361
tagName = null;
362362
} catch (TagsManager.TagNameAlreadyExistsException ex) {
363363
try {
364-
tagName = Case.getCurrentOpenCase().getServices().getTagsManager().getDisplayNamesToTagNamesMap().get(tagDisplayName);
364+
tagName = Case.getCurrentCaseThrows().getServices().getTagsManager().getDisplayNamesToTagNamesMap().get(tagDisplayName);
365365
} catch (TskCoreException | NoCurrentCaseException ex1) {
366366
Logger.getLogger(AddTagAction.class.getName()).log(Level.SEVERE, tagDisplayName + " exists in database but an error occurred in retrieving it.", ex1); //NON-NLS
367367
JOptionPane.showMessageDialog(this,

0 commit comments

Comments
 (0)