Updated TagsManager for multiuser loading, changed some UI text

This commit is contained in:
Sophie Mori 2016-09-27 15:19:44 -04:00
parent a32b95943f
commit cdcd0fa45e
5 changed files with 10 additions and 7 deletions

View File

@ -1,7 +1,7 @@
GetTagNameDialog.tagNameField.text= GetTagNameDialog.tagNameField.text=
GetTagNameDialog.cancelButton.text=Cancel GetTagNameDialog.cancelButton.text=Cancel
GetTagNameDialog.okButton.text=OK GetTagNameDialog.okButton.text=OK
GetTagNameDialog.preexistingLabel.text=Pre-existing Tags: GetTagNameDialog.preexistingLabel.text=Pre-existing Tag Names:
GetTagNameDialog.newTagPanel.border.title=New Tag GetTagNameDialog.newTagPanel.border.title=New Tag
GetTagNameDialog.tagNameLabel.text=Tag Name: GetTagNameDialog.tagNameLabel.text=Tag Name:
GetTagNameAndCommentDialog.newTagButton.text=New 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 ShowIngestProgressSnapshotAction.actionName.text=Get Ingest Progress Snapshot
OpenPythonModulesFolderAction.actionName.text=Python Plugins OpenPythonModulesFolderAction.actionName.text=Python Plugins
OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0} OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0}
CTL_OpenPythonModulesFolderAction=Python Plugins CTL_OpenPythonModulesFolderAction=Python Plugins

View File

@ -1,4 +1,4 @@
OptionsCategory_Name_TagNamesOptions=My Tag Names OptionsCategory_Name_TagNamesOptions=Tags
OptionsCategory_TagNames=TagNames OptionsCategory_TagNames=TagNames
TagsManager.addContentTag.exception.beginByteOffsetOOR.msg=beginByteOffset \= {0} out of content size range (0 - {1}) 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}) 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.containInvalidCharacter=Tag name may not contain any of the following symbols\: \\ \: * ? " < > | , ;
TagsManagerOptionsPanel.addTagNameButton.alreadyExists=Tag name already exists. TagsManagerOptionsPanel.addTagNameButton.alreadyExists=Tag name already exists.
TagNamesSettingsPanel.deleteTagNameButton.text=Delete Tag Name TagNamesSettingsPanel.deleteTagNameButton.text=Delete Tag Name
TagNamesSettingsPanel.tagNamesListLabel.text=Your tag names: TagNamesSettingsPanel.tagNamesListLabel.text=Tag names:
NewUserTagNameDialog.tagNameTextField.text= NewUserTagNameDialog.tagNameTextField.text=
NewUserTagNameDialog.newTagNameLabel.text=New Tag Name: NewUserTagNameDialog.newTagNameLabel.text=New Tag Name:
NewUserTagNameDialog.okButton.text=OK NewUserTagNameDialog.okButton.text=OK

View File

@ -29,7 +29,7 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
public class NewUserTagNameDialog extends javax.swing.JDialog { class NewUserTagNameDialog extends javax.swing.JDialog {
private String userTagDisplayName; private String userTagDisplayName;
private BUTTON_PRESSED result; private BUTTON_PRESSED result;

View File

@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings;
* properties file, able to be used across cases. Potentially room to add other * properties file, able to be used across cases. Potentially room to add other
* tag name options in the future. * 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()); 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 * Creates new form TagsManagerOptionsPanel
*/ */
public TagNamesSettingsPanel() { TagNamesSettingsPanel() {
initComponents(); initComponents();
customizeComponents(); customizeComponents();
} }

View File

@ -631,6 +631,9 @@ public class TagsManager implements Closeable {
addPredefinedTagNames(); addPredefinedTagNames();
addTagNamesFromTagsSettings(); addTagNamesFromTagsSettings();
tagNamesLoaded = true; tagNamesLoaded = true;
} else {
// Reload case db tag names in case another user has added some.
addTagNamesFromCurrentCase();
} }
} }