mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

suppress compile type warnings

Browse Source
This commit is contained in:
millmanorama 2017-06-09 11:14:11 +02:00
parent 66e1f5cca6
commit eb57361b6f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/corecomponents/ResultViewerPersistence.java
View File

@ -172,7 +172,7 @@ final class ResultViewerPersistence {
} }
/** /**
* Encapsulate the property sort order and sort rank into onde data bag. * Encapsulate the property, sort order, and sort rank into one data bag.
*/ */
static class SortCriterion { static class SortCriterion {

13
Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
View File

@ -32,6 +32,7 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.function.Function;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.swing.SortOrder; import javax.swing.SortOrder;
@ -163,17 +164,25 @@ class ThumbnailViewChildren extends Children.Keys<Integer> {
} }
private Comparator<Node> getCriterionComparator(SortCriterion criterion) { private Comparator<Node> getCriterionComparator(SortCriterion criterion) {
@SuppressWarnings("unchecked")
Comparator<Node> c = Comparator.comparing(node -> getPropertyValue(node, criterion.getProperty()), Comparator<Node> c = Comparator.comparing(node -> getPropertyValue(node, criterion.getProperty()),
Comparator.nullsFirst(Comparator.naturalOrder())); Comparator.nullsFirst(Comparator.naturalOrder()));
return criterion.getSortOrder() == SortOrder.ASCENDING ? c : c.reversed(); return criterion.getSortOrder() == SortOrder.ASCENDING ? c : c.reversed();
} }
@SuppressWarnings("rawtypes")
private Comparable getPropertyValue(Node node, Node.Property<?> prop) { private Comparable getPropertyValue(Node node, Node.Property<?> prop) {
for (Node.PropertySet ps : node.getPropertySets()) { for (Node.PropertySet ps : node.getPropertySets()) {
for (Node.Property<?> p : ps.getProperties()) { for (Node.Property<?> p : ps.getProperties()) {
if (p.equals(prop)) { if (p.equals(prop)) {
try { try {
return (Comparable) p.getValue(); if (p.getValue() instanceof Comparable) {
return (Comparable) p.getValue();
} else {
//if the value is not comparable use its string representation
return p.getValue().toString();
}
} catch (IllegalAccessException | InvocationTargetException ex) { } catch (IllegalAccessException | InvocationTargetException ex) {
Exceptions.printStackTrace(ex); Exceptions.printStackTrace(ex);
} }
@ -221,7 +230,7 @@ class ThumbnailViewChildren extends Children.Keys<Integer> {
*/ */
private class ThumbnailViewNode extends FilterNode { private class ThumbnailViewNode extends FilterNode {
private final Logger logger = Logger.getLogger(ThumbnailViewNode.class.getName()); private final Logger logger = Logger.getLogger(ThumbnailViewNode.class.getName());
private final Image waitingIcon = Toolkit.getDefaultToolkit().createImage(ThumbnailViewNode.class.getResource("/org/sleuthkit/autopsy/images/working_spinner.gif")); private final Image waitingIcon = Toolkit.getDefaultToolkit().createImage(ThumbnailViewNode.class.getResource("/org/sleuthkit/autopsy/images/working_spinner.gif"));