diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 29b0718139..e3d1171c91 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -1209,12 +1209,12 @@ public class Case {
}
/**
- * Gets the examiner notes.
+ * Gets the case notes.
*
- * @return The examiner notes.
+ * @return The case notes.
*/
- public String getExaminerNotes() {
- return metadata.getExaminerNotes();
+ public String getCaseNotes() {
+ return metadata.getCaseNotes();
}
/**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDetails.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDetails.java
index 2ea2639b8d..c462288315 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDetails.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDetails.java
@@ -29,15 +29,15 @@ final class CaseDetails {
private final String examinerName;
private final String examinerPhone;
private final String examinerEmail;
- private final String examinerNotes;
+ private final String caseNotes;
- CaseDetails(String displayName, String number, String exName, String exPhone, String exEmail, String exNotes) {
+ CaseDetails(String displayName, String number, String exName, String exPhone, String exEmail, String notes) {
caseDisplayName = displayName;
caseNumber = number;
examinerName = exName;
examinerPhone = exPhone;
examinerEmail = exEmail;
- examinerNotes = exNotes;
+ caseNotes = notes;
}
/**
@@ -84,11 +84,11 @@ final class CaseDetails {
}
/**
- * Get the examiner notes
+ * Get the case notes
*
- * @return notes - the note asssociated with the examiner
+ * @return notes - the note asssociated with the case
*/
- String getExaminerNotes() {
- return examinerNotes;
+ String getCaseNotes() {
+ return caseNotes;
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
index 0755caa08f..0ce3629a70 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
@@ -66,9 +66,6 @@ public final class CaseMetadata {
private final static String CASE_NAME_ELEMENT_NAME = "Name"; //NON-NLS
private final static String CASE_NUMBER_ELEMENT_NAME = "Number"; //NON-NLS
private final static String EXAMINER_ELEMENT_NAME = "Examiner"; //NON-NLS
- private final static String EXAMINER_ELEMENT_PHONE = "ExaminerPhone"; //NON-NLS
- private final static String EXAMINER_ELEMENT_EMAIL = "ExaminerEmail"; //NON-NLS
- private final static String EXAMINER_ELEMENT_NOTES = "ExaminerNotes"; //NON-NLS
private final static String CASE_TYPE_ELEMENT_NAME = "CaseType"; //NON-NLS
private final static String CASE_DATABASE_NAME_ELEMENT_NAME = "DatabaseName"; //NON-NLS
private final static String TEXT_INDEX_NAME_ELEMENT = "TextIndexName"; //NON-NLS
@@ -84,17 +81,24 @@ public final class CaseMetadata {
/*
* Fields from schema version 3
*/
- private static final String SCHEMA_VERSION_THREE = "3.0";
+ private static final String SCHEMA_VERSION_THREE = "3.0";
private final static String CASE_DISPLAY_NAME_ELEMENT_NAME = "DisplayName"; //NON-NLS
private final static String CASE_DB_NAME_RELATIVE_ELEMENT_NAME = "CaseDatabase"; //NON-NLS
+ /*
+ * Fields from schema version 4
+ */
+ private static final String SCHEMA_VERSION_FOUR = "4.0";
+ private final static String EXAMINER_ELEMENT_PHONE = "ExaminerPhone"; //NON-NLS
+ private final static String EXAMINER_ELEMENT_EMAIL = "ExaminerEmail"; //NON-NLS
+ private final static String CASE_ELEMENT_NOTES = "CaseNotes"; //NON-NLS
/*
* Unread fields, regenerated on save.
*/
private final static String MODIFIED_DATE_ELEMENT_NAME = "ModifiedDate"; //NON-NLS
private final static String AUTOPSY_SAVED_BY_ELEMENT_NAME = "SavedByAutopsyVersion"; //NON-NLS
- private final static String CURRENT_SCHEMA_VERSION = SCHEMA_VERSION_THREE;
+ private final static String CURRENT_SCHEMA_VERSION = SCHEMA_VERSION_FOUR;
private final Path metadataFilePath;
private Case.CaseType caseType;
@@ -199,17 +203,16 @@ public final class CaseMetadata {
return caseDetails.getCaseDisplayName();
}
- void setCaseDetails(CaseDetails newCaseDetails) throws CaseMetadataException{
+ void setCaseDetails(CaseDetails newCaseDetails) throws CaseMetadataException {
CaseDetails oldCaseDetails = this.caseDetails;
this.caseDetails = newCaseDetails;
try {
- writeToFile();
+ writeToFile();
} catch (CaseMetadataException ex) {
this.caseDetails = oldCaseDetails;
throw ex;
}
}
-
/**
* Gets the case number.
@@ -232,13 +235,13 @@ public final class CaseMetadata {
public String getExaminerPhone() {
return caseDetails.getExaminerPhone();
}
-
+
public String getExaminerEmail() {
return caseDetails.getExaminerEmail();
}
-
- public String getExaminerNotes() {
- return caseDetails.getExaminerNotes();
+
+ public String getCaseNotes() {
+ return caseDetails.getCaseNotes();
}
/**
@@ -399,7 +402,7 @@ public final class CaseMetadata {
createChildElement(doc, caseElement, EXAMINER_ELEMENT_NAME, caseDetails.getExaminerName());
createChildElement(doc, caseElement, EXAMINER_ELEMENT_PHONE, caseDetails.getExaminerPhone());
createChildElement(doc, caseElement, EXAMINER_ELEMENT_EMAIL, caseDetails.getExaminerEmail());
- createChildElement(doc, caseElement, EXAMINER_ELEMENT_NOTES, caseDetails.getExaminerNotes());
+ createChildElement(doc, caseElement, CASE_ELEMENT_NOTES, caseDetails.getCaseNotes());
createChildElement(doc, caseElement, CASE_TYPE_ELEMENT_NAME, caseType.toString());
createChildElement(doc, caseElement, CASE_DB_ABSOLUTE_PATH_ELEMENT_NAME, caseDatabasePath);
createChildElement(doc, caseElement, CASE_DB_NAME_RELATIVE_ELEMENT_NAME, caseDatabaseName);
@@ -471,17 +474,17 @@ public final class CaseMetadata {
String examinerName = getElementTextContent(caseElement, EXAMINER_ELEMENT_NAME, false);
String examinerPhone;
String examinerEmail;
- String examinerNotes;
+ String caseNotes;
try {
examinerPhone = getElementTextContent(caseElement, EXAMINER_ELEMENT_PHONE, false);
examinerEmail = getElementTextContent(caseElement, EXAMINER_ELEMENT_EMAIL, false);
- examinerNotes = getElementTextContent(caseElement, EXAMINER_ELEMENT_NOTES, false);
+ caseNotes = getElementTextContent(caseElement, CASE_ELEMENT_NOTES, false);
} catch (CaseMetadataException ex) {
examinerPhone = ""; //case had metadata file written before additional examiner details were included
examinerEmail = "";
- examinerNotes = "";
+ caseNotes = "";
}
- this.caseDetails = new CaseDetails(caseDisplayName, caseNumber, examinerName, examinerPhone, examinerEmail, examinerNotes);
+ this.caseDetails = new CaseDetails(caseDisplayName, caseNumber, examinerName, examinerPhone, examinerEmail, caseNotes);
this.caseType = Case.CaseType.fromString(getElementTextContent(caseElement, CASE_TYPE_ELEMENT_NAME, true));
if (null == this.caseType) {
throw new CaseMetadataException("Case metadata file corrupted");
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.form
index c2be91ec45..9d9c3caa11 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.form
@@ -387,7 +387,7 @@
-
+
@@ -427,7 +427,7 @@
-
+
@@ -475,7 +475,7 @@
-
+
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.java
index f2ade38fe4..4dd71cd473 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.casemodule;
import java.nio.file.Paths;
import java.util.logging.Level;
-import org.openide.util.Exceptions;
import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
@@ -56,7 +55,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
lbExaminerNameText.setText(theCase.getExaminer());
lbExaminerPhoneText.setText(theCase.getExaminerPhone());
lbExaminerEmailText.setText(theCase.getExaminerEmail());
- taNotesText.setText(theCase.getExaminerNotes());
+ taNotesText.setText(theCase.getCaseNotes());
crDateField.setText(theCase.getCreatedDate());
caseDirField.setText(theCase.getCaseDirectory());
if (Case.CaseType.SINGLE_USER_CASE == theCase.getCaseType()) {
@@ -161,7 +160,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
lbExaminerNameText = new javax.swing.JLabel();
lbNotesLabel = new javax.swing.JLabel();
examinerLabel = new javax.swing.JLabel();
- examinerNotesScrollPane = new javax.swing.JScrollPane();
+ caseNotesScrollPane = new javax.swing.JScrollPane();
taNotesText = new javax.swing.JTextArea();
lbExaminerEmailLabel = new javax.swing.JLabel();
lbExaminerPhoneLabel = new javax.swing.JLabel();
@@ -314,7 +313,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
examinerLabel.setMinimumSize(new java.awt.Dimension(82, 14));
examinerLabel.setPreferredSize(new java.awt.Dimension(82, 14));
- examinerNotesScrollPane.setBorder(null);
+ caseNotesScrollPane.setBorder(null);
taNotesText.setBackground(new java.awt.Color(240, 240, 240));
taNotesText.setColumns(20);
@@ -323,7 +322,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
taNotesText.setRows(2);
taNotesText.setWrapStyleWord(true);
taNotesText.setBorder(null);
- examinerNotesScrollPane.setViewportView(taNotesText);
+ caseNotesScrollPane.setViewportView(taNotesText);
lbExaminerEmailLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesPanel.class, "CasePropertiesPanel.lbExaminerEmailLabel.text")); // NOI18N
lbExaminerEmailLabel.setMaximumSize(new java.awt.Dimension(82, 14));
@@ -349,7 +348,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbExaminerPhoneText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(examinerNotesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 411, Short.MAX_VALUE)))
+ .addComponent(caseNotesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 411, Short.MAX_VALUE)))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, examinerPanelLayout.createSequentialGroup()
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(lbExaminerEmailLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -378,7 +377,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbNotesLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(examinerNotesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(caseNotesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(6, 6, 6))
);
@@ -492,6 +491,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
private javax.swing.JLabel caseDirField;
private javax.swing.JLabel caseDirLabel;
private javax.swing.JLabel caseNameLabel;
+ private javax.swing.JScrollPane caseNotesScrollPane;
private javax.swing.JLabel caseNumberLabel;
private javax.swing.JPanel casePanel;
private javax.swing.JLabel caseTypeField;
@@ -500,7 +500,6 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
private javax.swing.JLabel dbNameField;
private javax.swing.JPanel detailsPanel;
private javax.swing.JLabel examinerLabel;
- private javax.swing.JScrollPane examinerNotesScrollPane;
private javax.swing.JPanel examinerPanel;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTextArea jTextArea1;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
index ef2ce512c1..467142daa2 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
@@ -88,8 +88,8 @@ final class NewCaseVisualPanel2 extends javax.swing.JPanel {
return propertiesPanel.getExaminerEmail();
}
- String getExaminerNotes() {
- return propertiesPanel.getExaminerNotes();
+ String getCaseNotes() {
+ return propertiesPanel.getCaseNotes();
}
String getOrganization() {
@@ -112,8 +112,8 @@ final class NewCaseVisualPanel2 extends javax.swing.JPanel {
propertiesPanel.setExaminerEmailField(examinerEmail);
}
- void setExaminerNotes(String examinerNotes) {
- propertiesPanel.setExaminerNotesField(examinerNotes);
+ void setCaseNotes(String caseNotes) {
+ propertiesPanel.setCaseNotesField(caseNotes);
}
void setOrganization(String organizationName) {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
index 99845f6e48..15193ab2cf 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
@@ -82,12 +82,12 @@ final class NewCaseWizardAction extends CallableSystemAction {
String examinerName = (String) wizardDescriptor.getProperty("caseExaminerName"); //NON-NLS
String examinerPhone = (String) wizardDescriptor.getProperty("caseExaminerPhone"); //NON-NLS
String examinerEmail = (String) wizardDescriptor.getProperty("caseExaminerEmail"); //NON-NLS
- String examinerNotes = (String) wizardDescriptor.getProperty("caseExaminerNotes"); //NON-NLS
+ String caseNotes = (String) wizardDescriptor.getProperty("caseNotes"); //NON-NLS
String organizationName = (String) wizardDescriptor.getProperty("caseOrganization"); //NON-NLS
final String caseName = (String) wizardDescriptor.getProperty("caseName"); //NON-NLS
String createdDirectory = (String) wizardDescriptor.getProperty("createdDirectory"); //NON-NLS
CaseType caseType = CaseType.values()[(int) wizardDescriptor.getProperty("caseType")]; //NON-NLS
- Case.createAsCurrentCase(createdDirectory, new CaseDetails(caseName, caseNumber, examinerName, examinerPhone, examinerEmail, examinerNotes), caseType);
+ Case.createAsCurrentCase(createdDirectory, new CaseDetails(caseName, caseNumber, examinerName, examinerPhone, examinerEmail, caseNotes), caseType);
if (EamDb.isEnabled()) { //if the eam is enabled we need to save the case organization information now
try {
EamDb dbManager = EamDb.getInstance();
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
index 5a1e96f0b6..61aefc8f22 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
@@ -42,7 +42,7 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel listeners = new HashSet<>(1);
@@ -142,12 +142,12 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel
-
+
@@ -218,7 +218,7 @@
-
+
@@ -244,7 +244,7 @@
-
+
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
index a04ea27bdd..141f076888 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
@@ -66,7 +66,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
examinerTextField.setText(Case.getCurrentCase().getExaminer());
tfExaminerEmailText.setText(Case.getCurrentCase().getExaminerEmail());
tfExaminerPhoneText.setText(Case.getCurrentCase().getExaminerPhone());
- taNotesText.setText(Case.getCurrentCase().getExaminerNotes());
+ taNotesText.setText(Case.getCurrentCase().getCaseNotes());
setUpCentralRepoFields();
setUpOrganizationData();
} else {
@@ -159,7 +159,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
return tfExaminerEmailText.getText();
}
- String getExaminerNotes() {
+ String getCaseNotes() {
return taNotesText.getText();
}
@@ -187,8 +187,8 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
tfExaminerEmailText.setText(examinerEmail == null ? "" : examinerEmail);
}
- void setExaminerNotesField(String examinerNotes) {
- taNotesText.setText(examinerNotes == null ? "" : examinerNotes);
+ void setCaseNotesField(String caseNotes) {
+ taNotesText.setText(caseNotes == null ? "" : caseNotes);
}
@Messages({"OptionalCasePropertiesPanel.caseDisplayNameLabel.text=Name:",
@@ -223,7 +223,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
examinerPanel = new javax.swing.JPanel();
tfExaminerPhoneText = new javax.swing.JTextField();
lbExaminerPhoneLabel = new javax.swing.JLabel();
- examinerNotesScrollPane = new javax.swing.JScrollPane();
+ caseNotesScrollPane = new javax.swing.JScrollPane();
taNotesText = new javax.swing.JTextArea();
tfExaminerEmailText = new javax.swing.JTextField();
examinerTextField = new javax.swing.JTextField();
@@ -296,7 +296,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
lbExaminerPhoneLabel.setMinimumSize(new java.awt.Dimension(41, 14));
lbExaminerPhoneLabel.setPreferredSize(new java.awt.Dimension(41, 14));
- examinerNotesScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+ caseNotesScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder());
taNotesText.setColumns(20);
taNotesText.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
@@ -304,7 +304,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
taNotesText.setRows(2);
taNotesText.setWrapStyleWord(true);
taNotesText.setBorder(null);
- examinerNotesScrollPane.setViewportView(taNotesText);
+ caseNotesScrollPane.setViewportView(taNotesText);
examinerTextField.setFont(examinerTextField.getFont().deriveFont(examinerTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
@@ -337,7 +337,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
.addComponent(lbExaminerPhoneLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(10, 10, 10)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(examinerNotesScrollPane)
+ .addComponent(caseNotesScrollPane)
.addComponent(tfExaminerPhoneText)))
.addGroup(examinerPanelLayout.createSequentialGroup()
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
@@ -367,7 +367,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbNotesLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(examinerNotesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(caseNotesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(6, 6, 6))
);
@@ -583,12 +583,12 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
private javax.swing.JButton bnNewOrganization;
private javax.swing.JLabel caseDisplayNameLabel;
private javax.swing.JTextField caseDisplayNameTextField;
+ private javax.swing.JScrollPane caseNotesScrollPane;
private javax.swing.JLabel caseNumberLabel;
private javax.swing.JTextField caseNumberTextField;
private javax.swing.JPanel casePanel;
private javax.swing.JComboBox comboBoxOrgName;
private javax.swing.JLabel examinerLabel;
- private javax.swing.JScrollPane examinerNotesScrollPane;
private javax.swing.JPanel examinerPanel;
private javax.swing.JTextField examinerTextField;
private javax.swing.JLabel lbExaminerEmailLabel;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
index b256897c05..8529ea5261 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
@@ -207,7 +207,7 @@ public class SingleUserCaseConverter {
oldCaseMetadata.getExaminer(),
oldCaseMetadata.getExaminerPhone(),
oldCaseMetadata.getExaminerEmail(),
- oldCaseMetadata.getExaminerNotes()));
+ oldCaseMetadata.getCaseNotes()));
newCaseMetadata.setCaseDatabaseName(dbName);
// Set created date. This calls writefile, no need to call it again
newCaseMetadata.setCreatedDate(oldCaseMetadata.getCreatedDate());
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
index 97d18af6a8..b16589c3dd 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
@@ -277,7 +277,7 @@ public abstract class AbstractSqlEamDb implements EamDb {
autopsyCase.getExaminer(),
autopsyCase.getExaminerEmail(),
autopsyCase.getExaminerPhone(),
- autopsyCase.getExaminerNotes());
+ autopsyCase.getCaseNotes());
newCase(curCeCase);
return curCeCase;
}
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
index 2785bd6bfb..c849bcf7de 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
@@ -294,7 +294,7 @@ public class CaseEventListener implements PropertyChangeListener {
curCase.getExaminer(),
curCase.getExaminerEmail(),
curCase.getExaminerPhone(),
- curCase.getExaminerNotes());
+ curCase.getCaseNotes());
if (!EamDb.isEnabled()) {
break;
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
index 5c61ef74d8..31d989d74a 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
@@ -243,7 +243,7 @@ class IngestModule implements FileIngestModule {
curCase.getExaminer(),
curCase.getExaminerEmail(),
curCase.getExaminerPhone(),
- curCase.getExaminerNotes());
+ curCase.getCaseNotes());
try {
dbManager.newCase(curCeCase);
eamCase = dbManager.getCaseByUUID(curCase.getName());