mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-12 07:56:16 +00:00
Merge branch 'develop' into hash_set_display
Conflicts: ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
This commit is contained in:
commit
ae9f9b0e31
@ -501,6 +501,7 @@ public final class ImageGalleryController {
|
||||
getTagsManager().fireTagDeletedEvent(tagDeletedEvent);
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -517,6 +518,8 @@ public final class ImageGalleryController {
|
||||
return tagsManager;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// @@@ REVIEW IF THIS SHOLD BE STATIC...
|
||||
//TODO: concept seems like the controller deal with how much work to do at a given time
|
||||
// @@@ review this class for synchronization issues (i.e. reset and cancel being called, add, etc.)
|
||||
|
@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.actions.GetTagNameAndCommentDialog;
|
||||
import org.sleuthkit.autopsy.actions.GetTagNameDialog;
|
||||
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
|
||||
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
|
||||
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
|
||||
import org.sleuthkit.datamodel.TagName;
|
||||
|
||||
/**
|
||||
|
@ -129,6 +129,7 @@ public class CategorizeAction extends AddTagAction {
|
||||
final CategoryManager categoryManager = controller.getCategoryManager();
|
||||
final DrawableTagsManager tagsManager = controller.getTagsManager();
|
||||
|
||||
|
||||
try {
|
||||
DrawableFile<?> file = controller.getFileFromId(fileID); //drawable db
|
||||
final List<ContentTag> fileTags = tagsManager.getContentTagsByContent(file);
|
||||
|
@ -25,7 +25,6 @@ import com.google.common.eventbus.EventBus;
|
||||
import com.google.common.eventbus.Subscribe;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.atomic.LongAdder;
|
||||
import java.util.logging.Level;
|
||||
@ -57,6 +56,8 @@ public class CategoryManager {
|
||||
|
||||
private final ImageGalleryController controller;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* the DrawableDB that backs the category counts cache. The counts are
|
||||
* initialized from this, and the counting of CAT-0 is always delegated to
|
||||
|
@ -248,7 +248,15 @@ public class GroupManager {
|
||||
|
||||
/**
|
||||
* 'mark' the given group as seen. This removes it from the queue of
|
||||
* groups to review, and is persisted in the drawable db.
|
||||
* groups
|
||||
* files.
|
||||
* public DrawableGroup makeGroup(GroupKey<?> groupKey, Set<Long> files) {
|
||||
*
|
||||
* Set<Long> newFiles = ObjectUtils.defaultIfNull(files, new
|
||||
* HashSet<Long>());
|
||||
* }
|
||||
* groups
|
||||
* to review, and is persisted in the drawable db.
|
||||
*
|
||||
* @param group the {@link DrawableGroup} to mark as seen
|
||||
*/
|
||||
|
@ -24,6 +24,7 @@ import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
import javafx.application.Platform;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
@ -39,18 +40,16 @@ import javafx.scene.image.Image;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.BorderPane;
|
||||
import javafx.scene.layout.Region;
|
||||
import static javafx.scene.layout.Region.USE_COMPUTED_SIZE;
|
||||
import javafx.scene.text.Text;
|
||||
import javafx.util.Pair;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.sleuthkit.autopsy.coreutils.Logger;
|
||||
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
|
||||
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
|
||||
import org.sleuthkit.autopsy.events.TagEvent;
|
||||
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
|
||||
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
|
||||
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
|
||||
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
|
||||
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
|
||||
import org.sleuthkit.datamodel.ContentTag;
|
||||
import org.sleuthkit.datamodel.TagName;
|
||||
|
||||
@ -151,6 +150,7 @@ public class MetaDataPane extends DrawableUIBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
protected synchronized void setFileHelper(Long newFileID) {
|
||||
setFileIDOpt(Optional.ofNullable(newFileID));
|
||||
if (newFileID == null) {
|
||||
@ -202,7 +202,6 @@ public class MetaDataPane extends DrawableUIBase {
|
||||
handleTagEvent(evt, this::updateUI);
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
@Override
|
||||
public void handleTagDeleted(ContentTagDeletedEvent evt) {
|
||||
handleTagEvent(evt, this::updateUI);
|
||||
|
Loading…
x
Reference in New Issue
Block a user