corrected usage of 'CDB' to new name.

This commit is contained in:
Nick Davis 2017-06-12 10:30:43 -04:00
parent 2a90475cf6
commit 2727a43c9e
5 changed files with 9 additions and 9 deletions

View File

@ -445,7 +445,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
} }
/** /**
* Query the CDB for artifact instances from other cases correlated to the * Query the db for artifact instances from other cases correlated to the
* given enterprise artifact manager artifact. * given enterprise artifact manager artifact.
* *
* @param eamArtifact The artifact to correlate against * @param eamArtifact The artifact to correlate against

View File

@ -131,11 +131,11 @@ public class SqliteEamDb extends AbstractSqlEamDb {
} }
/** /**
* Verify the CDB directory exists. If it doesn't, then create it. * Verify the EAM db directory exists. If it doesn't, then create it.
* *
* @throws EamDbException * @throws EamDbException
*/ */
private void verifyCDBDirectory() throws EamDbException { private void verifyDBDirectory() throws EamDbException {
File dbDir = new File(dbSettings.getDbDirectory()); File dbDir = new File(dbSettings.getDbDirectory());
if (!dbDir.exists()) { if (!dbDir.exists()) {
LOGGER.log(Level.INFO, "sqlite directory does not exist, creating it at {0}.", dbSettings.getDbDirectory()); // NON-NLS LOGGER.log(Level.INFO, "sqlite directory does not exist, creating it at {0}.", dbSettings.getDbDirectory()); // NON-NLS
@ -339,7 +339,7 @@ public class SqliteEamDb extends AbstractSqlEamDb {
} }
if (connectionPool == null) { if (connectionPool == null) {
verifyCDBDirectory(); verifyDBDirectory();
setupConnectionPool(); setupConnectionPool();
confirmDatabaseSchema(); confirmDatabaseSchema();
} }

View File

@ -40,7 +40,7 @@ public final class SqliteEamDbSettings {
private final static Logger LOGGER = Logger.getLogger(SqliteEamDbSettings.class.getName()); private final static Logger LOGGER = Logger.getLogger(SqliteEamDbSettings.class.getName());
private final String DEFAULT_DBNAME = "enterpriseartifactmanagerdb.db"; // NON-NLS private final String DEFAULT_DBNAME = "enterpriseartifactmanagerdb.db"; // NON-NLS
private final String DEFAULT_DBDIRECTORY = System.getProperty("user.home") + File.separator + "Autopsy" + File.separator + "cdb"; // NON-NLS private final String DEFAULT_DBDIRECTORY = System.getProperty("user.home") + File.separator + "Autopsy" + File.separator + "eamdb"; // NON-NLS
private final int DEFAULT_BULK_THRESHHOLD = 1000; private final int DEFAULT_BULK_THRESHHOLD = 1000;
private final String DEFAULT_BAD_TAGS = "Evidence"; // NON-NLS private final String DEFAULT_BAD_TAGS = "Evidence"; // NON-NLS
private final String JDBC_DRIVER = "org.sqlite.JDBC"; // NON-NLS private final String JDBC_DRIVER = "org.sqlite.JDBC"; // NON-NLS

View File

@ -95,7 +95,7 @@ class IngestModule implements FileIngestModule {
EamArtifact eamArtifact = new EamArtifact(filesType, md5); EamArtifact eamArtifact = new EamArtifact(filesType, md5);
// If unknown to both the hash module and as a globally known artifact in the CDB, correlate to other cases // If unknown to both the hash module and as a globally known artifact in the EAM DB, correlate to other cases
if (af.getKnown() == TskData.FileKnown.UNKNOWN) { if (af.getKnown() == TskData.FileKnown.UNKNOWN) {
// query db for artifact instances having this MD5 and knownStatus = "Bad". // query db for artifact instances having this MD5 and knownStatus = "Bad".
try { try {
@ -194,7 +194,7 @@ class IngestModule implements FileIngestModule {
// and image exist in the DB before we associate artifacts with it. // and image exist in the DB before we associate artifacts with it.
if (refCounter.incrementAndGet(jobId) if (refCounter.incrementAndGet(jobId)
== 1) { == 1) {
// ensure we have this data source in the CDB // ensure we have this data source in the EAM DB
try { try {
if (null == dbManager.getDataSourceDetails(eamDataSource.getDeviceID())) { if (null == dbManager.getDataSourceDetails(eamDataSource.getDeviceID())) {
dbManager.newDataSource(eamDataSource); dbManager.newDataSource(eamDataSource);
@ -204,7 +204,7 @@ class IngestModule implements FileIngestModule {
throw new IngestModuleException("Error creating new data source in startUp.", ex); // NON-NLS throw new IngestModuleException("Error creating new data source in startUp.", ex); // NON-NLS
} }
// ensure we have this case defined in the CDB // ensure we have this case defined in the EAM DB
EamCase existingCase; EamCase existingCase;
Case curCase = Case.getCurrentCase(); Case curCase = Case.getCurrentCase();
EamCase curCeCase = new EamCase( EamCase curCeCase = new EamCase(

View File

@ -91,7 +91,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
bnTestDatabase.setEnabled(false); bnTestDatabase.setEnabled(false);
} }
@Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=CDB Database File"}) @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"})
private void customizeFileChooser() { private void customizeFileChooser() {
fcDatabasePath.setDragEnabled(false); fcDatabasePath.setDragEnabled(false);
fcDatabasePath.setFileSelectionMode(JFileChooser.FILES_ONLY); fcDatabasePath.setFileSelectionMode(JFileChooser.FILES_ONLY);