diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/DrawableTagsManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/DrawableTagsManager.java index 2639de7617..149c7fd888 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/DrawableTagsManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/DrawableTagsManager.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"); diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/DrawableGroup.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/DrawableGroup.java index ac0493d75e..6fdc9c236a 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/DrawableGroup.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/DrawableGroup.java @@ -165,11 +165,13 @@ public class DrawableGroup implements Comparable { // By default, sort by group key name @Override - public int compareTo(DrawableGroup other) { + public int compareTo(DrawableGroup other + ) { return this.groupKey.getValueDisplayName().compareTo(other.groupKey.getValueDisplayName()); } - void setSeen(boolean isSeen) { + void setSeen(boolean isSeen + ) { this.seen.set(isSeen); } diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java index 921cd9b8ff..d373e29728 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java @@ -200,21 +200,7 @@ public class GroupManager { @Nullable public DrawableGroup getGroupForKey(@Nonnull GroupKey groupKey) { synchronized (groupMap) { - if (groupKey.getAttribute() == DrawableAttribute.TAGS) { - - System.out.println(groupKey); -// @SuppressWarnings("unchecked") -// GroupKey tagKey = (GroupKey) groupKey; -// -// return groupMap.keySet().stream() -// .filter((GroupKey t) -> t.getAttribute() == DrawableAttribute.TAGS) -// .map((GroupKey t) -> (GroupKey) t) -// .filter(t -> tagKey.getValue().getDisplayName().equals(t.getValue().getDisplayName())) -// .findFirst().map(groupMap::get).orElse(null); - - } //else { return groupMap.get(groupKey); -// } } } @@ -258,15 +244,19 @@ public class GroupManager { /** * 'mark' the given group as seen. This removes it from the queue of * groups + * files. public DrawableGroup makeGroup(GroupKey groupKey, Set files) { Set newFiles = ObjectUtils.defaultIfNull(files, new HashSet()); + } + * groups * to review, and is persisted in the drawable db. * * @param group the {@link DrawableGroup} to mark as seen */ @ThreadConfined(type = ThreadType.JFX) - public void markGroupSeen(DrawableGroup group, boolean seen) { + public void markGroupSeen(DrawableGroup group, boolean seen + ) { db.markGroupSeen(group.getGroupKey(), seen); group.setSeen(seen); if (seen) { @@ -546,6 +536,7 @@ public class GroupManager { unmodifiableUnSeenGroups.setComparator(sortBy.getGrpComparator(sortOrder)); }); } + } /** @@ -705,6 +696,7 @@ public class GroupManager { LOGGER.log(Level.SEVERE, "failed to get files for group: " + groupKey.getAttribute().attrName.toString() + " = " + groupKey.getValue(), ex); } } + } return null; }