From 7215c430251bb100a2e658463b3e2c0dfd521fbd Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 16 Jun 2017 11:07:27 -0400
Subject: [PATCH] Update copyright, rearrange TagsManager.java for
 modifications

---
 .../casemodule/services/TagsManager.java      | 71 ++++++++++---------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
index 89454ae07c..38e1ed4a3b 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2016 Basis Technology Corp.
+ * Copyright 2011-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,39 +49,6 @@ public class TagsManager implements Closeable {
     private static final Set<String> STANDARD_TAG_DISPLAY_NAMES = new HashSet<>(Arrays.asList(Bundle.TagsManager_predefTagNames_bookmark_text()));
     private final SleuthkitCase caseDb;
 
-    /**
-     * Constructs a per case Autopsy service that manages the addition of
-     * content and artifact tags to the case database.
-     *
-     * @param caseDb The case database.
-     */
-    TagsManager(SleuthkitCase caseDb) {
-        this.caseDb = caseDb;
-    }
-
-    /**
-     * Gets a list of all tag names currently in the case database.
-     *
-     * @return A list, possibly empty, of TagName objects.
-     *
-     * @throws TskCoreException If there is an error querying the case database.
-     */
-    public List<TagName> getAllTagNames() throws TskCoreException {
-        return caseDb.getAllTagNames();
-    }
-
-    /**
-     * Gets a list of all tag names currently in use in the case database for
-     * tagging content or artifacts.
-     *
-     * @return A list, possibly empty, of TagName objects.
-     *
-     * @throws TskCoreException If there is an error querying the case database.
-     */
-    public List<TagName> getTagNamesInUse() throws TskCoreException {
-        return caseDb.getTagNamesInUse();
-    }
-
     /**
      * Gets a map of tag display names to tag name entries in the case database.
      * It has keys for the display names of the standard tag types, the current
@@ -118,6 +85,39 @@ public class TagsManager implements Closeable {
         }
         return new HashMap<>(tagNames);
     }
+    
+    /**
+     * Constructs a per case Autopsy service that manages the addition of
+     * content and artifact tags to the case database.
+     *
+     * @param caseDb The case database.
+     */
+    TagsManager(SleuthkitCase caseDb) {
+        this.caseDb = caseDb;
+    }
+
+    /**
+     * Gets a list of all tag names currently in the case database.
+     *
+     * @return A list, possibly empty, of TagName objects.
+     *
+     * @throws TskCoreException If there is an error querying the case database.
+     */
+    public List<TagName> getAllTagNames() throws TskCoreException {
+        return caseDb.getAllTagNames();
+    }
+
+    /**
+     * Gets a list of all tag names currently in use in the case database for
+     * tagging content or artifacts.
+     *
+     * @return A list, possibly empty, of TagName objects.
+     *
+     * @throws TskCoreException If there is an error querying the case database.
+     */
+    public List<TagName> getTagNamesInUse() throws TskCoreException {
+        return caseDb.getTagNamesInUse();
+    }
 
     /**
      * Adds a tag name entry to the case database and adds a corresponding tag
@@ -531,8 +531,9 @@ public class TagsManager implements Closeable {
      * @throws IOException If there is a problem closing the tags manager.
      * @deprecated Tags manager clients should not close the tags manager.
      */
-    @Override
     @Deprecated
+    @Override
     public synchronized void close() throws IOException {
     }
+
 }