From cdcd0fa45e17eb57427284a193bbb0d9e41af855 Mon Sep 17 00:00:00 2001
From: Sophie Mori <smori@basistech.com>
Date: Tue, 27 Sep 2016 15:19:44 -0400
Subject: [PATCH] Updated TagsManager for multiuser loading, changed some UI
 text

---
 Core/src/org/sleuthkit/autopsy/actions/Bundle.properties      | 4 ++--
 .../sleuthkit/autopsy/casemodule/services/Bundle.properties   | 4 ++--
 .../autopsy/casemodule/services/NewUserTagNameDialog.java     | 2 +-
 .../autopsy/casemodule/services/TagNamesSettingsPanel.java    | 4 ++--
 .../sleuthkit/autopsy/casemodule/services/TagsManager.java    | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
index ba828aed5d..d964d91fc7 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
@@ -1,7 +1,7 @@
 GetTagNameDialog.tagNameField.text=
 GetTagNameDialog.cancelButton.text=Cancel
 GetTagNameDialog.okButton.text=OK
-GetTagNameDialog.preexistingLabel.text=Pre-existing Tags:
+GetTagNameDialog.preexistingLabel.text=Pre-existing Tag Names:
 GetTagNameDialog.newTagPanel.border.title=New Tag
 GetTagNameDialog.tagNameLabel.text=Tag Name:
 GetTagNameAndCommentDialog.newTagButton.text=New Tag Name
@@ -58,4 +58,4 @@ OpenOutputFolder.CouldNotOpenOutputFolder=Could not open output folder
 ShowIngestProgressSnapshotAction.actionName.text=Get Ingest Progress Snapshot
 OpenPythonModulesFolderAction.actionName.text=Python Plugins
 OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0}
-CTL_OpenPythonModulesFolderAction=Python Plugins
\ No newline at end of file
+CTL_OpenPythonModulesFolderAction=Python Plugins
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties
index c117fe5186..8fbcb50595 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties
@@ -1,4 +1,4 @@
-OptionsCategory_Name_TagNamesOptions=My Tag Names
+OptionsCategory_Name_TagNamesOptions=Tags
 OptionsCategory_TagNames=TagNames
 TagsManager.addContentTag.exception.beginByteOffsetOOR.msg=beginByteOffset \= {0} out of content size range (0 - {1})
 TagsManager.addContentTag.exception.endByteOffsetOOR.msg=endByteOffset \= {0} out of content size range (0 - {1})
@@ -13,7 +13,7 @@ TagsManagerOptionsPanel.addTagNameButton.empty=Tag name text is empty.
 TagsManagerOptionsPanel.addTagNameButton.containInvalidCharacter=Tag name may not contain any of the following symbols\: \\ \: * ? " < > | , ;
 TagsManagerOptionsPanel.addTagNameButton.alreadyExists=Tag name already exists.
 TagNamesSettingsPanel.deleteTagNameButton.text=Delete Tag Name
-TagNamesSettingsPanel.tagNamesListLabel.text=Your tag names:
+TagNamesSettingsPanel.tagNamesListLabel.text=Tag names:
 NewUserTagNameDialog.tagNameTextField.text=
 NewUserTagNameDialog.newTagNameLabel.text=New Tag Name:
 NewUserTagNameDialog.okButton.text=OK
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/NewUserTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/NewUserTagNameDialog.java
index 12fc8cb22b..bd04678ba9 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/NewUserTagNameDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/NewUserTagNameDialog.java
@@ -29,7 +29,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import org.openide.util.NbBundle;
 
-public class NewUserTagNameDialog extends javax.swing.JDialog {
+class NewUserTagNameDialog extends javax.swing.JDialog {
 
     private String userTagDisplayName;
     private BUTTON_PRESSED result;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNamesSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNamesSettingsPanel.java
index 9905869ae5..051e8e9549 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNamesSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNamesSettingsPanel.java
@@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings;
  * properties file, able to be used across cases. Potentially room to add other
  * tag name options in the future.
  */
-public class TagNamesSettingsPanel extends javax.swing.JPanel implements OptionsPanel {
+final class TagNamesSettingsPanel extends javax.swing.JPanel implements OptionsPanel {
 
     private static final Logger logger = Logger.getLogger(TagNamesSettingsPanel.class.getName());
 
@@ -53,7 +53,7 @@ public class TagNamesSettingsPanel extends javax.swing.JPanel implements Options
     /**
      * Creates new form TagsManagerOptionsPanel
      */
-    public TagNamesSettingsPanel() {
+    TagNamesSettingsPanel() {
         initComponents();
         customizeComponents();
     }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
index 3d29b17ebb..9cd7a72183 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
@@ -631,6 +631,9 @@ public class TagsManager implements Closeable {
             addPredefinedTagNames();
             addTagNamesFromTagsSettings();
             tagNamesLoaded = true;
+        } else {
+            // Reload case db tag names in case another user has added some.
+            addTagNamesFromCurrentCase();
         }
     }