From 02c7f636568a19041788b3bd977ae200c03bb17c Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Mon, 16 Dec 2019 11:28:57 -0500
Subject: [PATCH] Addressed review comments and fixed a bug

---
 .../xry/XRYDeviceGenInfoFileParser.java                |  2 +-
 .../datasourceprocessors/xry/XRYKeyValuePair.java      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYDeviceGenInfoFileParser.java b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYDeviceGenInfoFileParser.java
index b98236045e..81aca1cc8e 100755
--- a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYDeviceGenInfoFileParser.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYDeviceGenInfoFileParser.java
@@ -89,7 +89,7 @@ final class XRYDeviceGenInfoFileParser extends AbstractSingleEntityParser {
     @Override
     void makeArtifact(List<XRYKeyValuePair> keyValuePairs, Content parent) throws TskCoreException {
         List<BlackboardAttribute> attributes = new ArrayList<>();
-        for(int i = 0; i < keyValuePairs.size(); i++) {
+        for(int i = 0; i < keyValuePairs.size(); i+=2) {
             Optional<BlackboardAttribute> attribute;
             if(i + 1 == keyValuePairs.size()) {
                 attribute = getBlackboardAttribute(keyValuePairs.get(i));
diff --git a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYKeyValuePair.java b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYKeyValuePair.java
index 0111268922..fbea9b4e70 100755
--- a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYKeyValuePair.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYKeyValuePair.java
@@ -35,7 +35,7 @@ class XRYKeyValuePair {
     private final String value;
     private final String namespace;
 
-    public XRYKeyValuePair(String key, String value, String namespace) {
+    XRYKeyValuePair(String key, String value, String namespace) {
         this.key = key.trim();
         this.value = value.trim();
         this.namespace = namespace.trim();
@@ -49,7 +49,7 @@ class XRYKeyValuePair {
      *
      * @param targetKey Key name to test.
      */
-    public boolean hasKey(String targetKey) {
+    boolean hasKey(String targetKey) {
         String normalizedKey = key.toLowerCase();
         String normalizedTargetKey = targetKey.trim().toLowerCase();
         return normalizedKey.equals(normalizedTargetKey);
@@ -58,21 +58,21 @@ class XRYKeyValuePair {
     /**
      * Retrieves the value contained within this pair.
      */
-    public String getValue() {
+    String getValue() {
         return value;
     }
     
     /**
      * Retrieves the key contained within this pair.
      */
-    public String getKey() {
+    String getKey() {
         return key;
     }
     
     /**
      * Retrieves the namespace contained within this pair.
      */
-    public String getNamespace() {
+    String getNamespace() {
         return namespace;
     }