From 22aec374abfeea076ed59c20ffe843c324170d8a Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 4 Dec 2019 18:45:50 -0500
Subject: [PATCH] Remove JFX dependency in TSK
---
.../sleuthkit/datamodel/TimelineFilter.java | 39 ++++++++++---------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java
index 233b0eb8a..85e2ed066 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java
@@ -257,12 +257,12 @@ public TagsFilter() {
* the direct source (file or artifact) of the events has either been
* tagged or not tagged.
*
- * @param eventSourceIsTagged Whether the direct sources of the events
- * need to be tagged or not tagged to be
- * accepted by this filter.
+ * @param eventSourcesAreTagged Whether the direct sources of the events
+ * need to be tagged or not tagged to be
+ * accepted by this filter.
*/
- public TagsFilter(boolean eventSourceIsTagged) {
- this.eventSourcesAreTagged = eventSourceIsTagged;
+ public TagsFilter(boolean eventSourcesAreTagged) {
+ this.eventSourcesAreTagged = eventSourcesAreTagged;
}
/**
@@ -388,11 +388,6 @@ public TextFilter(String descriptionSubstring) {
this.descriptionSubstring = descriptionSubstring.trim();
}
- @Override
- public String getDisplayName() {
- return BundleProvider.getBundle().getString("TextFilter.displayName.text");
- }
-
/**
* Sets the substring that must be present in one or more of the
* descriptions of each event that passes the filter.
@@ -403,6 +398,11 @@ public synchronized void setDescriptionSubstring(String descriptionSubstring) {
this.descriptionSubstring = descriptionSubstring.trim();
}
+ @Override
+ public String getDisplayName() {
+ return BundleProvider.getBundle().getString("TextFilter.displayName.text");
+ }
+
/**
* Gets the substring that must be present in one or more of the
* descriptions of each event that passes the filter.
@@ -433,7 +433,7 @@ public boolean equals(Object obj) {
@Override
public int hashCode() {
int hash = 5;
- hash = 29 * hash + Objects.hashCode(descriptionSubstring);
+ hash = 29 * hash + Objects.hashCode(this.descriptionSubstring);
return hash;
}
@@ -724,7 +724,7 @@ protected void addSubFilter(SubFilterType subfilter) {
* @return The filters.
*/
public final List<SubFilterType> getSubFilters() {
- return subFilters; // RJCTODO: DO we need to hand out a mutable reference?
+ return subFilters;
}
/**
@@ -885,21 +885,22 @@ public HashHitsFilter() {
* the files that are the direct or indirect sources of the events
* either have or do not have hash set hits.
*
- * @param hasHashHit Whether or not the files associated with the events
- * have or do not have hash set hits.
+ * @param eventSourcesHaveHashSetHits Whether or not the files
+ * associated with the events have or
+ * do not have hash set hits.
*/
- public HashHitsFilter(boolean hasHashHit) {
- eventSourcesHaveHashSetHits = hasHashHit;
+ public HashHitsFilter(boolean eventSourcesHaveHashSetHits) {
+ this.eventSourcesHaveHashSetHits = eventSourcesHaveHashSetHits;
}
/**
* Sets whether or not the files associated with the events have or do
* not have hash set hits
*
- * @param hasHashHit True or false.
+ * @param eventSourcesHaveHashSetHits True or false.
*/
- public synchronized void setEventSourcesHaveHashSetHits(boolean hasHashHit) {
- eventSourcesHaveHashSetHits = hasHashHit;
+ public synchronized void setEventSourcesHaveHashSetHits(boolean eventSourcesHaveHashSetHits) {
+ this.eventSourcesHaveHashSetHits = eventSourcesHaveHashSetHits;
}
/**
--
GitLab