diff --git a/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java b/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java index 1852ee839846998e3294d2a04a440b5ff95cce4f..3f5c52b5e92f48159851158d5c14affa5c77dbcc 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java +++ b/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java @@ -543,7 +543,7 @@ public Content getDataSource() throws TskCoreException { * * @return The object id of the data source. */ - long getDataSourceObjectId() { + public long getDataSourceObjectId() { return dataSourceObjectId; } diff --git a/bindings/java/src/org/sleuthkit/datamodel/ContentTag.java b/bindings/java/src/org/sleuthkit/datamodel/ContentTag.java index 48dc3e8fb059f4b5b3c9a6ab82f7fbd810722f8b..90e07d5aa345f259b2ddf5f6cc90a8c5659670b0 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/ContentTag.java +++ b/bindings/java/src/org/sleuthkit/datamodel/ContentTag.java @@ -29,8 +29,8 @@ public class ContentTag extends Tag { private final long endByteOffset; // Clients of the org.sleuthkit.datamodel package should not directly create these objects. - ContentTag(long id, Content content, TagName name, String comment, long beginByteOffset, long endByteOffset, String userName) { - super(id, name, comment, userName); + ContentTag(long tagID, Content content, TagName name, String comment, long beginByteOffset, long endByteOffset, String userName) { + super(tagID, name, comment, userName); this.content = content; this.beginByteOffset = beginByteOffset; this.endByteOffset = endByteOffset; diff --git a/bindings/java/src/org/sleuthkit/datamodel/Tag.java b/bindings/java/src/org/sleuthkit/datamodel/Tag.java index 0f98b08737e43984f0b6643e47d4f470f42d8144..38e461c2727201059218ff2d2bb90a0935b637dd 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/Tag.java +++ b/bindings/java/src/org/sleuthkit/datamodel/Tag.java @@ -25,20 +25,25 @@ public abstract class Tag { static long ID_NOT_SET = -1; - private long id = ID_NOT_SET; + private long tagID = ID_NOT_SET; private final TagName name; private final String comment; private final String userName; - Tag(long id, TagName name, String comment, String userName) { - this.id = id; + Tag(long tagID, TagName name, String comment, String userName) { + this.tagID = tagID; this.name = name; this.comment = comment; this.userName = userName; } + /** + * Get Tag ID (unique amongst tags) + * + * @return + */ public long getId() { - return id; + return tagID; } public TagName getName() {