From c83738d48d3078b35ad3f18e47dbcf7faa5bec6a Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 7 Sep 2017 16:43:36 -0400 Subject: [PATCH 01/12] 2834 added label to manage tags panel for where to create tags --- .../optionspanel/Bundle.properties | 2 +- .../optionspanel/ManageTagsDialog.form | 32 ++++++++++++------- .../optionspanel/ManageTagsDialog.java | 28 ++++++++++------ 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties index ed1de3ea5b..e82371d1d2 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties @@ -73,4 +73,4 @@ ManageCorrelationPropertiesDialog.okButton.text=OK GlobalSettingsPanel.bnManageProperties.text=Manage Correlation Properties ImportHashDatabaseDialog.lbInstructions.text=Choose an .idx file to import into the central repository. ImportHashDatabaseDialog.lbFilePath.text=File Path: -ImportHashDatabaseDialog.tfFilePath.text= +ImportHashDatabaseDialog.tfFilePath.text= \ No newline at end of file diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form index 07be8010cd..d5761d74cb 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form @@ -36,12 +36,13 @@ - - - - + + + + + - + @@ -51,16 +52,18 @@ - - - - - + + + + + + + - + @@ -107,5 +110,12 @@ + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index a5c0b87b1b..47e21de6ba 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -49,7 +49,8 @@ final class ManageTagsDialog extends javax.swing.JDialog { * and add it to the set of hash databases used to classify files as * unknown, known, or known bad. */ - @Messages({"ManageTagDialog.title=Manage Tags"}) + @Messages({"ManageTagDialog.title=Manage Tags", + "ManageTagDialog.tagInfo.text=Additional tags can be created in the Tags options panel."}) ManageTagsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), Bundle.ManageTagDialog_title(), @@ -115,6 +116,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { jScrollPane1 = new javax.swing.JScrollPane(); tblTagNames = new javax.swing.JTable(); lbWarnings = new javax.swing.JLabel(); + tagInfo = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); @@ -157,6 +159,8 @@ final class ManageTagsDialog extends javax.swing.JDialog { }); jScrollPane1.setViewportView(tblTagNames); + org.openide.awt.Mnemonics.setLocalizedText(tagInfo, org.openide.util.NbBundle.getMessage(ManageTagsDialog.class, "ManageTagDialog.tagInfo.text")); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -169,11 +173,12 @@ final class ManageTagsDialog extends javax.swing.JDialog { .addComponent(okButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(cancelButton)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 357, Short.MAX_VALUE) - .addComponent(lbWarnings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGap(0, 0, Short.MAX_VALUE))) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(tagInfo, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 357, Short.MAX_VALUE) + .addComponent(lbWarnings, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(2, 2, 2))) .addContainerGap()) ); @@ -183,14 +188,16 @@ final class ManageTagsDialog extends javax.swing.JDialog { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 335, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(lbWarnings, javax.swing.GroupLayout.DEFAULT_SIZE, 16, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(tagInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lbWarnings, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(okButton) .addComponent(cancelButton)) - .addContainerGap()) + .addGap(16, 16, 16)) ); pack(); @@ -237,6 +244,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { private javax.swing.JScrollPane jScrollPane1; private javax.swing.JLabel lbWarnings; private javax.swing.JButton okButton; + private javax.swing.JLabel tagInfo; private javax.swing.JTable tblTagNames; // End of variables declaration//GEN-END:variables } From 419dc9e1dab8bda768baa794be573f1a3859480f Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 12 Sep 2017 12:26:46 -0400 Subject: [PATCH 02/12] 2834 Changes to Manage Tags dialog to include tips for 2834 and 2835 on tag use --- .../optionspanel/Bundle.properties | 2 +- .../optionspanel/ManageTagsDialog.form | 43 +++++++++++------ .../optionspanel/ManageTagsDialog.java | 48 ++++++++++++++----- 3 files changed, 65 insertions(+), 28 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties index e82371d1d2..ed1de3ea5b 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties @@ -73,4 +73,4 @@ ManageCorrelationPropertiesDialog.okButton.text=OK GlobalSettingsPanel.bnManageProperties.text=Manage Correlation Properties ImportHashDatabaseDialog.lbInstructions.text=Choose an .idx file to import into the central repository. ImportHashDatabaseDialog.lbFilePath.text=File Path: -ImportHashDatabaseDialog.tfFilePath.text= \ No newline at end of file +ImportHashDatabaseDialog.tfFilePath.text= diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form index d5761d74cb..02bffafd59 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form @@ -31,15 +31,15 @@ - + - - + + @@ -53,9 +53,9 @@ - + - + @@ -63,7 +63,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -110,12 +110,27 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index 47e21de6ba..af286974e8 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -50,13 +50,26 @@ final class ManageTagsDialog extends javax.swing.JDialog { * unknown, known, or known bad. */ @Messages({"ManageTagDialog.title=Manage Tags", - "ManageTagDialog.tagInfo.text=Additional tags can be created in the Tags options panel."}) + "ManageTagDialog.tagInfo.text1=-Additional tags can be created in the tags options panel.", + "ManageTagDialog.tagInfo.text2=-Checking 'Implies Known Bad' for a tag name will give you the option of marking everyting with that tag in the current case as bad in the central repository.", + "ManageTagDialog.tagInfo.text3=-Un-checking 'Implies Known Bad' for a tag name will not have an effect on the central repository.", + "ManageTagDialog.tagInfo.text4=-Tagging an item with a tag which has 'Implies Known Bad' selected will flag the item as bad in the central repository.", + "ManageTagDialog.tagInfo.text5=-Untagging an item will remove the bad status for that item from the central repository if there are no other known bad tags on that item."}) ManageTagsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), Bundle.ManageTagDialog_title(), true); // NON-NLS initComponents(); customizeComponents(); + helpTextArea.setText(Bundle.ManageTagDialog_tagInfo_text1()); + helpTextArea.append("\n"); + helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text2()); + helpTextArea.append("\n"); + helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text3()); + helpTextArea.append("\n"); + helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text4()); + helpTextArea.append("\n"); + helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text5()); display(); } @@ -113,10 +126,11 @@ final class ManageTagsDialog extends javax.swing.JDialog { buttonGroup1 = new javax.swing.ButtonGroup(); okButton = new javax.swing.JButton(); cancelButton = new javax.swing.JButton(); - jScrollPane1 = new javax.swing.JScrollPane(); + tagScrollArea = new javax.swing.JScrollPane(); tblTagNames = new javax.swing.JTable(); lbWarnings = new javax.swing.JLabel(); - tagInfo = new javax.swing.JLabel(); + helpScrollPane = new javax.swing.JScrollPane(); + helpTextArea = new javax.swing.JTextArea(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); @@ -157,9 +171,16 @@ final class ManageTagsDialog extends javax.swing.JDialog { return canEdit [columnIndex]; } }); - jScrollPane1.setViewportView(tblTagNames); + tagScrollArea.setViewportView(tblTagNames); - org.openide.awt.Mnemonics.setLocalizedText(tagInfo, org.openide.util.NbBundle.getMessage(ManageTagsDialog.class, "ManageTagDialog.tagInfo.text")); // NOI18N + helpTextArea.setEditable(false); + helpTextArea.setBackground(new java.awt.Color(240, 240, 240)); + helpTextArea.setColumns(20); + helpTextArea.setLineWrap(true); + helpTextArea.setRows(5); + helpTextArea.setWrapStyleWord(true); + helpTextArea.setFocusable(false); + helpScrollPane.setViewportView(helpTextArea); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); @@ -169,14 +190,14 @@ final class ManageTagsDialog extends javax.swing.JDialog { .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(0, 223, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) .addComponent(okButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(cancelButton)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(tagInfo, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 357, Short.MAX_VALUE) + .addComponent(helpScrollPane, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tagScrollArea, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE) .addComponent(lbWarnings, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGap(2, 2, 2))) .addContainerGap()) @@ -188,16 +209,16 @@ final class ManageTagsDialog extends javax.swing.JDialog { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE) + .addComponent(helpScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 189, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tagInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 210, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lbWarnings, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(okButton) .addComponent(cancelButton)) - .addGap(16, 16, 16)) + .addContainerGap()) ); pack(); @@ -241,10 +262,11 @@ final class ManageTagsDialog extends javax.swing.JDialog { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JButton cancelButton; - private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JScrollPane helpScrollPane; + private javax.swing.JTextArea helpTextArea; private javax.swing.JLabel lbWarnings; private javax.swing.JButton okButton; - private javax.swing.JLabel tagInfo; + private javax.swing.JScrollPane tagScrollArea; private javax.swing.JTable tblTagNames; // End of variables declaration//GEN-END:variables } From c465011b124541a0b0f0dd5178d630bfe32457df Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 12 Sep 2017 12:29:51 -0400 Subject: [PATCH 03/12] 2834 make setting of text for tag help area its own method --- .../centralrepository/optionspanel/ManageTagsDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index af286974e8..0d4bcef875 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -61,6 +61,11 @@ final class ManageTagsDialog extends javax.swing.JDialog { true); // NON-NLS initComponents(); customizeComponents(); + setupHelpTextArea(); + display(); + } + + private void setupHelpTextArea() { helpTextArea.setText(Bundle.ManageTagDialog_tagInfo_text1()); helpTextArea.append("\n"); helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text2()); @@ -70,7 +75,6 @@ final class ManageTagsDialog extends javax.swing.JDialog { helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text4()); helpTextArea.append("\n"); helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text5()); - display(); } @Messages({"ManageTagsDialog.init.failedConnection.msg=Cannot connect to Central Repository.", From cd845adf15248665903e50cc48bf03ef2c34396a Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 12 Sep 2017 13:02:26 -0400 Subject: [PATCH 04/12] 2834 adjust default size of tag help box on manage tags panel --- .../centralrepository/optionspanel/ManageTagsDialog.form | 4 ++-- .../centralrepository/optionspanel/ManageTagsDialog.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form index 02bffafd59..8a93bd383a 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form @@ -53,9 +53,9 @@ - + - + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index 0d4bcef875..d29ce4f677 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -213,9 +213,9 @@ final class ManageTagsDialog extends javax.swing.JDialog { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(helpScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 189, Short.MAX_VALUE) + .addComponent(helpScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 166, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 210, Short.MAX_VALUE) + .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 233, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lbWarnings, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) From 4f488e29ca4653ecdcb7a3ddef449f11b851f3dc Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 13 Sep 2017 18:17:28 -0400 Subject: [PATCH 05/12] 2834 make changes to Central Repo and Manage Tags GUI layout --- .../optionspanel/GlobalSettingsPanel.form | 302 ++++++++++++++---- .../optionspanel/GlobalSettingsPanel.java | 223 +++++++++---- .../optionspanel/ManageTagsDialog.form | 23 +- .../optionspanel/ManageTagsDialog.java | 28 +- 4 files changed, 421 insertions(+), 155 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form index 2e87f1d5a4..e07efced14 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form @@ -19,32 +19,46 @@ - + - - - - - + + + + + + + + + + + + + + + - + + - - - + + + + + + + - - - + + @@ -66,26 +80,26 @@ - + - + + + + + - - - - - - - + + + + + - - @@ -107,9 +121,9 @@ - + - + @@ -154,53 +168,81 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - @@ -217,16 +259,42 @@ - + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244,16 +312,108 @@ + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java index 7e231d7cd2..650acf4d58 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java @@ -41,7 +41,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i private static final long serialVersionUID = 1L; private static final Logger LOGGER = Logger.getLogger(GlobalSettingsPanel.class.getName()); - + private final IngestJobEventPropertyChangeListener ingestJobEventListener; /** @@ -56,7 +56,14 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } @Messages({"GlobalSettingsPanel.title=Central Repository Settings", - "GlobalSettingsPanel.cbUseCentralRepo.text=Use a Central Repository"}) + "GlobalSettingsPanel.cbUseCentralRepo.text=Use a Central Repository", + "GlobalSettingsPanel.pnTagManagement.border.title=Tags", + "GlobalSettingsPanel.pnCorrelationProperties.border.title=Correlation Properties", + "GlobalSettingsPanel.lbCentralRepository.text=The Central Repository allows you to correlate files and forensic artifacts between cases.", + "GlobalSettingsPanel.manageTagsTextArea.text=Configure which tag names are associated with notable or known bad items. " + + "When these tags are used, the file or artifact will be recorded in the central repository. " + + "If that file or artifact is seen again in future cases, it will be flagged.", + "GlobalSettingsPanel.correlationPropertiesTextArea.text=Choose which file and artifact properties to store in the central central repository for later correlation."}) private void customizeComponents() { setName(Bundle.GlobalSettingsPanel_title()); @@ -86,12 +93,18 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i lbDbPlatformValue = new javax.swing.JLabel(); lbDbNameValue = new javax.swing.JLabel(); lbDbLocationValue = new javax.swing.JLabel(); - pnDatabaseContentButtons = new javax.swing.JPanel(); - bnImportDatabase = new javax.swing.JButton(); - bnManageTags = new javax.swing.JButton(); - bnManageTypes = new javax.swing.JButton(); - tbOops = new javax.swing.JTextField(); cbUseCentralRepo = new javax.swing.JCheckBox(); + bnImportDatabase = new javax.swing.JButton(); + pnTagManagement = new javax.swing.JPanel(); + bnManageTags = new javax.swing.JButton(); + manageTagsScrollPane = new javax.swing.JScrollPane(); + manageTagsTextArea = new javax.swing.JTextArea(); + tbOops = new javax.swing.JTextField(); + pnCorrelationProperties = new javax.swing.JPanel(); + bnManageTypes = new javax.swing.JButton(); + correlationPropertiesScrollPane = new javax.swing.JScrollPane(); + correlationPropertiesTextArea = new javax.swing.JTextArea(); + lbCentralRepository = new javax.swing.JLabel(); setName(""); // NOI18N @@ -117,19 +130,19 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i .addGroup(pnDatabaseConfigurationLayout.createSequentialGroup() .addContainerGap() .addGroup(pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(pnDatabaseConfigurationLayout.createSequentialGroup() + .addComponent(bnDbConfigure) + .addContainerGap()) .addGroup(pnDatabaseConfigurationLayout.createSequentialGroup() .addGroup(pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(lbDbPlatformTypeLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(lbDbNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(lbDbLocationLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lbDbPlatformValue, javax.swing.GroupLayout.PREFERRED_SIZE, 711, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lbDbNameValue, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 711, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(lbDbLocationValue, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 711, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(bnDbConfigure)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(lbDbNameValue, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(lbDbPlatformValue, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(lbDbLocationValue, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))) ); pnDatabaseConfigurationLayout.setVerticalGroup( pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -146,11 +159,18 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i .addGroup(pnDatabaseConfigurationLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(lbDbLocationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(lbDbLocationValue, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 11, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(bnDbConfigure) - .addContainerGap()) + .addGap(8, 8, 8)) ); + org.openide.awt.Mnemonics.setLocalizedText(cbUseCentralRepo, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbUseCentralRepo.text")); // NOI18N + cbUseCentralRepo.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cbUseCentralRepoActionPerformed(evt); + } + }); + bnImportDatabase.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/centralrepository/images/import16.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(bnImportDatabase, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.bnImportDatabase.label")); // NOI18N bnImportDatabase.setActionCommand(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.bnImportDatabase.actionCommand")); // NOI18N @@ -160,6 +180,9 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } }); + pnTagManagement.setBorder(javax.swing.BorderFactory.createTitledBorder(null, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.pnTagManagement.border.title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 12))); // NOI18N + pnTagManagement.setPreferredSize(new java.awt.Dimension(674, 97)); + org.openide.awt.Mnemonics.setLocalizedText(bnManageTags, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.bnManageTags.text")); // NOI18N bnManageTags.setToolTipText(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.bnManageTags.toolTipText")); // NOI18N bnManageTags.setActionCommand(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.bnManageTags.actionCommand")); // NOI18N @@ -169,6 +192,57 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } }); + manageTagsScrollPane.setBorder(null); + + manageTagsTextArea.setEditable(false); + manageTagsTextArea.setBackground(new java.awt.Color(240, 240, 240)); + manageTagsTextArea.setColumns(20); + manageTagsTextArea.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N + manageTagsTextArea.setLineWrap(true); + manageTagsTextArea.setRows(2); + manageTagsTextArea.setText(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.manageTagsTextArea.text")); // NOI18N + manageTagsTextArea.setToolTipText(""); + manageTagsTextArea.setWrapStyleWord(true); + manageTagsTextArea.setBorder(null); + manageTagsScrollPane.setViewportView(manageTagsTextArea); + + javax.swing.GroupLayout pnTagManagementLayout = new javax.swing.GroupLayout(pnTagManagement); + pnTagManagement.setLayout(pnTagManagementLayout); + pnTagManagementLayout.setHorizontalGroup( + pnTagManagementLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(pnTagManagementLayout.createSequentialGroup() + .addContainerGap() + .addGroup(pnTagManagementLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(pnTagManagementLayout.createSequentialGroup() + .addComponent(bnManageTags) + .addGap(0, 555, Short.MAX_VALUE)) + .addGroup(pnTagManagementLayout.createSequentialGroup() + .addComponent(manageTagsScrollPane) + .addContainerGap()))) + ); + pnTagManagementLayout.setVerticalGroup( + pnTagManagementLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(pnTagManagementLayout.createSequentialGroup() + .addGap(7, 7, 7) + .addComponent(manageTagsScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(bnManageTags, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(8, 8, 8)) + ); + + tbOops.setEditable(false); + tbOops.setFont(tbOops.getFont().deriveFont(tbOops.getFont().getStyle() | java.awt.Font.BOLD, 12)); + tbOops.setText(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.tbOops.text")); // NOI18N + tbOops.setBorder(null); + tbOops.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + tbOopsActionPerformed(evt); + } + }); + + pnCorrelationProperties.setBorder(javax.swing.BorderFactory.createTitledBorder(null, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.pnCorrelationProperties.border.title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 12))); // NOI18N + pnCorrelationProperties.setPreferredSize(new java.awt.Dimension(674, 93)); + org.openide.awt.Mnemonics.setLocalizedText(bnManageTypes, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.bnManageProperties.text")); // NOI18N bnManageTypes.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -176,41 +250,44 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } }); - javax.swing.GroupLayout pnDatabaseContentButtonsLayout = new javax.swing.GroupLayout(pnDatabaseContentButtons); - pnDatabaseContentButtons.setLayout(pnDatabaseContentButtonsLayout); - pnDatabaseContentButtonsLayout.setHorizontalGroup( - pnDatabaseContentButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnDatabaseContentButtonsLayout.createSequentialGroup() + correlationPropertiesScrollPane.setBorder(null); + + correlationPropertiesTextArea.setEditable(false); + correlationPropertiesTextArea.setBackground(new java.awt.Color(240, 240, 240)); + correlationPropertiesTextArea.setColumns(20); + correlationPropertiesTextArea.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N + correlationPropertiesTextArea.setLineWrap(true); + correlationPropertiesTextArea.setRows(2); + correlationPropertiesTextArea.setText(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.correlationPropertiesTextArea.text")); // NOI18N + correlationPropertiesTextArea.setToolTipText(""); + correlationPropertiesTextArea.setWrapStyleWord(true); + correlationPropertiesTextArea.setBorder(null); + correlationPropertiesScrollPane.setViewportView(correlationPropertiesTextArea); + + javax.swing.GroupLayout pnCorrelationPropertiesLayout = new javax.swing.GroupLayout(pnCorrelationProperties); + pnCorrelationProperties.setLayout(pnCorrelationPropertiesLayout); + pnCorrelationPropertiesLayout.setHorizontalGroup( + pnCorrelationPropertiesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(pnCorrelationPropertiesLayout.createSequentialGroup() .addContainerGap() - .addComponent(bnImportDatabase) + .addGroup(pnCorrelationPropertiesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(correlationPropertiesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 642, Short.MAX_VALUE) + .addGroup(pnCorrelationPropertiesLayout.createSequentialGroup() + .addComponent(bnManageTypes) + .addGap(0, 0, Short.MAX_VALUE))) + .addContainerGap()) + ); + pnCorrelationPropertiesLayout.setVerticalGroup( + pnCorrelationPropertiesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnCorrelationPropertiesLayout.createSequentialGroup() + .addGap(7, 7, 7) + .addComponent(correlationPropertiesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(bnManageTags) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(bnManageTypes) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - pnDatabaseContentButtonsLayout.setVerticalGroup( - pnDatabaseContentButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnDatabaseContentButtonsLayout.createSequentialGroup() - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(pnDatabaseContentButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(bnImportDatabase) - .addComponent(bnManageTags, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(bnManageTypes, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(34, 34, 34)) + .addGap(8, 8, 8)) ); - tbOops.setEditable(false); - tbOops.setFont(tbOops.getFont().deriveFont(tbOops.getFont().getStyle() | java.awt.Font.BOLD, 12)); - tbOops.setText(org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.tbOops.text")); // NOI18N - tbOops.setBorder(null); - - org.openide.awt.Mnemonics.setLocalizedText(cbUseCentralRepo, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbUseCentralRepo.text")); // NOI18N - cbUseCentralRepo.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - cbUseCentralRepoActionPerformed(evt); - } - }); + org.openide.awt.Mnemonics.setLocalizedText(lbCentralRepository, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.lbCentralRepository.text")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -219,26 +296,39 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(pnDatabaseContentButtons, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(tbOops, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(pnDatabaseConfiguration, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(cbUseCentralRepo, javax.swing.GroupLayout.PREFERRED_SIZE, 186, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE))) - .addContainerGap()) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(lbCentralRepository, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(pnCorrelationProperties, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(pnTagManagement, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(pnDatabaseConfiguration, 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() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(cbUseCentralRepo, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 186, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(bnImportDatabase, javax.swing.GroupLayout.Alignment.LEADING)) + .addGap(0, 0, Short.MAX_VALUE))) + .addContainerGap()))) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(lbCentralRepository) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(cbUseCentralRepo) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(pnDatabaseConfiguration, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(pnDatabaseConfiguration, javax.swing.GroupLayout.PREFERRED_SIZE, 119, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(pnTagManagement, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(pnCorrelationProperties, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) .addComponent(tbOops, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(pnDatabaseContentButtons, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) + .addGap(0, 0, 0) + .addComponent(bnImportDatabase)) ); + + pnTagManagement.getAccessibleContext().setAccessibleName(""); }// //GEN-END:initComponents private void bnImportDatabaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnImportDatabaseActionPerformed @@ -276,6 +366,10 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_cbUseCentralRepoActionPerformed + private void tbOopsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tbOopsActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_tbOopsActionPerformed + @Override @Messages({"GlobalSettingsPanel.validationerrMsg.mustConfigure=Configure the database to enable this module."}) public void load() { @@ -398,7 +492,6 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i private void enableDatabaseConfigureButton(Boolean enable) { boolean ingestRunning = IngestManager.getInstance().isIngestRunning(); pnDatabaseConfiguration.setEnabled(enable && !ingestRunning); - pnDatabaseContentButtons.setEnabled(enable && !ingestRunning); bnDbConfigure.setEnabled(enable && !ingestRunning); lbDbLocationLabel.setEnabled(enable && !ingestRunning); lbDbLocationValue.setEnabled(enable && !ingestRunning); @@ -418,10 +511,14 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i * @return True */ private boolean enableButtonSubComponents(Boolean enable) { - boolean ingestRunning = IngestManager.getInstance().isIngestRunning(); + boolean ingestRunning = IngestManager.getInstance().isIngestRunning(); + pnCorrelationProperties.setEnabled(enable && !ingestRunning); + pnTagManagement.setEnabled(enable && !ingestRunning); bnManageTypes.setEnabled(enable && !ingestRunning); bnImportDatabase.setEnabled(enable && !ingestRunning); bnManageTags.setEnabled(enable && !ingestRunning); + manageTagsTextArea.setEnabled(enable && !ingestRunning); + correlationPropertiesTextArea.setEnabled(enable && !ingestRunning); return true; } @@ -431,14 +528,20 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i private javax.swing.JButton bnManageTags; private javax.swing.JButton bnManageTypes; private javax.swing.JCheckBox cbUseCentralRepo; + private javax.swing.JScrollPane correlationPropertiesScrollPane; + private javax.swing.JTextArea correlationPropertiesTextArea; + private javax.swing.JLabel lbCentralRepository; private javax.swing.JLabel lbDbLocationLabel; private javax.swing.JLabel lbDbLocationValue; private javax.swing.JLabel lbDbNameLabel; private javax.swing.JLabel lbDbNameValue; private javax.swing.JLabel lbDbPlatformTypeLabel; private javax.swing.JLabel lbDbPlatformValue; + private javax.swing.JScrollPane manageTagsScrollPane; + private javax.swing.JTextArea manageTagsTextArea; + private javax.swing.JPanel pnCorrelationProperties; private javax.swing.JPanel pnDatabaseConfiguration; - private javax.swing.JPanel pnDatabaseContentButtons; + private javax.swing.JPanel pnTagManagement; private javax.swing.JTextField tbOops; // End of variables declaration//GEN-END:variables } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form index 8a93bd383a..ef232ae281 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form @@ -52,11 +52,11 @@ - - - - - + + + + + @@ -111,6 +111,11 @@ + + + + + @@ -124,9 +129,15 @@ + + + - + + + + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index d29ce4f677..ea8876108b 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -50,11 +50,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { * unknown, known, or known bad. */ @Messages({"ManageTagDialog.title=Manage Tags", - "ManageTagDialog.tagInfo.text1=-Additional tags can be created in the tags options panel.", - "ManageTagDialog.tagInfo.text2=-Checking 'Implies Known Bad' for a tag name will give you the option of marking everyting with that tag in the current case as bad in the central repository.", - "ManageTagDialog.tagInfo.text3=-Un-checking 'Implies Known Bad' for a tag name will not have an effect on the central repository.", - "ManageTagDialog.tagInfo.text4=-Tagging an item with a tag which has 'Implies Known Bad' selected will flag the item as bad in the central repository.", - "ManageTagDialog.tagInfo.text5=-Untagging an item will remove the bad status for that item from the central repository if there are no other known bad tags on that item."}) + "ManageTagDialog.tagInfo.text=Select the tags to store in the Central Repository. Additional tags can be created in the tags options panel."}) ManageTagsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), Bundle.ManageTagDialog_title(), @@ -66,15 +62,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { } private void setupHelpTextArea() { - helpTextArea.setText(Bundle.ManageTagDialog_tagInfo_text1()); - helpTextArea.append("\n"); - helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text2()); - helpTextArea.append("\n"); - helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text3()); - helpTextArea.append("\n"); - helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text4()); - helpTextArea.append("\n"); - helpTextArea.append(Bundle.ManageTagDialog_tagInfo_text5()); + helpTextArea.setText(Bundle.ManageTagDialog_tagInfo_text()); } @Messages({"ManageTagsDialog.init.failedConnection.msg=Cannot connect to Central Repository.", @@ -177,12 +165,16 @@ final class ManageTagsDialog extends javax.swing.JDialog { }); tagScrollArea.setViewportView(tblTagNames); + helpScrollPane.setBorder(null); + helpTextArea.setEditable(false); helpTextArea.setBackground(new java.awt.Color(240, 240, 240)); helpTextArea.setColumns(20); + helpTextArea.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N helpTextArea.setLineWrap(true); - helpTextArea.setRows(5); + helpTextArea.setRows(2); helpTextArea.setWrapStyleWord(true); + helpTextArea.setBorder(null); helpTextArea.setFocusable(false); helpScrollPane.setViewportView(helpTextArea); @@ -213,9 +205,9 @@ final class ManageTagsDialog extends javax.swing.JDialog { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(helpScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 166, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 233, Short.MAX_VALUE) + .addComponent(helpScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 347, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lbWarnings, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) From 34c2d2453f467bcffcb8365eaa73b46d43c5fdaf Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Sep 2017 16:38:58 -0400 Subject: [PATCH 06/12] 2834 central repository capitalization made more consistant --- .../actions/EamCaseEditDetailsDialog.java | 6 +++--- .../DataContentViewerOtherCasesTableModel.java | 4 ++-- .../autopsy/centralrepository/datamodel/EamArtifact.java | 6 +++--- .../experimental/configuration/SharedConfiguration.java | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/actions/EamCaseEditDetailsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/actions/EamCaseEditDetailsDialog.java index 6bbdeac316..c00f0583d8 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/actions/EamCaseEditDetailsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/actions/EamCaseEditDetailsDialog.java @@ -43,7 +43,7 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.EamOrganization; import org.sleuthkit.autopsy.centralrepository.optionspanel.AddNewOrganizationDialog; /** - * Handle editing details of cases within the Central Repository + * Handle editing details of cases within the central repository */ public class EamCaseEditDetailsDialog extends JDialog { @@ -531,14 +531,14 @@ public class EamCaseEditDetailsDialog extends JDialog { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); if (!EamDb.isEnabled()) { - LOGGER.log(Level.SEVERE, "Central Repository database not enabled"); // NON-NLS + LOGGER.log(Level.SEVERE, "Central repository database not enabled"); // NON-NLS return; } try { dbManager.updateCase(eamCase); } catch (IllegalArgumentException | EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to Central Repository database", ex); // NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to central repository database", ex); // NON-NLS } finally { setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java index 266211493b..ba2358d75c 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java @@ -175,9 +175,9 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel { } /** - * Add one local Central Repository Artifact to the table. + * Add one local central repository artifact to the table. * - * @param eamArtifact Central Repository Artifact to add to the + * @param eamArtifact central repository artifact to add to the * table */ public void addEamArtifact(EamArtifact eamArtifact) { diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifact.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifact.java index 3c2db37e39..7c7a7b0afb 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifact.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifact.java @@ -170,7 +170,7 @@ public class EamArtifact implements Serializable { * * @param id Unique ID for this Correlation Type * @param displayName Name of this type displayed in the UI. - * @param dbTableName Central Repository db table where data of this type is stored. + * @param dbTableName Central repository db table where data of this type is stored. * Must start with a lowercase letter and only contain * lowercase letters, numbers, and '_' characters. * @param supported Is this Type currently supported @@ -190,10 +190,10 @@ public class EamArtifact implements Serializable { /** * Constructior for custom types where we do not know the Type ID until * the row has been entered into the correlation_types table - * in the Central Repository. + * in the central repository. * * @param displayName Name of this type displayed in the UI. - * @param dbTableName Central Repository db table where data of this type is stored + * @param dbTableName Central repository db table where data of this type is stored * Must start with a lowercase letter and only contain * lowercase letters, numbers, and '_' characters. * @param supported Is this Type currently supported diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java index e7b633a133..ccb2e49e54 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java @@ -778,26 +778,26 @@ public class SharedConfiguration { } /** - * Upload Central Repository settings. + * Upload central repository settings. * * @param remoteFolder Shared settings folder * * @throws SharedConfigurationException */ private void uploadCentralRepositorySettings(File remoteFolder) throws SharedConfigurationException { - publishTask("Uploading Central Repository configuration"); + publishTask("Uploading central repository configuration"); copyToRemoteFolder(CENTRAL_REPOSITORY_PROPERTIES_FILE, moduleDirPath, remoteFolder, true); } /** - * Download Central Repository settings. + * Download central repository settings. * * @param remoteFolder Shared settings folder * * @throws SharedConfigurationException */ private void downloadCentralRepositorySettings(File remoteFolder) throws SharedConfigurationException { - publishTask("Downloading Central Repository configuration"); + publishTask("Downloading central repository configuration"); copyToLocalFolder(CENTRAL_REPOSITORY_PROPERTIES_FILE, moduleDirPath, remoteFolder, true); } From d2246550283bdef82440d37d13b204dc1e6d0087 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Sep 2017 16:51:00 -0400 Subject: [PATCH 07/12] 2834 more minor tweaks of UI text for central repository --- .../optionspanel/GlobalSettingsPanel.form | 4 ++-- .../optionspanel/GlobalSettingsPanel.java | 4 ++-- .../optionspanel/ManageTagsDialog.java | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form index e07efced14..c9c19a90ff 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.form @@ -198,7 +198,7 @@ - + @@ -320,7 +320,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java index 650acf4d58..b5d7169eca 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java @@ -56,10 +56,10 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } @Messages({"GlobalSettingsPanel.title=Central Repository Settings", - "GlobalSettingsPanel.cbUseCentralRepo.text=Use a Central Repository", + "GlobalSettingsPanel.cbUseCentralRepo.text=Use a central repository", "GlobalSettingsPanel.pnTagManagement.border.title=Tags", "GlobalSettingsPanel.pnCorrelationProperties.border.title=Correlation Properties", - "GlobalSettingsPanel.lbCentralRepository.text=The Central Repository allows you to correlate files and forensic artifacts between cases.", + "GlobalSettingsPanel.lbCentralRepository.text=A central repository allows you to correlate files and forensic artifacts between cases.", "GlobalSettingsPanel.manageTagsTextArea.text=Configure which tag names are associated with notable or known bad items. " + "When these tags are used, the file or artifact will be recorded in the central repository. " + "If that file or artifact is seen again in future cases, it will be flagged.", diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index 4417be32a6..79206e29df 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -61,7 +61,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { * unknown, known, or known bad. */ @Messages({"ManageTagDialog.title=Manage Tags", - "ManageTagDialog.tagInfo.text=Select the tags to store in the Central Repository. Additional tags can be created in the tags options panel."}) + "ManageTagDialog.tagInfo.text=Select the tags that cause files and results to be recorded in the central repository. Additional tags can be created in the tags options panel."}) ManageTagsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), Bundle.ManageTagDialog_title(), @@ -76,7 +76,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { helpTextArea.setText(Bundle.ManageTagDialog_tagInfo_text()); } - @Messages({"ManageTagsDialog.init.failedConnection.msg=Cannot connect to Central Repository.", + @Messages({"ManageTagsDialog.init.failedConnection.msg=Cannot connect to central repository.", "ManageTagsDialog.init.failedGettingTags.msg=Unable to retrieve list of tags."}) private void customizeComponents() { lbWarnings.setText(""); @@ -84,7 +84,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { try { dbManager = EamDb.getInstance(); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Failed to connect to Central Repository database."); + LOGGER.log(Level.SEVERE, "Failed to connect to central repository database."); lbWarnings.setText(Bundle.ManageTagsDialog_init_failedConnection_msg()); return; } @@ -261,7 +261,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { dbManager.setBadTags(badTags); dbManager.saveSettings(); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Failed to connect to Central Repository database."); // NON-NLS + LOGGER.log(Level.SEVERE, "Failed to connect to central repository database."); // NON-NLS lbWarnings.setText(Bundle.ManageTagsDialog_init_failedConnection_msg()); return false; } @@ -273,9 +273,9 @@ final class ManageTagsDialog extends javax.swing.JDialog { * any existing tagged items (in the current case only) in the central repo. */ public class CheckBoxModelListener implements TableModelListener { - @Messages({"ManageTagsDialog.updateCurrentCase.msg=Mark as known bad any files/artifacts in the current case that have this tag?", + @Messages({"ManageTagsDialog.updateCurrentCase.msg=Mark as known bad any files/results in the current case that have this tag?", "ManageTagsDialog.updateCurrentCase.title=Update current case?", - "ManageTagsDialog.updateCurrentCase.error=Error updating existing Central Repository entries"}) + "ManageTagsDialog.updateCurrentCase.error=Error updating existing central repository entries"}) javax.swing.JDialog dialog; public CheckBoxModelListener(javax.swing.JDialog dialog){ From 4855105db2ee7c341b1c3ad713f5b98b8bddd836 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Sep 2017 16:54:58 -0400 Subject: [PATCH 08/12] 2834 fix central repository being lower case in additional spots --- .../centralrepository/ingestmodule/IngestModule.java | 10 +++++----- .../optionspanel/EamDbSettingsDialog.java | 6 +++--- .../optionspanel/ImportHashDatabaseDialog.java | 2 +- .../ManageCorrelationPropertiesDialog.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java index 1c0a66d646..356d73df94 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java @@ -187,7 +187,7 @@ class IngestModule implements FileIngestModule { // see ArtifactManagerTimeTester for details @Messages({ "IngestModule.notfyBubble.title=Central Repository Not Initialized", - "IngestModule.errorMessage.isNotEnabled=Central Repository settings are not initialized, cannot run Correlation Engine ingest module." + "IngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Correlation Engine ingest module." }) @Override public void startUp(IngestJobContext context) throws IngestModuleException { @@ -210,8 +210,8 @@ class IngestModule implements FileIngestModule { // Don't allow sqlite central repo databases to be used for multi user cases if((Case.getCurrentCase().getCaseType() == Case.CaseType.MULTI_USER_CASE) && (EamDbPlatformEnum.getSelectedPlatform() == EamDbPlatformEnum.SQLITE)){ - LOGGER.log(Level.SEVERE, "Cannot run correlation engine on a multi-user case with a SQLite Central Repository."); - throw new IngestModuleException("Cannot run on a multi-user case with a SQLite Central Repository."); // NON-NLS + LOGGER.log(Level.SEVERE, "Cannot run correlation engine on a multi-user case with a SQLite central repository."); + throw new IngestModuleException("Cannot run on a multi-user case with a SQLite central repository."); // NON-NLS } jobId = context.getJobId(); eamCase = new EamCase(Case.getCurrentCase().getName(), Case.getCurrentCase().getDisplayName()); @@ -230,8 +230,8 @@ class IngestModule implements FileIngestModule { try { dbManager = EamDb.getInstance(); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to Central Repository database.", ex); // NON-NLS - throw new IngestModuleException("Error connecting to Central Repository database.", ex); // NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to central repository database.", ex); // NON-NLS + throw new IngestModuleException("Error connecting to central repository database.", ex); // NON-NLS } try { diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java index 8fb0bfe236..6a0280e992 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java @@ -419,7 +419,7 @@ public class EamDbSettingsDialog extends JDialog { Bundle.EamDbSettingsDialog_okButton_createPostgresDbError_message(), Bundle.EamDbSettingsDialog_okButton_createDbError_title(), JOptionPane.WARNING_MESSAGE); - LOGGER.severe("Unable to initialize database schema or insert contents into Central Repository."); + LOGGER.severe("Unable to initialize database schema or insert contents into central repository."); return; } break; @@ -440,7 +440,7 @@ public class EamDbSettingsDialog extends JDialog { Bundle.EamDbSettingsDialog_okButton_createSQLiteDbError_message(), Bundle.EamDbSettingsDialog_okButton_createDbError_title(), JOptionPane.WARNING_MESSAGE); - LOGGER.severe("Unable to initialize database schema or insert contents into Central Repository."); + LOGGER.severe("Unable to initialize database schema or insert contents into central repository."); return; } break; @@ -459,7 +459,7 @@ public class EamDbSettingsDialog extends JDialog { @Messages({"EamDbSettingsDialog.okButton.errorTitle.text=Restart Required.", "EamDbSettingsDialog.okButton.errorMsg.text=Please restart Autopsy to begin using the new database platform.", - "EamDbSettingsDialog.okButton.connectionErrorMsg.text=Failed to connect to Central Repository database.", + "EamDbSettingsDialog.okButton.connectionErrorMsg.text=Failed to connect to central repository database.", "EamDbSettingsDialog.okButton.corruptDatabaseExists.title=Error Loading Database", "EamDbSettingsDialog.okButton.corruptDatabaseExists.message=Database exists but is not the right format. Manually delete it or choose a different path (if applicable).", "EamDbSettingsDialog.okButton.createDbDialog.title=Database Does Not Exist", diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java index 2eccb89ec9..ad2a9bd54b 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java @@ -587,7 +587,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog { this.progress = ProgressHandle.createHandle(Bundle.ImportHashDatabaseDialog_ImportHashDatabaseWorker_displayName()); if (!EamDb.isEnabled()) { - throw new EamDbException("Central Repository database is not enabled."); // NON-NLS + throw new EamDbException("Central repository database is not enabled."); // NON-NLS } } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageCorrelationPropertiesDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageCorrelationPropertiesDialog.java index 727083c205..0d45c51d2f 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageCorrelationPropertiesDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageCorrelationPropertiesDialog.java @@ -249,7 +249,7 @@ final class ManageCorrelationPropertiesDialog extends javax.swing.JDialog { try { dbManager = EamDb.getInstance(); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Failed to connect to Central Repository database.", ex); + LOGGER.log(Level.SEVERE, "Failed to connect to central repository database.", ex); lbWarningMsg.setText(Bundle.ManageCorrelationPropertiesDialog_okbutton_failure()); return; } From 1cac6f4566748f0049c1eed023546bd947475f48 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Sep 2017 16:57:13 -0400 Subject: [PATCH 09/12] 2834 change uses of artifact in messages to user to result --- .../optionspanel/GlobalSettingsPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java index b5d7169eca..ad065f156d 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/GlobalSettingsPanel.java @@ -59,11 +59,11 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i "GlobalSettingsPanel.cbUseCentralRepo.text=Use a central repository", "GlobalSettingsPanel.pnTagManagement.border.title=Tags", "GlobalSettingsPanel.pnCorrelationProperties.border.title=Correlation Properties", - "GlobalSettingsPanel.lbCentralRepository.text=A central repository allows you to correlate files and forensic artifacts between cases.", + "GlobalSettingsPanel.lbCentralRepository.text=A central repository allows you to correlate files and results between cases.", "GlobalSettingsPanel.manageTagsTextArea.text=Configure which tag names are associated with notable or known bad items. " - + "When these tags are used, the file or artifact will be recorded in the central repository. " - + "If that file or artifact is seen again in future cases, it will be flagged.", - "GlobalSettingsPanel.correlationPropertiesTextArea.text=Choose which file and artifact properties to store in the central central repository for later correlation."}) + + "When these tags are used, the file or result will be recorded in the central repository. " + + "If that file or result is seen again in future cases, it will be flagged.", + "GlobalSettingsPanel.correlationPropertiesTextArea.text=Choose which file and result properties to store in the central central repository for later correlation."}) private void customizeComponents() { setName(Bundle.GlobalSettingsPanel_title()); From 62d6d27076efa1219e375298fa80a44e32d2215f Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Sep 2017 17:06:25 -0400 Subject: [PATCH 10/12] 2834 make scrollbar invisible by default with longer description in manage tags --- .../optionspanel/ManageTagsDialog.form | 12 ++++++------ .../optionspanel/ManageTagsDialog.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form index ef232ae281..d894f64fe6 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.form @@ -52,11 +52,11 @@ - - - - - + + + + + @@ -133,7 +133,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index 79206e29df..1196b61750 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -185,7 +185,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { helpTextArea.setColumns(20); helpTextArea.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N helpTextArea.setLineWrap(true); - helpTextArea.setRows(2); + helpTextArea.setRows(3); helpTextArea.setWrapStyleWord(true); helpTextArea.setBorder(null); helpTextArea.setFocusable(false); @@ -218,9 +218,9 @@ final class ManageTagsDialog extends javax.swing.JDialog { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(helpScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(helpScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) - .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 347, Short.MAX_VALUE) + .addComponent(tagScrollArea, javax.swing.GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lbWarnings, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) From 07493125a90a7dd6fdbcc4ac11372320cb28b929 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 15 Sep 2017 17:17:55 -0400 Subject: [PATCH 11/12] 2834 minor capital letter changes for consistancy --- .../autopsy/centralrepository/optionspanel/Bundle.properties | 2 +- .../centralrepository/optionspanel/EamDbSettingsDialog.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties index 5e0831e130..e15accaff1 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties @@ -8,7 +8,7 @@ EamPostgresSettingsDialog.bnCancel.text=Cancel EamPostgresSettingsDialog.lbPort.text=Port : EamPostgresSettingsDialog.lbHostName.text=Host Name / IP : EamPostgresSettingsDialog.bnTestConnection.text=Test Connection -EamPostgresSettingsDialog.lbDatabaseName.text=Database name : +EamPostgresSettingsDialog.lbDatabaseName.text=Database Name : EamSqliteSettingsDialog.bnCancel.text=Cancel EamSqliteSettingsDialog.lbTestDatabase.text= EamSqliteSettingsDialog.bnTestDatabase.text=Test Connection diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java index 6a0280e992..cf4d09b614 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/EamDbSettingsDialog.java @@ -59,7 +59,7 @@ public class EamDbSettingsDialog extends JDialog { */ @Messages({"EamDbSettingsDialog.title.text=Central Repository Database Configuration", "EamDbSettingsDialog.lbSingleUserSqLite.text=SQLite should only be used by one examiner at a time.", - "EamDbSettingsDialog.lbDatabaseType.text=Database type :", + "EamDbSettingsDialog.lbDatabaseType.text=Database Type :", "EamDbSettingsDialog.fcDatabasePath.title=Select location for central_repository.db"}) public EamDbSettingsDialog() { @@ -94,7 +94,7 @@ public class EamDbSettingsDialog extends JDialog { @Override public String getDescription() { - return "Directories and Central Repository databases"; + return "Directories and central repository databases"; } }); cbDatabaseType.setSelectedItem(selectedPlatform); From b73564f400a77061a6e44b3c8568259c90f4b6b8 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Fri, 15 Sep 2017 18:00:11 -0400 Subject: [PATCH 12/12] Update ManageTagsDialog.java --- .../centralrepository/optionspanel/ManageTagsDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java index 1196b61750..43cc72beb4 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageTagsDialog.java @@ -61,7 +61,7 @@ final class ManageTagsDialog extends javax.swing.JDialog { * unknown, known, or known bad. */ @Messages({"ManageTagDialog.title=Manage Tags", - "ManageTagDialog.tagInfo.text=Select the tags that cause files and results to be recorded in the central repository. Additional tags can be created in the tags options panel."}) + "ManageTagDialog.tagInfo.text=Select the tags that cause files and results to be recorded in the central repository. Additional tags can be created in the Tags options panel."}) ManageTagsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), Bundle.ManageTagDialog_title(),