diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/grouping/GroupManager.java index 1763bfd64f..84f79dcfe4 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/grouping/GroupManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/grouping/GroupManager.java @@ -698,9 +698,10 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener { } } } - if (evt.getChangedAttribute() == DrawableAttribute.CATEGORY) { - Category.fireChange(fileIDs); - } + + //we fire this event for all files so that the category counts get updated during initial db population + Category.fireChange(fileIDs); + if (evt.getChangedAttribute() == DrawableAttribute.TAGS) { TagUtils.fireChange(fileIDs); } diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java index 241cbc09d9..1e78e8945e 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2013 Basis Technology Corp. + * Copyright 2013-15 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,10 +18,8 @@ */ package org.sleuthkit.autopsy.imagegallery.gui; -import java.net.URL; import java.util.Arrays; import java.util.Collection; -import java.util.ResourceBundle; import java.util.logging.Level; import javafx.application.Platform; import javafx.beans.property.SimpleObjectProperty; @@ -35,12 +33,10 @@ import javafx.scene.layout.Priority; import static javafx.scene.layout.Region.USE_COMPUTED_SIZE; import javafx.scene.layout.VBox; import javafx.util.Pair; -import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.imagegallery.FXMLConstructor; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; -import org.sleuthkit.autopsy.imagegallery.TagUtils; import org.sleuthkit.autopsy.imagegallery.datamodel.Category; import org.sleuthkit.datamodel.TskCoreException; @@ -51,12 +47,6 @@ public class SummaryTablePane extends AnchorPane implements Category.CategoryLis private static SummaryTablePane instance; - @FXML - private ResourceBundle resources; - - @FXML - private URL location; - @FXML private TableColumn, String> catColumn; @@ -98,7 +88,6 @@ public class SummaryTablePane extends AnchorPane implements Category.CategoryLis if (instance == null) { instance = new SummaryTablePane(); } - return instance; } @@ -107,9 +96,8 @@ public class SummaryTablePane extends AnchorPane implements Category.CategoryLis */ @Override public void handleCategoryChanged(Collection ids) { + final ObservableList> data = FXCollections.observableArrayList(); if (Case.isCaseOpen()) { - final ObservableList> data = FXCollections.observableArrayList(); - for (Category cat : Category.values()) { try { data.add(new Pair<>(cat, ImageGalleryController.getDefault().getGroupManager().countFilesWithCategory(cat))); @@ -117,11 +105,11 @@ public class SummaryTablePane extends AnchorPane implements Category.CategoryLis Logger.getLogger(SummaryTablePane.class.getName()).log(Level.WARNING, "Error performing category file count"); } } - Platform.runLater(() -> { - if (tableView != null) { - tableView.setItems(data); - } - }); } + Platform.runLater(() -> { + if (tableView != null) { + tableView.setItems(data); + } + }); } }