From b17b460e6a8431354236ff07dcec44b43d4207bd Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Fri, 24 May 2019 14:12:31 -0400
Subject: [PATCH] 5060 fix some netbeans warnings

---
 .../CorrelationAttributeNormalizer.java         | 17 +++++++++--------
 .../datamodel/EamArtifactUtil.java              | 14 +++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeNormalizer.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeNormalizer.java
index 5e77740e31..f6f3b52c6e 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeNormalizer.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeNormalizer.java
@@ -2,7 +2,7 @@
  *
  * Autopsy Forensic Browser
  *
- * Copyright 2018 Basis Technology Corp.
+ * Copyright 2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,12 +33,6 @@ final public class CorrelationAttributeNormalizer {
     //common seperators that may be removed for normalizing
     private static final String SEPERATORS_REGEX = "[\\s-:]";
 
-    /**
-     * This is a utility class - no need for constructing or subclassing, etc...
-     */
-    private CorrelationAttributeNormalizer() {
-    }
-
     /**
      * Normalize the data. Converts text to lower case, and ensures that the
      * data is a valid string of the format expected given the attributeType.
@@ -54,7 +48,7 @@ final public class CorrelationAttributeNormalizer {
             throw new CorrelationAttributeNormalizationException("Attribute type was null.");
         }
         if (data == null) {
-            throw new CorrelationAttributeNormalizationException("Correlation attribute value was null.");
+            throw new CorrelationAttributeNormalizationException("Correlation value was null.");
         }
 
         String trimmedData = data.trim();
@@ -310,4 +304,11 @@ final public class CorrelationAttributeNormalizer {
             throw new CorrelationAttributeNormalizationException("Data provided was not a valid Imsi. : " + data);
         }
     }
+
+    /**
+     * This is a utility class - no need for constructing or subclassing, etc...
+     */
+    private CorrelationAttributeNormalizer() {
+        //Empty constructor
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
index e51cea5200..98914afeec 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
@@ -1,7 +1,7 @@
 /*
  * Central Repository
  *
- * Copyright 2015-2018 Basis Technology Corp.
+ * Copyright 2015-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,15 +36,12 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 
 /**
- *
+ * Utility class for correlation attributes in the central repository
  */
 public class EamArtifactUtil {
 
     private static final Logger logger = Logger.getLogger(EamArtifactUtil.class.getName());
 
-    public EamArtifactUtil() {
-    }
-
     @Messages({"EamArtifactUtil.emailaddresses.text=Email Addresses"})
     public static String getEmailAddressAttrString() {
         return Bundle.EamArtifactUtil_emailaddresses_text();
@@ -373,4 +370,11 @@ public class EamArtifactUtil {
                 return false;
         }
     }
+
+    /**
+     * Constructs a new EamArtifactUtil
+     */
+    private EamArtifactUtil() {
+        //empty constructor
+    }
 }