Use display name for hash sets

This commit is contained in:
Ann Priestman 2017-11-03 15:11:20 -04:00
parent b51ec98837
commit 978a81b29c
4 changed files with 6 additions and 6 deletions

View File

@ -109,7 +109,7 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter
final List<HashDatabase> hashDatabases = HashDbManager.getInstance().getUpdateableHashDatabases();
if (!hashDatabases.isEmpty()) {
for (final HashDatabase database : hashDatabases) {
JMenuItem databaseItem = add(database.getHashSetName());
JMenuItem databaseItem = add(database.getDisplayName());
databaseItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {

View File

@ -51,7 +51,7 @@ public class AddHashValuesToDatabaseDialog extends javax.swing.JDialog {
*/
AddHashValuesToDatabaseDialog(HashDatabase hashDb) {
super((JFrame) WindowManager.getDefault().getMainWindow(),
NbBundle.getMessage(AddHashValuesToDatabaseDialog.class, "AddHashValuesToDatabaseDialog.JDialog.Title", hashDb.getHashSetName()),
NbBundle.getMessage(AddHashValuesToDatabaseDialog.class, "AddHashValuesToDatabaseDialog.JDialog.Title", hashDb.getDisplayName()),
true);
this.hashDb = hashDb;
initComponents();

View File

@ -135,7 +135,7 @@ public class HashDbIngestModule implements FileIngestModule {
enabledHashSets.add(db);
}
} catch (TskCoreException ex) {
logger.log(Level.WARNING, "Error getting index status for " + db.getHashSetName() + " hash database", ex); //NON-NLS
logger.log(Level.WARNING, "Error getting index status for " + db.getDisplayName()+ " hash database", ex); //NON-NLS
}
}
}
@ -218,7 +218,7 @@ public class HashDbIngestModule implements FileIngestModule {
name)));
ret = ProcessResult.ERROR;
}
String hashSetName = db.getHashSetName();
String hashSetName = db.getDisplayName();
String comment = "";
ArrayList<String> comments = hashInfo.getComments();
@ -385,7 +385,7 @@ public class HashDbIngestModule implements FileIngestModule {
.append(NbBundle.getMessage(HashDbIngestModule.class, "HashDbIngestModule.complete.databasesUsed"))
.append("</p>\n<ul>"); //NON-NLS
for (HashDatabase db : knownBadHashSets) {
detailsSb.append("<li>").append(db.getHashSetName()).append("</li>\n"); //NON-NLS
detailsSb.append("<li>").append(db.getDisplayName()).append("</li>\n"); //NON-NLS
}
detailsSb.append("</ul>"); //NON-NLS

View File

@ -1449,7 +1449,7 @@ public class HashDbManager implements PropertyChangeListener {
@Override
public String toString(){
return getHashSetName();
return getDisplayName();
}