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

Merge branch 'release-4.4.1' of github.com:sleuthkit/autopsy into ivy-deps

Browse Source
This commit is contained in:
Nick Davis 2017-06-21 13:20:42 -04:00
commit 9ed3883965
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.java
View File

@ -119,8 +119,11 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog {
orgs = dbManager.getOrganizations(); orgs = dbManager.getOrganizations();
orgs.forEach((org) -> { orgs.forEach((org) -> {
comboboxSourceOrganization.addItem(org.getName()); comboboxSourceOrganization.addItem(org.getName());
selectedOrg = orgs.get(0);
}); });
if (!orgs.isEmpty()) {
selectedOrg = orgs.get(0);
}
valid();
} catch (EamDbException ex) { } catch (EamDbException ex) {
LOGGER.log(Level.SEVERE, "Failure populating combobox with organizations.", ex); LOGGER.log(Level.SEVERE, "Failure populating combobox with organizations.", ex);
} }
@ -183,7 +186,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog {
return false; return false;
} }
return enableOkButton(checkFields()); return enableOkButton(checkFields() && null != selectedOrg);
} }
/** /**
@ -545,6 +548,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog {
return; return;
} }
} }
valid();
}//GEN-LAST:event_comboboxSourceOrganizationActionPerformed }//GEN-LAST:event_comboboxSourceOrganizationActionPerformed
@NbBundle.Messages({"ImportHashDatabaseDialog.ImportHashDatabaseWorker.displayName=Importing Hash Database"}) @NbBundle.Messages({"ImportHashDatabaseDialog.ImportHashDatabaseWorker.displayName=Importing Hash Database"})