diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties.orig b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties.orig
deleted file mode 100644
index e29341f8ed..0000000000
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties.orig
+++ /dev/null
@@ -1,86 +0,0 @@
-OpenIDE-Module-Name=HashDatabase
-HashDbSimplePanel.knownLabel.text=NSRL Database:
-HashDbSimplePanel.notableLabel.text=Known Bad Database(s):
-HashDbSimplePanel.knownValLabel.text=-
-HashDbSimplePanel.notableValLabel.text=-
-<<<<<<< HEAD
-HashDbSimplePanel.jLabel1.text=Select known bad databases to use during ingest:
-=======
-HashDbMgmtPanel.addNotableButton.text=Add Known Bad Database
-HashDbMgmtPanel.removeNotableButton.text=Remove Selected
-HashDbSimplePanel.jLabel1.text=Enable known bad databases for ingest:
-HashDbMgmtPanel.nsrlNameLabel.text=Not Configured
-HashDbMgmtPanel.setNSRLButton.text=Change
-HashDbMgmtPanel.jLabel1.text=Known Bad Database(s):
-HashDbMgmtPanel.jLabel2.text=NSRL Database:
-HashDbMgmtPanel.indexNSRLButton.text=Index
-HashDbMgmtPanel.removeNSRLButton.text=Remove
-HashDbMgmtPanel.ingestRunningLabel.text=\
-HashDbManagementPanel.nameLabel.text=Hash DB Name:
-HashDbManagementPanel.hashDbNameLabel.text=No database selected
-HashDbManagementPanel.locationLabel.text=Location:
-HashDbManagementPanel.hashDbLocationLabel.text=No database selected
-HashDbManagementPanel.deleteButton.text=Delete
-HashDbManagementPanel.useForIngestCheckbox.text=Enable for ingest
-HashDbManagementPanel.showInboxMessagesCheckBox.text=Enable sending messages to inbox during ingest
-HashDbManagementPanel.indexLabel.text=Index Status:
-HashDbManagementPanel.indexButton.text=Index
-HashDbManagementPanel.ingestRunningLabel.text=
-HashDbManagementPanel.hashDbIndexStatusLabel.text=No database selected
-HashDbManagementPanel.typeLabel.text=Type:
-HashDbManagementPanel.hashDbTypeLabel.text=No database selected
->>>>>>> f2892f26fb0e8e3f6774d4feb5b4731162b92db6
-HashDbAddDatabaseDialog.cancelButton.text=Cancel
-HashDbAddDatabaseDialog.okButton.text=OK
-HashDbAddDatabaseDialog.nsrlRadioButton.text=NSRL
-HashDbAddDatabaseDialog.knownBadRadioButton.text=Known Bad
-HashDbAddDatabaseDialog.databasePathTextField.text=
-HashDbAddDatabaseDialog.browseButton.text=Browse
-HashDbAddDatabaseDialog.jLabel1.text=Enter the name of the database:
-HashDbAddDatabaseDialog.databaseNameTextField.text=
-HashDbAddDatabaseDialog.jLabel2.text=Select the type of database:
-<<<<<<< HEAD
-HashDbAddDatabaseDialog.useForIngestCheckbox.text=Use during ingest
-HashDbAddDatabaseDialog.sendInboxMessagesCheckbox.text=Send messages to inbox during ingest
-=======
-HashDbAddDatabaseDialog.useForIngestCheckbox.text=Enable for ingest
-HashDbAddDatabaseDialog.sendInboxMessagesCheckbox.text=Enable sending messages to inbox during ingest
-HashDbManagementPanel.importButton.text=Import
->>>>>>> f2892f26fb0e8e3f6774d4feb5b4731162b92db6
-HashDbSearchPanel.hashTable.columnModel.title0=MD5 Hashes
-HashDbSearchPanel.hashTable.columnModel.title3=Title 4
-HashDbSearchPanel.hashTable.columnModel.title2=Title 3
-HashDbSearchPanel.hashTable.columnModel.title1=Title 2
-HashDbSearchPanel.addButton.text=Add Hash
-HashDbSearchPanel.hashField.text=
-HashDbSearchPanel.hashLabel.text=MD5 hash:
-HashDbSearchPanel.searchButton.text=Search
-HashDbSearchPanel.removeButton.text=Remove Selected
-HashDbSearchPanel.titleLabel.text=Search for files with the following MD5 hash(es):
-HashDbSearchPanel.errorField.text=Error: Not all files have been hashed.
-HashDbSearchPanel.saveBox.text=Remember Hashes
-HashDbSearchPanel.cancelButton.text=Cancel
-HashDbSimplePanel.calcHashesButton.text=Calculate hashes even if no hash database is selected
-HashDbSimplePanel.nsrlDbLabel.text=NSRL Database:
-HashDbSimplePanel.nsrlDbLabelVal.text=-
-HashDbManagementPanel.hashDbIndexStatusLabel.text=No database selected
-HashDbManagementPanel.jLabel2.text=Name:
-HashDbManagementPanel.showInboxMessagesCheckBox.text=Send messages to inbox during ingest
-HashDbManagementPanel.useForIngestCheckbox.text=Use during ingest
-HashDbManagementPanel.indexButton.text=Index
-HashDbManagementPanel.indexLabel.text=Index Status:
-HashDbManagementPanel.optionsLabel.text=Options
-HashDbManagementPanel.jLabel3.text=Information
-HashDbManagementPanel.jLabel4.text=Location:
-HashDbManagementPanel.jLabel6.text=Type:
-HashDbManagementPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
-HashDbManagementPanel.hashDbTypeLabel.text=No database selected
-HashDbManagementPanel.typeLabel.text=Type:
-HashDbManagementPanel.deleteButton.text=Delete Database
-HashDbManagementPanel.jLabel1.text=Hash Databases:
-HashDbManagementPanel.importButton.text=Import Database
-HashDbManagementPanel.hashDbNameLabel.text=No database selected
-HashDbManagementPanel.nameLabel.text=Name:
-HashDbManagementPanel.jButton3.text=Import Database
-HashDbManagementPanel.locationLabel.text=Location:
-HashDbManagementPanel.hashDbLocationLabel.text=No database selected
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form.orig b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form.orig
deleted file mode 100644
index fc1fde2a8f..0000000000
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.form.orig
+++ /dev/null
@@ -1,378 +0,0 @@
-
-
-
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java.orig b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java.orig
deleted file mode 100644
index 95725c9eae..0000000000
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManagementPanel.java.orig
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.sleuthkit.autopsy.hashdatabase;
-
-import java.awt.event.KeyEvent;
-import java.io.File;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.AbstractTableModel;
-import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
-import org.sleuthkit.datamodel.TskException;
-
-final class HashDbManagementPanel extends javax.swing.JPanel implements OptionsPanel {
-
- //private final HashDatabaseOptionsPanelController controller;
- private HashSetTableModel hashSetTableModel;
- private static final Logger logger = Logger.getLogger(HashDbManagementPanel.class.getName());
- private static boolean ingestRunning = false;
- //static HashDbManagementPanel instance;
-
- HashDbManagementPanel() {//HashDatabaseOptionsPanelController controller) {
- //this.controller = controller;
- this.hashSetTableModel = new HashSetTableModel();
- initComponents();
- customizeComponents();
- // TODO listen to changes in form fields and call controller.changed()
- }
-
- /*public static HashDbManagementPanel getDefault() {
- System.out.println("----->Hash getDefault()");
- if(instance==null) {
- System.out.println("----->Hash instance==null");
- instance = new HashDbManagementPanel();
- }
- System.out.println("----->Hash instance: " + instance);
- //JDialog display = new JDialog(new JFrame());
- //display.setResizable(true);
- //display.setTitle("Test stuff");
- //display.add(new HashDbManagementPanel(), 0);
- //display.pack();
- //display.setVisible(true);
- return new HashDbManagementPanel();
- }*/
-
- private void customizeComponents() {
- this.ingestWarningLabel.setVisible(false);
- this.hashSetTable.setModel(hashSetTableModel);
- this.hashSetTable.setTableHeader(null);
- hashSetTable.getParent().setBackground(hashSetTable.getBackground());
- hashSetTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- hashSetTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-
- @Override
- public void valueChanged(ListSelectionEvent e) {
- ListSelectionModel listSelectionModel = (ListSelectionModel) e.getSource();
- if (!listSelectionModel.isSelectionEmpty()) {
- int index = listSelectionModel.getMinSelectionIndex();
- listSelectionModel.setSelectionInterval(index, index);
- HashDbXML loader = HashDbXML.getCurrent();
- HashDb current = loader.getAllSets().get(index);
- initUI(current);
- } else {
- initUI(null);
- }
- }
- });
- }
-
- private void initUI(HashDb db) {
- boolean useForIngestEnabled = db != null && !ingestRunning;
- boolean useForIngestSelected = db != null && db.getUseForIngest();
- boolean showInboxMessagesEnabled = db != null && !ingestRunning && useForIngestSelected && db.getDbType().equals(HashDb.DBType.KNOWN_BAD);
- boolean showInboxMessagesSelected = db != null && db.getShowInboxMessages();
- boolean deleteButtonEnabled = db != null && !ingestRunning;
- boolean importButtonEnabled = !ingestRunning;
- if (db == null) {
- setButtonFromIndexStatus(this.indexButton, this.hashDbIndexStatusLabel, IndexStatus.NONE);
- this.hashDbLocationLabel.setText("No database selected");
- this.hashDbNameLabel.setText("No database selected");
- this.hashDbIndexStatusLabel.setText("No database selected");
- this.hashDbTypeLabel.setText("No database selected");
- } else {
- setButtonFromIndexStatus(this.indexButton, this.hashDbIndexStatusLabel, db.status());
- String shortenPath = db.getDatabasePaths().get(0);
- this.hashDbLocationLabel.setToolTipText(shortenPath);
- if(shortenPath.length() > 50){
- shortenPath = shortenPath.substring(0, 10 + shortenPath.substring(10).indexOf(File.separator) + 1) + "..." +
- shortenPath.substring((shortenPath.length() - 20) + shortenPath.substring(shortenPath.length() - 20).indexOf(File.separator));
- }
- this.hashDbLocationLabel.setText(shortenPath);
- this.hashDbNameLabel.setText(db.getName());
- this.hashDbTypeLabel.setText(db.getDbType().getDisplayName());
- }
- this.useForIngestCheckbox.setSelected(useForIngestSelected);
- this.useForIngestCheckbox.setEnabled(useForIngestEnabled);
- this.showInboxMessagesCheckBox.setSelected(showInboxMessagesSelected);
- this.showInboxMessagesCheckBox.setEnabled(showInboxMessagesEnabled);
- this.deleteButton.setEnabled(deleteButtonEnabled);
- this.importButton.setEnabled(importButtonEnabled);
- this.optionsLabel.setEnabled(useForIngestEnabled || showInboxMessagesEnabled);
- this.optionsSeparator.setEnabled(useForIngestEnabled || showInboxMessagesEnabled);
- }
-
- /**
- * Don't allow any changes if ingest is running
- */
- void setIngestRunning(boolean running) {
- ingestRunning = running;
- ingestWarningLabel.setVisible(running);
-
- int selection = getSelection();
- if(selection != -1) {
- initUI(HashDbXML.getCurrent().getAllSets().get(selection));
- }
- }
-
- /**
- * This method is called from within the constructor to initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is always
- * regenerated by the Form Editor.
- */
- // //GEN-BEGIN:initComponents
- private void initComponents() {
-
- jLabel2 = new javax.swing.JLabel();
- jLabel4 = new javax.swing.JLabel();
- jLabel6 = new javax.swing.JLabel();
- jButton3 = new javax.swing.JButton();
- ingestWarningLabel = new javax.swing.JLabel();
- jScrollPane1 = new javax.swing.JScrollPane();
- hashSetTable = new javax.swing.JTable();
- deleteButton = new javax.swing.JButton();
- importButton = new javax.swing.JButton();
- jLabel1 = new javax.swing.JLabel();
- nameLabel = new javax.swing.JLabel();
- hashDbNameLabel = new javax.swing.JLabel();
- hashDbLocationLabel = new javax.swing.JLabel();
- locationLabel = new javax.swing.JLabel();
- typeLabel = new javax.swing.JLabel();
- hashDbTypeLabel = new javax.swing.JLabel();
- hashDbIndexStatusLabel = new javax.swing.JLabel();
- indexLabel = new javax.swing.JLabel();
- indexButton = new javax.swing.JButton();
- useForIngestCheckbox = new javax.swing.JCheckBox();
- showInboxMessagesCheckBox = new javax.swing.JCheckBox();
- jLabel3 = new javax.swing.JLabel();
- optionsLabel = new javax.swing.JLabel();
- jSeparator1 = new javax.swing.JSeparator();
- optionsSeparator = new javax.swing.JSeparator();
-
- org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.jLabel2.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.jLabel4.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.jLabel6.text")); // NOI18N
-
- jButton3.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(jButton3, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.jButton3.text")); // NOI18N
-
- setMinimumSize(new java.awt.Dimension(385, 500));
-
- ingestWarningLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/hashdatabase/warning16.png"))); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(ingestWarningLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.ingestWarningLabel.text")); // NOI18N
-
- hashSetTable.setModel(new javax.swing.table.DefaultTableModel(
- new Object [][] {
-
- },
- new String [] {
-
- }
- ));
- hashSetTable.addKeyListener(new java.awt.event.KeyAdapter() {
- public void keyPressed(java.awt.event.KeyEvent evt) {
- hashSetTableKeyPressed(evt);
- }
- });
- jScrollPane1.setViewportView(hashSetTable);
-
- deleteButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/hashdatabase/delete16.png"))); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(deleteButton, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.deleteButton.text")); // NOI18N
- deleteButton.setMaximumSize(new java.awt.Dimension(140, 25));
- deleteButton.setMinimumSize(new java.awt.Dimension(140, 25));
- deleteButton.setPreferredSize(new java.awt.Dimension(140, 25));
- deleteButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- deleteButtonActionPerformed(evt);
- }
- });
-
- importButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/hashdatabase/import16.png"))); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(importButton, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.importButton.text")); // NOI18N
- importButton.setMaximumSize(new java.awt.Dimension(140, 25));
- importButton.setMinimumSize(new java.awt.Dimension(140, 25));
- importButton.setPreferredSize(new java.awt.Dimension(140, 25));
- importButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- importButtonActionPerformed(evt);
- }
- });
-
- org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.jLabel1.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(nameLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.nameLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(hashDbNameLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.hashDbNameLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(hashDbLocationLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.hashDbLocationLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(locationLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.locationLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(typeLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.typeLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(hashDbTypeLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.hashDbTypeLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(hashDbIndexStatusLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.hashDbIndexStatusLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(indexLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.indexLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(indexButton, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.indexButton.text")); // NOI18N
- indexButton.setEnabled(false);
- indexButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- indexButtonActionPerformed(evt);
- }
- });
-
- org.openide.awt.Mnemonics.setLocalizedText(useForIngestCheckbox, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.useForIngestCheckbox.text")); // NOI18N
- useForIngestCheckbox.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- useForIngestCheckboxActionPerformed(evt);
- }
- });
-
- org.openide.awt.Mnemonics.setLocalizedText(showInboxMessagesCheckBox, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.showInboxMessagesCheckBox.text")); // NOI18N
- showInboxMessagesCheckBox.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- showInboxMessagesCheckBoxActionPerformed(evt);
- }
- });
-
-<<<<<<< HEAD
- org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.jLabel3.text")); // NOI18N
-=======
- javax.swing.GroupLayout rightPanelLayout = new javax.swing.GroupLayout(rightPanel);
- rightPanel.setLayout(rightPanelLayout);
- rightPanelLayout.setHorizontalGroup(
- rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addComponent(nameLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(hashDbNameLabel))
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addComponent(locationLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(hashDbLocationLabel))
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addComponent(ingestRunningLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(useForIngestCheckbox))
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addComponent(typeLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(hashDbTypeLabel))
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addGap(10, 10, 10)
- .addComponent(indexButton))
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addComponent(indexLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(hashDbIndexStatusLabel)))
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addComponent(showInboxMessagesCheckBox)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 16, Short.MAX_VALUE)
- .addComponent(deleteButton)))
- .addContainerGap())
- );
- rightPanelLayout.setVerticalGroup(
- rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(rightPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(nameLabel)
- .addComponent(hashDbNameLabel))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(locationLabel)
- .addComponent(hashDbLocationLabel))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(typeLabel)
- .addComponent(hashDbTypeLabel))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(indexLabel)
- .addComponent(hashDbIndexStatusLabel))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(indexButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 138, Short.MAX_VALUE)
- .addComponent(ingestRunningLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 36, Short.MAX_VALUE)
- .addComponent(useForIngestCheckbox)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(deleteButton)
- .addComponent(showInboxMessagesCheckBox)))
- );
->>>>>>> f2892f26fb0e8e3f6774d4feb5b4731162b92db6
-
- org.openide.awt.Mnemonics.setLocalizedText(optionsLabel, org.openide.util.NbBundle.getMessage(HashDbManagementPanel.class, "HashDbManagementPanel.optionsLabel.text")); // NOI18N
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(importButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(18, 18, 18)
- .addComponent(deleteButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(layout.createSequentialGroup()
- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 298, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(18, 18, 18)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(ingestWarningLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 358, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGroup(layout.createSequentialGroup()
- .addGap(10, 10, 10)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addComponent(indexButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(nameLabel, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(locationLabel, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(typeLabel, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(indexLabel))
- .addGap(18, 18, 18)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(hashDbTypeLabel)
- .addComponent(hashDbLocationLabel)
- .addComponent(hashDbNameLabel)
- .addComponent(hashDbIndexStatusLabel)))
- .addComponent(useForIngestCheckbox)
- .addComponent(showInboxMessagesCheckBox)))
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addComponent(jLabel3)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jSeparator1))
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addComponent(optionsLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(optionsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 265, javax.swing.GroupLayout.PREFERRED_SIZE)))))
- .addComponent(jLabel1))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabel1)
- .addGap(6, 6, 6)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jLabel3)
- .addGroup(layout.createSequentialGroup()
- .addGap(8, 8, 8)
- .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 2, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addGap(7, 7, 7)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(nameLabel)
- .addComponent(hashDbNameLabel))
- .addGap(5, 5, 5)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(locationLabel)
- .addComponent(hashDbLocationLabel))
- .addGap(5, 5, 5)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(typeLabel)
- .addComponent(hashDbTypeLabel))
- .addGap(5, 5, 5)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(indexLabel)
- .addComponent(hashDbIndexStatusLabel))
- .addGap(5, 5, 5)
- .addComponent(indexButton)
- .addGap(18, 18, 18)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(optionsLabel)
- .addGroup(layout.createSequentialGroup()
- .addGap(8, 8, 8)
- .addComponent(optionsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 6, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(useForIngestCheckbox)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(showInboxMessagesCheckBox)
- .addGap(18, 18, 18)
- .addComponent(ingestWarningLabel)
- .addGap(0, 0, Short.MAX_VALUE))
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 422, Short.MAX_VALUE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(importButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(deleteButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addContainerGap())
- );
- }// //GEN-END:initComponents
-
- private void indexButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_indexButtonActionPerformed
- int selected = getSelection();
- HashDb current = HashDbXML.getCurrent().getAllSets().get(selected);
- try {
- current.createIndex();
- } catch (TskException ex) {
- logger.log(Level.WARNING, "Error creating index", ex);
- }
- setButtonFromIndexStatus(indexButton, this.hashDbIndexStatusLabel, current.status());
- }//GEN-LAST:event_indexButtonActionPerformed
-
- private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed
- if (JOptionPane.showConfirmDialog(null, "This will remove the hash database entry globally (for all Cases).",
- "Deleting a Hash Database Entry",
- JOptionPane.YES_NO_OPTION,
- JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
-
- int selected = getSelection();
- HashDbXML xmlHandle = HashDbXML.getCurrent();
- if (xmlHandle.getNSRLSet() != null) {
- if (selected == 0) {
- HashDbXML.getCurrent().removeNSRLSet();
- } else {
- HashDbXML.getCurrent().removeKnownBadSetAt(selected - 1);
- }
- } else {
- HashDbXML.getCurrent().removeKnownBadSetAt(selected);
- }
- hashSetTableModel.resync();
- }
- }//GEN-LAST:event_deleteButtonActionPerformed
-
- private void hashSetTableKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_hashSetTableKeyPressed
- if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
- int selected = getSelection();
- HashDbXML xmlHandle = HashDbXML.getCurrent();
- if (xmlHandle.getNSRLSet() != null) {
- if (selected == 0) {
- HashDbXML.getCurrent().removeNSRLSet();
- } else {
- HashDbXML.getCurrent().removeKnownBadSetAt(selected - 1);
- }
- } else {
- HashDbXML.getCurrent().removeKnownBadSetAt(selected);
- }
- }
- hashSetTableModel.resync();
- }//GEN-LAST:event_hashSetTableKeyPressed
-
- private void useForIngestCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useForIngestCheckboxActionPerformed
- int selected = getSelection();
- HashDbXML xmlHandle = HashDbXML.getCurrent();
- if (xmlHandle.getNSRLSet() != null) {
- if (selected == 0) {
- HashDb current = HashDbXML.getCurrent().getNSRLSet();
- current.setUseForIngest(useForIngestCheckbox.isSelected());
- HashDbXML.getCurrent().setNSRLSet(current);
- } else {
- HashDb current = HashDbXML.getCurrent().getKnownBadSets().remove(selected - 1);
- current.setUseForIngest(useForIngestCheckbox.isSelected());
- HashDbXML.getCurrent().addKnownBadSet(selected - 1, current);
- this.showInboxMessagesCheckBox.setEnabled(useForIngestCheckbox.isSelected());
- }
- } else {
- HashDb current = HashDbXML.getCurrent().getKnownBadSets().remove(selected);
- current.setUseForIngest(useForIngestCheckbox.isSelected());
- HashDbXML.getCurrent().addKnownBadSet(selected, current);
- this.showInboxMessagesCheckBox.setEnabled(useForIngestCheckbox.isSelected());
- }
- }//GEN-LAST:event_useForIngestCheckboxActionPerformed
-
- private void showInboxMessagesCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showInboxMessagesCheckBoxActionPerformed
- int selected = getSelection();
- HashDbXML xmlHandle = HashDbXML.getCurrent();
- if (xmlHandle.getNSRLSet() != null) {
- if (selected == 0) {
- HashDb current = HashDbXML.getCurrent().getNSRLSet();
- current.setShowInboxMessages(showInboxMessagesCheckBox.isSelected());
- HashDbXML.getCurrent().setNSRLSet(current);
- } else {
- HashDb current = HashDbXML.getCurrent().getKnownBadSets().remove(selected - 1);
- current.setShowInboxMessages(showInboxMessagesCheckBox.isSelected());
- HashDbXML.getCurrent().addKnownBadSet(selected - 1, current);
- }
- } else {
- HashDb current = HashDbXML.getCurrent().getKnownBadSets().remove(selected);
- current.setShowInboxMessages(showInboxMessagesCheckBox.isSelected());
- HashDbXML.getCurrent().addKnownBadSet(selected, current);
- }
- }//GEN-LAST:event_showInboxMessagesCheckBoxActionPerformed
-
- private void importButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importButtonActionPerformed
- importHashSet(evt);
- }//GEN-LAST:event_importButtonActionPerformed
-
- @Override
- public void load() {
- // Deselect all rows so incorrect data isn't shown
- hashSetTable.clearSelection();
- // Reload the XML so there are no 'ghost' instances of vars
- HashDbXML.getCurrent().reload();
- // Update the GUI
- initUI(null);
- }
-
- @Override
- public void store() {
- HashDbXML.getCurrent().save();
- }
-
- boolean valid() {
- // TODO check whether form is consistent and complete
- return true;
- }
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton deleteButton;
- private javax.swing.JLabel hashDbIndexStatusLabel;
- private javax.swing.JLabel hashDbLocationLabel;
- private javax.swing.JLabel hashDbNameLabel;
- private javax.swing.JLabel hashDbTypeLabel;
- private javax.swing.JTable hashSetTable;
- private javax.swing.JButton importButton;
- private javax.swing.JButton indexButton;
- private javax.swing.JLabel indexLabel;
- private javax.swing.JLabel ingestWarningLabel;
- private javax.swing.JButton jButton3;
- private javax.swing.JLabel jLabel1;
- private javax.swing.JLabel jLabel2;
- private javax.swing.JLabel jLabel3;
- private javax.swing.JLabel jLabel4;
- private javax.swing.JLabel jLabel6;
- private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JSeparator jSeparator1;
- private javax.swing.JLabel locationLabel;
- private javax.swing.JLabel nameLabel;
- private javax.swing.JLabel optionsLabel;
- private javax.swing.JSeparator optionsSeparator;
- private javax.swing.JCheckBox showInboxMessagesCheckBox;
- private javax.swing.JLabel typeLabel;
- private javax.swing.JCheckBox useForIngestCheckbox;
- // End of variables declaration//GEN-END:variables
- private void importHashSet(java.awt.event.ActionEvent evt) {
- new HashDbAddDatabaseDialog().display();
- hashSetTableModel.resync();
- /*int size = 0;
- if(!nsrl) {
- size = HashDbXML.getCurrent().getKnownBadSets().size();
- }
- setSelection(size);*/
- }
-
- private class HashSetTableModel extends AbstractTableModel {
-
- private HashDbXML xmlHandle = HashDbXML.getCurrent();
-
- @Override
- public int getColumnCount() {
- return 1;
- }
-
- @Override
- public int getRowCount() {
- return xmlHandle.getAllSets().size();
- }
-
- @Override
- public String getColumnName(int column) {
- return "Name";
- }
-
- @Override
- public Object getValueAt(int rowIndex, int columnIndex) {
- if (xmlHandle.getNSRLSet() != null) {
- if(rowIndex == 0) {
- return xmlHandle.getNSRLSet().getName() + " (NSRL)";
- } else {
- return xmlHandle.getKnownBadSets().get(rowIndex-1).getName();
- }
- } else {
- return xmlHandle.getKnownBadSets().get(rowIndex).getName();
- }
- }
-
- @Override
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- return false;
- }
-
- @Override
- public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- throw new UnsupportedOperationException("Editing of cells is not supported");
- }
-
- @Override
- public Class getColumnClass(int c) {
- return getValueAt(0, c).getClass();
- }
-
- void resync() {
- fireTableDataChanged();
- }
- }
-
- static void setButtonFromIndexStatus(JButton theButton, JLabel theLabel, IndexStatus status) {
- theLabel.setText(status.message());
- switch (status) {
- case INDEX_OUTDATED:
- theButton.setText("Re-index");
- theButton.setEnabled(true);
- break;
- case INDEX_CURRENT:
- theButton.setText("Re-index");
- theButton.setEnabled(true);
- break;
- case NO_INDEX:
- theButton.setText("Index");
- theButton.setEnabled(true);
- break;
- case INDEXING:
- theButton.setText("Indexing");
- theButton.setEnabled(false);
- break;
- default:
- theButton.setText("Index");
- theButton.setEnabled(false);
- }
- if (ingestRunning) {
- theButton.setEnabled(false);
- }
- }
-
- private int getSelection() {
- return hashSetTable.getSelectionModel().getMinSelectionIndex();
- }
-
- private void setSelection(int index) {
- if(index >= 0 && index < hashSetTable.getRowCount()) {
- hashSetTable.getSelectionModel().setSelectionInterval(index, index);
- }
- }
- void resync() {
- // TODO: call this function from property event listener
- int index = getSelection();
- this.hashSetTableModel.resync();
- setSelection(index);
- }
-}