Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Autopsy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IRT
Autopsy
Commits
503e1e56
Commit
503e1e56
authored
6 years ago
by
Raman
Browse files
Options
Downloads
Patches
Plain Diff
Manually applied changes to resolve merge conflict
- Push isImageGalleryOpen() check on EDT.
parent
d5bd765c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
+15
-13
15 additions, 13 deletions
...rg/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
with
15 additions
and
13 deletions
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
+
15
−
13
View file @
503e1e56
...
@@ -364,21 +364,23 @@ public void propertyChange(PropertyChangeEvent evt) {
...
@@ -364,21 +364,23 @@ public void propertyChange(PropertyChangeEvent evt) {
// A remote node added a new data source and just finished ingest on it.
// A remote node added a new data source and just finished ingest on it.
//drawable db is stale, and if ImageGallery is open, ask user what to do
//drawable db is stale, and if ImageGallery is open, ask user what to do
controller
.
setStale
(
true
);
controller
.
setStale
(
true
);
if
(
controller
.
isListeningEnabled
()
&&
ImageGalleryTopComponent
.
isImageGalleryOpen
()
)
{
if
(
controller
.
isListeningEnabled
())
{
SwingUtilities
.
invokeLater
(()
->
{
SwingUtilities
.
invokeLater
(()
->
{
int
showAnswer
=
JOptionPane
.
showConfirmDialog
(
ImageGalleryTopComponent
.
getTopComponent
(),
if
(
ImageGalleryTopComponent
.
isImageGalleryOpen
())
{
Bundle
.
ImageGalleryController_dataSourceAnalyzed_confDlg_msg
(),
int
showAnswer
=
JOptionPane
.
showConfirmDialog
(
ImageGalleryTopComponent
.
getTopComponent
(),
Bundle
.
ImageGalleryController_dataSourceAnalyzed_confDlg_title
(),
Bundle
.
ImageGalleryController_dataSourceAnalyzed_confDlg_msg
(),
JOptionPane
.
YES_NO_CANCEL_OPTION
,
JOptionPane
.
WARNING_MESSAGE
);
Bundle
.
ImageGalleryController_dataSourceAnalyzed_confDlg_title
(),
JOptionPane
.
YES_NO_CANCEL_OPTION
,
JOptionPane
.
WARNING_MESSAGE
);
switch
(
showAnswer
)
{
switch
(
showAnswer
)
{
case
JOptionPane
.
YES_OPTION
:
case
JOptionPane
.
YES_OPTION
:
controller
.
rebuildDB
();
controller
.
rebuildDB
();
break
;
break
;
case
JOptionPane
.
NO_OPTION
:
case
JOptionPane
.
NO_OPTION
:
case
JOptionPane
.
CANCEL_OPTION
:
case
JOptionPane
.
CANCEL_OPTION
:
default
:
default
:
break
;
//do nothing
break
;
//do nothing
}
}
}
});
});
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment