Merge pull request #4128 from millmanorama/1030-remove-synchronization

1030 - remove synchronized block
This commit is contained in:
Richard Cordovano 2018-09-20 11:57:45 -04:00 committed by GitHub
commit 945c1b3ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 37 deletions

View File

@ -344,7 +344,7 @@ public final class ImageGalleryTopComponent extends TopComponent implements Expl
+ "or no groups are fully analyzed but ingest is not running."}) + "or no groups are fully analyzed but ingest is not running."})
private void checkForGroups() { private void checkForGroups() {
GroupManager groupManager = controller.getGroupManager(); GroupManager groupManager = controller.getGroupManager();
synchronized (groupManager) {
if (isNotEmpty(groupManager.getAnalyzedGroups())) { if (isNotEmpty(groupManager.getAnalyzedGroups())) {
clearNotification(); clearNotification();
return; return;
@ -388,7 +388,6 @@ public final class ImageGalleryTopComponent extends TopComponent implements Expl
new NoGroupsDialog(Bundle.ImageGalleryController_noGroupsDlg_msg6())); new NoGroupsDialog(Bundle.ImageGalleryController_noGroupsDlg_msg6()));
} }
} }
}
@ThreadConfined(type = ThreadConfined.ThreadType.JFX) @ThreadConfined(type = ThreadConfined.ThreadType.JFX)
private void replaceNotification(StackPane stackPane, Node newNode) { private void replaceNotification(StackPane stackPane, Node newNode) {

View File

@ -232,9 +232,8 @@ public class GroupManager {
} }
public boolean isRegrouping() { public boolean isRegrouping() {
Worker.State state = regrouper.getState();
return Arrays.asList(Worker.State.READY, Worker.State.RUNNING, Worker.State.SCHEDULED) return Arrays.asList(Worker.State.READY, Worker.State.RUNNING, Worker.State.SCHEDULED)
.contains(state); .contains(regrouper.getState());
} }
public ReadOnlyObjectProperty<Worker.State> reGroupingState() { public ReadOnlyObjectProperty<Worker.State> reGroupingState() {