diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties
index 00a4dbcd84..9fd068c9e9 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties
@@ -9,8 +9,6 @@ ImportHashDatabaseDialog.importHashDbErr=Import Hash Database Error
ImportHashDatabaseDialog.mustSelectHashDbFilePathMsg=A hash database file path must be selected.
ImportHashDatabaseDialog.hashDbDoesNotExistMsg=The selected hash database does not exist.
ImportHashDatabaseDialog.errorMessage.failedToOpenHashDbMsg=Failed to open hash database at {0}.
-EnterpriseArtifactManagerManageTagDialog.lbInstructions.text=
-EnterpriseArtifactManagerManageTagDialog.lbWarningMsg.text=
EamPostgresSettingsDialog.lbUserPassword.text=User Password :
EamPostgresSettingsDialog.lbUserName.text=User Name :
EamPostgresSettingsDialog.bnCancel.text=Cancel
@@ -56,7 +54,6 @@ GlobalSettingsPanel.bnConfigureDatabaseSettings.text=Configure
GlobalSettingsPanel.lbDatabasePlatform.text=Enable Database Platform :
GlobalSettingsPanel.lbDatabaseSettings.text=Database Settings
GlobalSettingsPanel.bnImportDatabase.label=Import Hash Database
-aGlobalSettingsPanel.bnImportDatabase.label=Import Hash Database
AddNewOrganizationDialog.lbPocPhone.text=Phone:
AddNewOrganizationDialog.lbPocEmail.text=Email:
AddNewOrganizationDialog.lbPocName.text=Name:
@@ -67,3 +64,7 @@ AddNewOrganizationDialog.bnOK.text=OK
AddNewOrganizationDialog.tfName.tooltip=POC Name
ManageTagsDialog.okButton.text=OK
ManageTagsDialog.cancelButton.text=Cancel
+ManageArtifactTypesDialog.cancelButton.text=Cancel
+ManageArtifactTypesDialog.okButton.text=OK
+ManageArtifactTypesDialog.lbWarningMsg.text=Warning Message
+ManageArtifactTypesDialog.taInstructionsMsg.text=Select one or more artifact types to store in the database and use for correlation during Ingest.
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form
index a4b03ac9fc..7af0708de0 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form
@@ -127,11 +127,6 @@
-
-
-
-
-
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java
index a1d88c66cb..81a8969ec8 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java
@@ -209,8 +209,6 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
.addGap(34, 34, 34))
);
- bnImportDatabase.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "EnterpriseArtifactManagerGlobalSettingsPanel.bnImportDatabase.label")); // NOI18N
-
cbEnableEnterpriseArtifactManager.setFont(cbEnableEnterpriseArtifactManager.getFont().deriveFont(cbEnableEnterpriseArtifactManager.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
org.openide.awt.Mnemonics.setLocalizedText(cbEnableEnterpriseArtifactManager, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbEnableEnterpriseArtifactManager.text")); // NOI18N
cbEnableEnterpriseArtifactManager.addItemListener(new java.awt.event.ItemListener() {
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form
index cfe3808748..58f3af5407 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form
@@ -27,42 +27,38 @@
-
+
-
+
+
+
-
-
+
-
-
-
-
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
-
+
@@ -71,7 +67,7 @@
-
+
@@ -81,7 +77,7 @@
-
+
@@ -89,6 +85,11 @@
+
+
+
+
+
@@ -99,21 +100,20 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
@@ -123,9 +123,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java
index 1b2517e8c2..8a25cb6559 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java
@@ -50,8 +50,7 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
* Displays a dialog that allows a user to select which Type(s) should be
* used for Correlation during ingest.
*/
- @Messages({"ManageArtifactTypesDialog.title=Manage Artifact Types",
- "ManageArtifactTypesDialog.instructions.text=Select one or more artifact types to store in the database and use for correlation during Ingest."})
+ @Messages({"ManageArtifactTypesDialog.title=Manage Artifact Types"})
ManageArtifactTypesDialog() {
super((JFrame) WindowManager.getDefault().getMainWindow(),
Bundle.ManageArtifactTypesDialog_title(),
@@ -64,7 +63,6 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
}
private void customizeComponents() {
- lbInstructions.setText(Bundle.ManageArtifactTypesDialog_instructions_text());
lbWarningMsg.setText("");
loadData();
@@ -132,31 +130,33 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
cancelButton = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
tbCorrelatableTypes = new javax.swing.JTable();
- lbInstructions = new javax.swing.JLabel();
lbWarningMsg = new javax.swing.JLabel();
+ taInstructions = new javax.swing.JTextArea();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- org.openide.awt.Mnemonics.setLocalizedText(okButton, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "EamManageTagDialog.okButton.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(okButton, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "ManageArtifactTypesDialog.okButton.text")); // NOI18N
okButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
okButtonActionPerformed(evt);
}
});
- org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "EamManageTagDialog.cancelButton.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "ManageArtifactTypesDialog.cancelButton.text")); // NOI18N
cancelButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
cancelButtonActionPerformed(evt);
}
});
+ jScrollPane1.setMinimumSize(new java.awt.Dimension(150, 23));
+
tbCorrelatableTypes.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
},
new String [] {
- "Correlation Type", "Enable"
+ "Artifact Type", "Enable"
}
) {
Class[] types = new Class [] {
@@ -174,31 +174,43 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
return canEdit [columnIndex];
}
});
+ tbCorrelatableTypes.setMaximumSize(new java.awt.Dimension(400, 0));
+ tbCorrelatableTypes.setMinimumSize(new java.awt.Dimension(150, 0));
jScrollPane1.setViewportView(tbCorrelatableTypes);
- org.openide.awt.Mnemonics.setLocalizedText(lbInstructions, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "EnterpriseArtifactManagerManageTagDialog.lbInstructions.text")); // NOI18N
-
lbWarningMsg.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
lbWarningMsg.setForeground(new java.awt.Color(255, 0, 0));
- org.openide.awt.Mnemonics.setLocalizedText(lbWarningMsg, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "EnterpriseArtifactManagerManageTagDialog.lbWarningMsg.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(lbWarningMsg, org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "ManageArtifactTypesDialog.lbWarningMsg.text")); // NOI18N
+
+ taInstructions.setEditable(false);
+ taInstructions.setBackground(new java.awt.Color(240, 240, 240));
+ taInstructions.setColumns(20);
+ taInstructions.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+ taInstructions.setLineWrap(true);
+ taInstructions.setRows(5);
+ taInstructions.setText(org.openide.util.NbBundle.getMessage(ManageArtifactTypesDialog.class, "ManageArtifactTypesDialog.taInstructionsMsg.text")); // NOI18N
+ taInstructions.setWrapStyleWord(true);
+ taInstructions.setAutoscrolls(false);
+ taInstructions.setBorder(null);
+ taInstructions.setFocusable(false);
+ taInstructions.setRequestFocusEnabled(false);
+ taInstructions.setVerifyInputWhenFocusTarget(false);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(lbWarningMsg, javax.swing.GroupLayout.PREFERRED_SIZE, 158, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(taInstructions)
+ .addComponent(lbWarningMsg, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
.addComponent(okButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cancelButton))
- .addComponent(lbInstructions, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(layout.createSequentialGroup()
- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 316, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, Short.MAX_VALUE)))
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
@@ -207,17 +219,17 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(lbInstructions, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(20, 20, 20)
+ .addComponent(taInstructions, javax.swing.GroupLayout.PREFERRED_SIZE, 34, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 306, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lbWarningMsg, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(lbWarningMsg, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(okButton)
- .addComponent(cancelButton)))
- .addContainerGap())
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(okButton)
+ .addComponent(cancelButton))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
pack();
@@ -250,9 +262,9 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
private javax.swing.ButtonGroup buttonGroup1;
private javax.swing.JButton cancelButton;
private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JLabel lbInstructions;
private javax.swing.JLabel lbWarningMsg;
private javax.swing.JButton okButton;
+ private javax.swing.JTextArea taInstructions;
private javax.swing.JTable tbCorrelatableTypes;
// End of variables declaration//GEN-END:variables
}
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form
index ae7f5f48ee..5316a3f44c 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form
@@ -28,18 +28,16 @@
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java
index 9f07f2bcc3..1053850a77 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java
@@ -43,7 +43,6 @@ final class ManageTagsDialog extends javax.swing.JDialog {
private static final Logger LOGGER = Logger.getLogger(ManageTagsDialog.class.getName());
-
/**
* Displays a dialog that allows a user to select an existing hash database
* and add it to the set of hash databases used to classify files as
@@ -152,15 +151,14 @@ final class ManageTagsDialog extends javax.swing.JDialog {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(0, 397, Short.MAX_VALUE)
- .addComponent(okButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(cancelButton))
- .addComponent(jScrollPane1))
+ .addContainerGap(233, Short.MAX_VALUE)
+ .addComponent(okButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(cancelButton)
.addContainerGap())
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 367, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE))
);
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {cancelButton, okButton});