diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java index fddd47272a..2517a61fb8 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java @@ -89,9 +89,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements public void performAction() { if (popUpWindow == null) { - String curCaseDisplayName = Case.getCurrentCase().getDisplayName(); - // TODO: replace with caseUUID once it is implemented - String curCaseUUID = curCaseDisplayName; + String curCaseUUID = Case.getCurrentCase().getName(); // create the popUp window for it String title = Bundle.EnterpriseArtifactManagerCaseEditDetails_window_title(); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java index d7eab67f14..ce1834ea66 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java @@ -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. * * @param eamArtifact The artifact to correlate against diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java index cdc835bca2..9aa7eb2d1c 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java @@ -153,8 +153,9 @@ public class PostgresEamDb extends AbstractSqlEamDb { createOrganizationsTable.append("poc_phone character varying(20) NOT NULL"); createOrganizationsTable.append(")"); - // TODO: The organizations will only have a small number of rows, so - // determine if an index is worthwhile. + // NOTE: The organizations will only have a small number of rows, so + // an index is probably not worthwhile. + StringBuilder createCasesTable = new StringBuilder(); createCasesTable.append("CREATE TABLE IF NOT EXISTS cases ("); createCasesTable.append("id SERIAL PRIMARY KEY,"); @@ -170,7 +171,7 @@ public class PostgresEamDb extends AbstractSqlEamDb { createCasesTable.append("foreign key (org_id) references organizations(id) on update set null on delete set null"); createCasesTable.append(")"); - // TODO: when there are few cases in the cases table, these indices may not be worthwhile + // NOTE: when there are few cases in the cases table, these indices may not be worthwhile String casesIdx1 = "CREATE INDEX IF NOT EXISTS cases_org_id ON cases (org_id)"; String casesIdx2 = "CREATE INDEX IF NOT EXISTS cases_case_uid ON cases (case_uid)"; @@ -251,8 +252,8 @@ public class PostgresEamDb extends AbstractSqlEamDb { // NOTE: the db_info table currenly only has 1 row, so having an index // provides no benefit. - Connection conn = null; + Connection conn = null; try { conn = connectionPool.getConnection(); Statement stmt = conn.createStatement(); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java index ed8d117a19..9a2ffb85bd 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java @@ -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 */ - private void verifyCDBDirectory() throws EamDbException { + private void verifyDBDirectory() throws EamDbException { File dbDir = new File(dbSettings.getDbDirectory()); if (!dbDir.exists()) { LOGGER.log(Level.INFO, "sqlite directory does not exist, creating it at {0}.", dbSettings.getDbDirectory()); // NON-NLS @@ -177,8 +177,9 @@ public class SqliteEamDb extends AbstractSqlEamDb { createOrganizationsTable.append("poc_phone character varying(20) NOT NULL"); createOrganizationsTable.append(")"); - // TODO: The organizations will only have a small number of rows, so - // determine if an index is worthwhile. + // NOTE: The organizations will only have a small number of rows, so + // an index is probably not worthwhile. + StringBuilder createCasesTable = new StringBuilder(); createCasesTable.append("CREATE TABLE IF NOT EXISTS cases ("); createCasesTable.append("id integer primary key autoincrement NOT NULL,"); @@ -195,7 +196,7 @@ public class SqliteEamDb extends AbstractSqlEamDb { createCasesTable.append("CONSTRAINT case_uid_unique UNIQUE(case_uid)"); createCasesTable.append(")"); - // TODO: when there are few cases in the cases table, these indices may not be worthwhile + // NOTE: when there are few cases in the cases table, these indices may not be worthwhile String casesIdx1 = "CREATE INDEX IF NOT EXISTS cases_org_id ON cases (org_id)"; String casesIdx2 = "CREATE INDEX IF NOT EXISTS cases_case_uid ON cases (case_uid)"; @@ -276,6 +277,7 @@ public class SqliteEamDb extends AbstractSqlEamDb { // NOTE: the db_info table currenly only has 1 row, so having an index // provides no benefit. + Connection conn = null; try { conn = connectionPool.getConnection(); @@ -339,7 +341,7 @@ public class SqliteEamDb extends AbstractSqlEamDb { } if (connectionPool == null) { - verifyCDBDirectory(); + verifyDBDirectory(); setupConnectionPool(); confirmDatabaseSchema(); } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java index 2168c72e72..9a73466f9d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java @@ -40,7 +40,7 @@ public final class SqliteEamDbSettings { private final static Logger LOGGER = Logger.getLogger(SqliteEamDbSettings.class.getName()); 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 String DEFAULT_BAD_TAGS = "Evidence"; // NON-NLS private final String JDBC_DRIVER = "org.sqlite.JDBC"; // NON-NLS diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java index f65e5747ce..fbe02008bf 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java @@ -37,9 +37,6 @@ public class Installer extends ModuleInstall { @Override public void restored() { - // TODO: Setup the default config settings here - // something like EnterpriseArtifactManagerSettings.setDefaults(); - Case.addPropertyChangeListener(pcl); ieListener.installListeners(); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java index 7e9a90386f..2cd75657d1 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java @@ -95,7 +95,7 @@ class IngestModule implements FileIngestModule { 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) { // query db for artifact instances having this MD5 and knownStatus = "Bad". try { @@ -122,7 +122,6 @@ class IngestModule implements FileIngestModule { } try { - // TODO: add the actual device once it is implemented in Autopsy. EamArtifactInstance cefi = new EamArtifactInstance( eamCase, eamDataSource, @@ -194,7 +193,7 @@ class IngestModule implements FileIngestModule { // and image exist in the DB before we associate artifacts with it. if (refCounter.incrementAndGet(jobId) == 1) { - // ensure we have this data source in the CDB + // ensure we have this data source in the EAM DB try { if (null == dbManager.getDataSourceDetails(eamDataSource.getDeviceID())) { dbManager.newDataSource(eamDataSource); @@ -204,7 +203,7 @@ class IngestModule implements FileIngestModule { 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; Case curCase = Case.getCurrentCase(); EamCase curCeCase = new EamCase( diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamGlobalSettingsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamGlobalSettingsPanel.java index 723a28daf4..5a50a0e08d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamGlobalSettingsPanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamGlobalSettingsPanel.java @@ -1,7 +1,7 @@ /* - * Autopsy Forensic Browser + * Enterprise Artifact Manager * - * Copyright 2013-2016 Basis Technology Corp. + * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamImportDatabaseDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamImportDatabaseDialog.java index 4d77371ea0..b3110af79d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamImportDatabaseDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamImportDatabaseDialog.java @@ -1,7 +1,7 @@ /* - * Autopsy Forensic Browser + * Enterprise Artifact Manager * - * Copyright 2011 - 2013 Basis Technology Corp. + * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamManageTagDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamManageTagDialog.java index 5cb7786eee..b1280f24d8 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamManageTagDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamManageTagDialog.java @@ -1,7 +1,7 @@ /* - * Autopsy Forensic Browser + * Enterprise Artifact Manager * - * Copyright 2011 - 2013 Basis Technology Corp. + * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java index 05e2ce03cf..32842b5e2e 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java @@ -1,7 +1,7 @@ /* - * Autopsy Forensic Browser + * Enterprise Artifact Manager * - * Copyright 2013-2014 Basis Technology Corp. + * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java index bdeb79c0c7..614e1905d7 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java @@ -91,7 +91,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { bnTestDatabase.setEnabled(false); } - @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=CDB Database File"}) + @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"}) private void customizeFileChooser() { fcDatabasePath.setDragEnabled(false); fcDatabasePath.setFileSelectionMode(JFileChooser.FILES_ONLY); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamTypesSelectionDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamTypesSelectionDialog.java index 1cb119c414..6fe3b770dd 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamTypesSelectionDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamTypesSelectionDialog.java @@ -1,7 +1,7 @@ /* - * Autopsy Forensic Browser + * Enterprise Artifact Manager * - * Copyright 2011 - 2013 Basis Technology Corp. + * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License");