Skip to content
Snippets Groups Projects
Commit eeaa1197 authored by Brian Carrier's avatar Brian Carrier
Browse files

Merge pull request #17 from alawrence/master 

Bug fix
parents 99aa8be8 8cdf655e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
+ 0
− 1
View file @ eeaa1197
...@@ -166,7 +166,6 @@ public String getDisplayName(){ ...@@ -166,7 +166,6 @@ public String getDisplayName(){
return this.displayName; return this.displayName;
} }
//add int
/** /**
* add an attribute to this artifact * add an attribute to this artifact
* @param attrType the attribute type enum * @param attrType the attribute type enum
......
bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
+ 3
− 3
View file @ eeaa1197
...@@ -254,7 +254,7 @@ public BlackboardAttribute(int attributeTypeID, String moduleName, String contex ...@@ -254,7 +254,7 @@ public BlackboardAttribute(int attributeTypeID, String moduleName, String contex
this.attributeTypeID = attributeTypeID; this.attributeTypeID = attributeTypeID;
this.moduleName = moduleName; this.moduleName = moduleName;
this.context = context; this.context = context;
this.valueType = TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER; this.valueType = TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DOUBLE;
this.valueInt = 0; this.valueInt = 0;
this.valueLong = 0; this.valueLong = 0;
this.valueDouble = valueDouble; this.valueDouble = valueDouble;
...@@ -277,7 +277,7 @@ public BlackboardAttribute(int attributeTypeID, String moduleName, String contex ...@@ -277,7 +277,7 @@ public BlackboardAttribute(int attributeTypeID, String moduleName, String contex
this.attributeTypeID = attributeTypeID; this.attributeTypeID = attributeTypeID;
this.moduleName = moduleName; this.moduleName = moduleName;
this.context = context; this.context = context;
this.valueType = TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER; this.valueType = TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING;
this.valueInt = 0; this.valueInt = 0;
this.valueLong = 0; this.valueLong = 0;
this.valueDouble = 0; this.valueDouble = 0;
...@@ -300,7 +300,7 @@ public BlackboardAttribute(int attributeTypeID, String moduleName, String contex ...@@ -300,7 +300,7 @@ public BlackboardAttribute(int attributeTypeID, String moduleName, String contex
this.attributeTypeID = attributeTypeID; this.attributeTypeID = attributeTypeID;
this.moduleName = moduleName; this.moduleName = moduleName;
this.context = context; this.context = context;
this.valueType = TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER; this.valueType = TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.BYTE;
this.valueInt = 0; this.valueInt = 0;
this.valueLong = 0; this.valueLong = 0;
this.valueDouble = 0; this.valueDouble = 0;
......
bindings/java/teststandards/fe_test_4_standard.txt
+ 18
− 18
View file @ eeaa1197
...@@ -30,24 +30,24 @@ Image > ...@@ -30,24 +30,24 @@ Image >
AttributeGetDisplayName: Test Attribute AttributeGetDisplayName: Test Attribute
AttributeGetContext: third_call AttributeGetContext: third_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: Double
AttributeGetValueInteger: 0 AttributeGetValueDouble: 7.412
AttributeGetArtifactID: 1 AttributeGetArtifactID: 1
AttributeGetAttributeTypeID: 1001 AttributeGetAttributeTypeID: 1001
AttributeGetAttributeTypeName: testattr AttributeGetAttributeTypeName: testattr
AttributeGetDisplayName: Test Attribute AttributeGetDisplayName: Test Attribute
AttributeGetContext: fourth_call AttributeGetContext: fourth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: String
AttributeGetValueInteger: 0 AttributeGetValueString: test
AttributeGetArtifactID: 1 AttributeGetArtifactID: 1
AttributeGetAttributeTypeID: 1001 AttributeGetAttributeTypeID: 1001
AttributeGetAttributeTypeName: testattr AttributeGetAttributeTypeName: testattr
AttributeGetDisplayName: Test Attribute AttributeGetDisplayName: Test Attribute
AttributeGetContext: fifth_call AttributeGetContext: fifth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: Byte
AttributeGetValueInteger: 0 AttributeGetValueByte: [1, 2]
ArtifactGetArtifactID: 2 ArtifactGetArtifactID: 2
ArtifactGetArtifactTypeID: 1001 ArtifactGetArtifactTypeID: 1001
ArtifactGetArtifactTypeName: Test_Artifact ArtifactGetArtifactTypeName: Test_Artifact
...@@ -75,24 +75,24 @@ Image > ...@@ -75,24 +75,24 @@ Image >
AttributeGetDisplayName: Geo AttributeGetDisplayName: Geo
AttributeGetContext: eighth_call AttributeGetContext: eighth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: Double
AttributeGetValueInteger: 0 AttributeGetValueDouble: 7.412
AttributeGetArtifactID: 2 AttributeGetArtifactID: 2
AttributeGetAttributeTypeID: 10 AttributeGetAttributeTypeID: 10
AttributeGetAttributeTypeName: TSK_KEYWORD AttributeGetAttributeTypeName: TSK_KEYWORD
AttributeGetDisplayName: Keyword AttributeGetDisplayName: Keyword
AttributeGetContext: nineth_call AttributeGetContext: nineth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: String
AttributeGetValueInteger: 0 AttributeGetValueString: test
AttributeGetArtifactID: 2 AttributeGetArtifactID: 2
AttributeGetAttributeTypeID: 13 AttributeGetAttributeTypeID: 13
AttributeGetAttributeTypeName: TSK_KEYWORD_SET AttributeGetAttributeTypeName: TSK_KEYWORD_SET
AttributeGetDisplayName: Keyword Set AttributeGetDisplayName: Keyword Set
AttributeGetContext: tenth_call AttributeGetContext: tenth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: Byte
AttributeGetValueInteger: 0 AttributeGetValueByte: [3, 4]
ArtifactGetArtifactID: 3 ArtifactGetArtifactID: 3
ArtifactGetArtifactTypeID: 1 ArtifactGetArtifactTypeID: 1
ArtifactGetArtifactTypeName: TSK_GEN_INFO ArtifactGetArtifactTypeName: TSK_GEN_INFO
...@@ -120,24 +120,24 @@ Image > ...@@ -120,24 +120,24 @@ Image >
AttributeGetDisplayName: URL AttributeGetDisplayName: URL
AttributeGetContext: thirteenth_call AttributeGetContext: thirteenth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: Double
AttributeGetValueInteger: 0 AttributeGetValueDouble: 1.987
AttributeGetArtifactID: 3 AttributeGetArtifactID: 3
AttributeGetAttributeTypeID: 2 AttributeGetAttributeTypeID: 2
AttributeGetAttributeTypeName: TSK_DATETIME AttributeGetAttributeTypeName: TSK_DATETIME
AttributeGetDisplayName: Date Time AttributeGetDisplayName: Date Time
AttributeGetContext: fourteenth_call AttributeGetContext: fourteenth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: String
AttributeGetValueInteger: 0 AttributeGetValueString: test2
AttributeGetArtifactID: 3 AttributeGetArtifactID: 3
AttributeGetAttributeTypeID: 2 AttributeGetAttributeTypeID: 2
AttributeGetAttributeTypeName: TSK_DATETIME AttributeGetAttributeTypeName: TSK_DATETIME
AttributeGetDisplayName: Date Time AttributeGetDisplayName: Date Time
AttributeGetContext: fifteenth_call AttributeGetContext: fifteenth_call
AttributeGetSource: regressionTest AttributeGetSource: regressionTest
AttributeGetValueType: Integer AttributeGetValueType: Byte
AttributeGetValueInteger: 0 AttributeGetValueByte: [5, 6]
read: md5=d41d8cd98f00b204e9800998ecf8427e read: md5=d41d8cd98f00b204e9800998ecf8427e
VolumeSystem > VolumeSystem >
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment