Merge pull request #7378 from rcordovano/develop

7673 source code file reformatting

Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYCallsFileParser.java

@@ -263,7 +263,6 @@ final class XRYCallsFileParser extends AbstractSingleEntityParser {
 
         // Make sure we have the required fields, otherwise the CommHelper will
         // complain about illegal arguments.
-        
         // These are all the invalid combinations.
         if (callerId == null && calleeList.isEmpty()
                 || direction == CommunicationDirection.INCOMING && callerId == null
@@ -307,7 +306,6 @@ final class XRYCallsFileParser extends AbstractSingleEntityParser {
                     logger.log(Level.WARNING, String.format("Invalid account identifier %s", phone), ex);
                 }
 
-
                 otherAttributes.add(new BlackboardAttribute(
                         BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PHONE_NUMBER,
                         PARSER_NAME, phone));

Core/src/org/sleuthkit/autopsy/datasourceprocessors/xry/XRYMessagesFileParser.java

@@ -95,6 +95,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
          * Indicates if the display name of the XRY key is a recognized type.
          *
          * @param name
+         *
          * @return
          */
         public static boolean contains(String name) {
@@ -114,6 +115,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
          * contains() before hand.
          *
          * @param name
+         *
          * @return
          */
         public static XryKey fromDisplayName(String name) {
@@ -149,6 +151,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
          * type.
          *
          * @param xryNamespace
+         *
          * @return
          */
         public static boolean contains(String xryNamespace) {
@@ -169,6 +172,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
          * contains() before hand.
          *
          * @param xryNamespace
+         *
          * @return
          */
         public static XryNamespace fromDisplayName(String xryNamespace) {
@@ -206,6 +210,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
          * Indicates if the display name of the XRY key is a recognized type.
          *
          * @param name
+         *
          * @return
          */
         public static boolean contains(String name) {
@@ -225,6 +230,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
          * contains() before hand.
          *
          * @param name
+         *
          * @return
          */
         public static XryMetaKey fromDisplayName(String name) {
@@ -255,7 +261,9 @@ final class XRYMessagesFileParser implements XRYFileParser {
      * @param reader The XRYFileReader that reads XRY entities from the
      *               Message-SMS report.
      * @param parent The parent Content to create artifacts from.
-     * @throws IOException If an I/O error is encountered during report reading
+     *
+     * @throws IOException      If an I/O error is encountered during report
+     *                          reading
      * @throws TskCoreException If an error during artifact creation is
      *                          encountered.
      */
@@ -437,8 +445,8 @@ final class XRYMessagesFileParser implements XRYFileParser {
     }
 
     /**
-     * Extracts all pairs from the XRY Entity. This function
+     * Extracts all pairs from the XRY Entity. This function will unify any
-     * will unify any segmented text, if need be.
+     * segmented text, if need be.
      */
     private List<XRYKeyValuePair> getXRYKeyValuePairs(String xryEntity,
             XRYFileReader reader, Set<Integer> referenceValues) throws IOException {
@@ -509,9 +517,12 @@ final class XRYMessagesFileParser implements XRYFileParser {
      * single artifact.
      *
      * @param reader               File reader that is producing XRY entities.
-     * @param referenceNumbersSeen All known references numbers up until this point.
+     * @param referenceNumbersSeen All known references numbers up until this
+     *                             point.
      * @param xryEntity            The source XRY entity.
+     *
      * @return
+     *
      * @throws IOException
      */
     private String getSegmentedText(String[] xryEntity, XRYFileReader reader,
@@ -605,6 +616,7 @@ final class XRYMessagesFileParser implements XRYFileParser {
      *
      * @param xryLines XRY entity to extract from.
      * @param metaKey  The key type to extract.
+     *
      * @return
      */
     private Optional<Integer> getMetaKeyValue(String[] xryLines, XryMetaKey metaKey) {
@@ -629,10 +641,12 @@ final class XRYMessagesFileParser implements XRYFileParser {
     /**
      * Extracts the ith XRY Key Value pair in the XRY Entity.
      *
-     * The total number of pairs can be determined via getCountOfKeyValuePairs().
+     * The total number of pairs can be determined via
+     * getCountOfKeyValuePairs().
      *
      * @param xryLines XRY entity.
      * @param index    The requested Key Value pair.
+     *
      * @return
      */
     private Optional<XRYKeyValuePair> getKeyValuePairByIndex(String[] xryLines, int index) {