Merge branch 'develop' of github.com:sleuthkit/sleuthkit into develop

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -322,14 +322,13 @@ BaseTypes.customTypes.name=Custom Types
 EventTypeHierarchyLevel.root=Root
 EventTypeHierarchyLevel.category=Category
 EventTypeHierarchyLevel.event=Event
-DataSourcesFilter.displayName.text=Data Source
+DataSourcesFilter.displayName.text=Limit data sources
 DescriptionFilter.mode.exclude=Exclude
 DescriptionFilter.mode.include=Include
-hashHitsFilter.displayName.text=Hash Hits Only
+hashHitsFilter.displayName.text=Must have hash hit
 hideKnownFilter.displayName.text=Hide Known Files
-# {0} - sub filter displaynames
 IntersectionFilter.displayName.text=Intersection 
-tagsFilter.displayName.text=Tagged Items Only
-TextFilter.displayName.text=Text Filter
-TypeFilter.displayName.text=Event Type
-FileTypesFilter.displayName.text=File Types
+tagsFilter.displayName.text=Must be tagged
+TextFilter.displayName.text=Must include text:
+TypeFilter.displayName.text=Limit event types
+FileTypesFilter.displayName.text=Limit file types
\ No newline at end of file

bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java

@@ -1000,7 +1000,6 @@ public FileTypesFilter copyOf() {
 		@Override
 		public String getDisplayName() {
 			return BundleProvider.getBundle().getString("FileTypesFilter.displayName.text");
-
 		}
 
 	}

bindings/java/src/org/sleuthkit/datamodel/blackboardutils/CommunicationArtifactsHelper.java

@@ -512,7 +512,7 @@ public BlackboardArtifact addMessage(String messageType,
 		}
 
 		// set recipient attribute and create recipient accounts
-		List<AccountFileInstance> recipientAccountsList = new ArrayList();
+		List<AccountFileInstance> recipientAccountsList = new ArrayList<>();
 		String recipientsStr = "";
 		if (recipientIdsList != null) {
 			for (String recipient : recipientIdsList) {
@@ -712,7 +712,7 @@ public BlackboardArtifact addCalllog(CommunicationDirection direction,
 		}
 
 		// Create a comma separated string of callee
-		List<AccountFileInstance> recipientAccountsList = new ArrayList();
+		List<AccountFileInstance> recipientAccountsList = new ArrayList<>();
 		String calleesStr = "";
 		if (!isEffectivelyEmpty(calleeIdsList)) {
 			calleesStr = addressListToString(calleeIdsList);