mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 11:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

HashDb: Corrected enabling of Known radio buttons and provided for refresh of simple config after advanced config

Browse Source
This commit is contained in:
Richard Cordovano 2013-11-15 10:48:59 -05:00
parent a76c6111e3
commit 7ea6b661ad
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
View File

@ -153,7 +153,6 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbCreateDatabaseDialog.knownRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbCreateDatabaseDialog.knownRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="knownRadioButtonActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="knownRadioButtonActionPerformed"/>

1
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
View File

@ -132,7 +132,6 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
buttonGroup1.add(knownRadioButton); buttonGroup1.add(knownRadioButton);
org.openide.awt.Mnemonics.setLocalizedText(knownRadioButton, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.knownRadioButton.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(knownRadioButton, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.knownRadioButton.text")); // NOI18N
knownRadioButton.setEnabled(false);
knownRadioButton.addActionListener(new java.awt.event.ActionListener() { knownRadioButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
knownRadioButtonActionPerformed(evt); knownRadioButtonActionPerformed(evt);

25
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
View File

@ -49,7 +49,8 @@ public class HashDbIngestModule extends IngestModuleAbstractFile {
public final static String MODULE_DESCRIPTION = "Identifies known and notables files using supplied hash databases, such as a standard NSRL database."; public final static String MODULE_DESCRIPTION = "Identifies known and notables files using supplied hash databases, such as a standard NSRL database.";
final public static String MODULE_VERSION = Version.getVersion(); final public static String MODULE_VERSION = Version.getVersion();
private static final Logger logger = Logger.getLogger(HashDbIngestModule.class.getName()); private static final Logger logger = Logger.getLogger(HashDbIngestModule.class.getName());
private HashDbConfigPanel panel; private HashDbSimpleConfigPanel simpleConfigPanel;
private HashDbConfigPanel advancedConfigPanel;
private IngestServices services; private IngestServices services;
private SleuthkitCase skCase; private SleuthkitCase skCase;
private static int messageId = 0; private static int messageId = 0;
@ -93,7 +94,11 @@ public class HashDbIngestModule extends IngestModuleAbstractFile {
@Override @Override
public javax.swing.JPanel getSimpleConfiguration(String context) { public javax.swing.JPanel getSimpleConfiguration(String context) {
return new HashDbSimpleConfigPanel(); if (simpleConfigPanel == null) {
simpleConfigPanel = new HashDbSimpleConfigPanel();
}
return simpleConfigPanel;
} }
@Override @Override
@ -108,18 +113,22 @@ public class HashDbIngestModule extends IngestModuleAbstractFile {
@Override @Override
public javax.swing.JPanel getAdvancedConfiguration(String context) { public javax.swing.JPanel getAdvancedConfiguration(String context) {
if (panel == null) { if (advancedConfigPanel == null) {
panel = new HashDbConfigPanel(); advancedConfigPanel = new HashDbConfigPanel();
} }
panel.load(); advancedConfigPanel.load();
return panel; return advancedConfigPanel;
} }
@Override @Override
public void saveAdvancedConfiguration() { public void saveAdvancedConfiguration() {
if (panel != null) { if (advancedConfigPanel != null) {
panel.store(); advancedConfigPanel.store();
}
if (simpleConfigPanel != null) {
simpleConfigPanel.refreshComponents();
} }
} }

6
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimpleConfigPanel.java
View File

@ -79,9 +79,10 @@ public class HashDbSimpleConfigPanel extends javax.swing.JPanel {
} }
} }
private void refreshComponents() { public void refreshComponents() {
refreshAlwaysCalcHashesComponents(); knownTableModel.refresh();
knownBadTableModel.refresh(); knownBadTableModel.refresh();
refreshAlwaysCalcHashesComponents();
} }
private void refreshAlwaysCalcHashesComponents() { private void refreshAlwaysCalcHashesComponents() {
@ -164,7 +165,6 @@ public class HashDbSimpleConfigPanel extends javax.swing.JPanel {
else { else {
JOptionPane.showMessageDialog(HashDbSimpleConfigPanel.this, "Hash databases must be indexed before they can be used for ingest"); JOptionPane.showMessageDialog(HashDbSimpleConfigPanel.this, "Hash databases must be indexed before they can be used for ingest");
} }
refreshComponents();
} }
} }