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

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

@@ -611,6 +611,7 @@ public static final class Type implements Serializable {
 		public static final Type TSK_IS_ADMIN = new Type(156, "TSK_IS_ADMIN", bundle.getString("BlackboardAttribute.tskIsAdmin.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER);
 		public static final Type TSK_CORRELATION_TYPE = new Type(157, "TSK_CORRELATION_TYPE", bundle.getString("BlackboardAttribute.tskCorrelationType.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 		public static final Type TSK_CORRELATION_VALUE = new Type(158, "TSK_CORRELATION_VALUE", bundle.getString("BlackboardAttribute.tskCorrelationValue.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
+		public static final Type TSK_OTHER_CASES = new Type(159, "TSK_OTHER_CASES", bundle.getString("BlackboardAttribute.tskOtherCases.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 		
 		// NOTE: When adding a new standard BlackboardAttribute.Type, add the instance and then add to the STANDARD_TYPES list.
 		/**
@@ -766,7 +767,8 @@ public static final class Type implements Serializable {
 				TSK_HOME_DIR,
 				TSK_IS_ADMIN,
 				TSK_CORRELATION_TYPE,
-				TSK_CORRELATION_VALUE
+				TSK_CORRELATION_VALUE,
+				TSK_OTHER_CASES
 		));
 
 		private static final long serialVersionUID = 1L;
@@ -1540,6 +1542,9 @@ public enum ATTRIBUTE_TYPE {
 				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
 		TSK_CORRELATION_VALUE(158, "TSK_CORRELATION_VALUE",
 				bundle.getString("BlackboardAttribute.tskCorrelationValue.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
+		TSK_OTHER_CASES(159, "TSK_OTHER_CASES",
+				bundle.getString("BlackboardAttribute.tskOtherCases.text"),
 				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),;
 
 		private final int typeID;

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

@@ -221,6 +221,7 @@ BlackboardAttribute.tskHomeDir.text=Home Directory
 BlackboardAttribute.tskIsAdmin.text=Is Administrator
 BlackboardAttribute.tskCorrelationType.text=Correlation Type
 BlackboardAttribute.tskCorrelationValue.text=Correlation Value
+BlackboardAttribute.tskOtherCases.text=Other Cases
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}

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

@@ -221,6 +221,7 @@ BlackboardAttribute.tskHomeDir.text=Home Directory
 BlackboardAttribute.tskIsAdmin.text=Is Administrator
 BlackboardAttribute.tskCorrelationType.text=Correlation Type
 BlackboardAttribute.tskCorrelationValue.text=Correlation Value
+BlackboardAttribute.tskOtherCases.text=Other Cases
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}