Skip to content
Snippets Groups Projects
Commit 503e1e56 authored by Raman's avatar Raman
Browse files

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
...@@ -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
}
} }
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment