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

2774 Notes association corrected to be with case not examiner in names and comments

Browse Source
This commit is contained in:
William Schaefer 2017-10-20 11:32:18 -04:00
parent b2383a38a1
commit 64c7af5a84
14 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -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() { public String getCaseNotes() {
return metadata.getExaminerNotes(); return metadata.getCaseNotes();
} }
/** /**

14
Core/src/org/sleuthkit/autopsy/casemodule/CaseDetails.java
View File

@ -29,15 +29,15 @@ final class CaseDetails {
private final String examinerName; private final String examinerName;
private final String examinerPhone; private final String examinerPhone;
private final String examinerEmail; 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; caseDisplayName = displayName;
caseNumber = number; caseNumber = number;
examinerName = exName; examinerName = exName;
examinerPhone = exPhone; examinerPhone = exPhone;
examinerEmail = exEmail; 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() { String getCaseNotes() {
return examinerNotes; return caseNotes;
} }
} }

37
Core/src/org/sleuthkit/autopsy/casemodule/CaseMetadata.java
View File

@ -66,9 +66,6 @@ public final class CaseMetadata {
private final static String CASE_NAME_ELEMENT_NAME = "Name"; //NON-NLS 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 CASE_NUMBER_ELEMENT_NAME = "Number"; //NON-NLS
private final static String EXAMINER_ELEMENT_NAME = "Examiner"; //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_TYPE_ELEMENT_NAME = "CaseType"; //NON-NLS
private final static String CASE_DATABASE_NAME_ELEMENT_NAME = "DatabaseName"; //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 private final static String TEXT_INDEX_NAME_ELEMENT = "TextIndexName"; //NON-NLS
@ -84,17 +81,24 @@ public final class CaseMetadata {
/* /*
* Fields from schema version 3 * 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_DISPLAY_NAME_ELEMENT_NAME = "DisplayName"; //NON-NLS
private final static String CASE_DB_NAME_RELATIVE_ELEMENT_NAME = "CaseDatabase"; //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. * Unread fields, regenerated on save.
*/ */
private final static String MODIFIED_DATE_ELEMENT_NAME = "ModifiedDate"; //NON-NLS 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 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 final Path metadataFilePath;
private Case.CaseType caseType; private Case.CaseType caseType;
@ -199,17 +203,16 @@ public final class CaseMetadata {
return caseDetails.getCaseDisplayName(); return caseDetails.getCaseDisplayName();
} }
void setCaseDetails(CaseDetails newCaseDetails) throws CaseMetadataException{ void setCaseDetails(CaseDetails newCaseDetails) throws CaseMetadataException {
CaseDetails oldCaseDetails = this.caseDetails; CaseDetails oldCaseDetails = this.caseDetails;
this.caseDetails = newCaseDetails; this.caseDetails = newCaseDetails;
try { try {
writeToFile(); writeToFile();
} catch (CaseMetadataException ex) { } catch (CaseMetadataException ex) {
this.caseDetails = oldCaseDetails; this.caseDetails = oldCaseDetails;
throw ex; throw ex;
} }
} }
/** /**
* Gets the case number. * Gets the case number.
@ -232,13 +235,13 @@ public final class CaseMetadata {
public String getExaminerPhone() { public String getExaminerPhone() {
return caseDetails.getExaminerPhone(); return caseDetails.getExaminerPhone();
} }
public String getExaminerEmail() { public String getExaminerEmail() {
return caseDetails.getExaminerEmail(); return caseDetails.getExaminerEmail();
} }
public String getExaminerNotes() { public String getCaseNotes() {
return caseDetails.getExaminerNotes(); return caseDetails.getCaseNotes();
} }
/** /**
@ -399,7 +402,7 @@ public final class CaseMetadata {
createChildElement(doc, caseElement, EXAMINER_ELEMENT_NAME, caseDetails.getExaminerName()); createChildElement(doc, caseElement, EXAMINER_ELEMENT_NAME, caseDetails.getExaminerName());
createChildElement(doc, caseElement, EXAMINER_ELEMENT_PHONE, caseDetails.getExaminerPhone()); createChildElement(doc, caseElement, EXAMINER_ELEMENT_PHONE, caseDetails.getExaminerPhone());
createChildElement(doc, caseElement, EXAMINER_ELEMENT_EMAIL, caseDetails.getExaminerEmail()); 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_TYPE_ELEMENT_NAME, caseType.toString());
createChildElement(doc, caseElement, CASE_DB_ABSOLUTE_PATH_ELEMENT_NAME, caseDatabasePath); createChildElement(doc, caseElement, CASE_DB_ABSOLUTE_PATH_ELEMENT_NAME, caseDatabasePath);
createChildElement(doc, caseElement, CASE_DB_NAME_RELATIVE_ELEMENT_NAME, caseDatabaseName); 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 examinerName = getElementTextContent(caseElement, EXAMINER_ELEMENT_NAME, false);
String examinerPhone; String examinerPhone;
String examinerEmail; String examinerEmail;
String examinerNotes; String caseNotes;
try { try {
examinerPhone = getElementTextContent(caseElement, EXAMINER_ELEMENT_PHONE, false); examinerPhone = getElementTextContent(caseElement, EXAMINER_ELEMENT_PHONE, false);
examinerEmail = getElementTextContent(caseElement, EXAMINER_ELEMENT_EMAIL, 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) { } catch (CaseMetadataException ex) {
examinerPhone = ""; //case had metadata file written before additional examiner details were included examinerPhone = ""; //case had metadata file written before additional examiner details were included
examinerEmail = ""; 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)); this.caseType = Case.CaseType.fromString(getElementTextContent(caseElement, CASE_TYPE_ELEMENT_NAME, true));
if (null == this.caseType) { if (null == this.caseType) {
throw new CaseMetadataException("Case metadata file corrupted"); throw new CaseMetadataException("Case metadata file corrupted");

6
Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.form
View File

@ -387,7 +387,7 @@
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="lbExaminerPhoneText" max="32767" attributes="0"/> <Component id="lbExaminerPhoneText" max="32767" attributes="0"/>
<Component id="examinerNotesScrollPane" pref="411" max="32767" attributes="0"/> <Component id="caseNotesScrollPane" pref="411" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
@ -427,7 +427,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="lbNotesLabel" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="lbNotesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="examinerNotesScrollPane" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="caseNotesScrollPane" alignment="0" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/> <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
</Group> </Group>
@ -475,7 +475,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Container class="javax.swing.JScrollPane" name="examinerNotesScrollPane"> <Container class="javax.swing.JScrollPane" name="caseNotesScrollPane">
<Properties> <Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="null"/> <Border info="null"/>

15
Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.java
View File

@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.casemodule;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.logging.Level; import java.util.logging.Level;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb; import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
@ -56,7 +55,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
lbExaminerNameText.setText(theCase.getExaminer()); lbExaminerNameText.setText(theCase.getExaminer());
lbExaminerPhoneText.setText(theCase.getExaminerPhone()); lbExaminerPhoneText.setText(theCase.getExaminerPhone());
lbExaminerEmailText.setText(theCase.getExaminerEmail()); lbExaminerEmailText.setText(theCase.getExaminerEmail());
taNotesText.setText(theCase.getExaminerNotes()); taNotesText.setText(theCase.getCaseNotes());
crDateField.setText(theCase.getCreatedDate()); crDateField.setText(theCase.getCreatedDate());
caseDirField.setText(theCase.getCaseDirectory()); caseDirField.setText(theCase.getCaseDirectory());
if (Case.CaseType.SINGLE_USER_CASE == theCase.getCaseType()) { if (Case.CaseType.SINGLE_USER_CASE == theCase.getCaseType()) {
@ -161,7 +160,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
lbExaminerNameText = new javax.swing.JLabel(); lbExaminerNameText = new javax.swing.JLabel();
lbNotesLabel = new javax.swing.JLabel(); lbNotesLabel = new javax.swing.JLabel();
examinerLabel = new javax.swing.JLabel(); examinerLabel = new javax.swing.JLabel();
examinerNotesScrollPane = new javax.swing.JScrollPane(); caseNotesScrollPane = new javax.swing.JScrollPane();
taNotesText = new javax.swing.JTextArea(); taNotesText = new javax.swing.JTextArea();
lbExaminerEmailLabel = new javax.swing.JLabel(); lbExaminerEmailLabel = new javax.swing.JLabel();
lbExaminerPhoneLabel = 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.setMinimumSize(new java.awt.Dimension(82, 14));
examinerLabel.setPreferredSize(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.setBackground(new java.awt.Color(240, 240, 240));
taNotesText.setColumns(20); taNotesText.setColumns(20);
@ -323,7 +322,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
taNotesText.setRows(2); taNotesText.setRows(2);
taNotesText.setWrapStyleWord(true); taNotesText.setWrapStyleWord(true);
taNotesText.setBorder(null); taNotesText.setBorder(null);
examinerNotesScrollPane.setViewportView(taNotesText); caseNotesScrollPane.setViewportView(taNotesText);
lbExaminerEmailLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesPanel.class, "CasePropertiesPanel.lbExaminerEmailLabel.text")); // NOI18N lbExaminerEmailLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesPanel.class, "CasePropertiesPanel.lbExaminerEmailLabel.text")); // NOI18N
lbExaminerEmailLabel.setMaximumSize(new java.awt.Dimension(82, 14)); 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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbExaminerPhoneText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .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(javax.swing.GroupLayout.Alignment.TRAILING, examinerPanelLayout.createSequentialGroup()
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(lbExaminerEmailLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .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(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)) .addGap(6, 6, 6))
); );
@ -492,6 +491,7 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
private javax.swing.JLabel caseDirField; private javax.swing.JLabel caseDirField;
private javax.swing.JLabel caseDirLabel; private javax.swing.JLabel caseDirLabel;
private javax.swing.JLabel caseNameLabel; private javax.swing.JLabel caseNameLabel;
private javax.swing.JScrollPane caseNotesScrollPane;
private javax.swing.JLabel caseNumberLabel; private javax.swing.JLabel caseNumberLabel;
private javax.swing.JPanel casePanel; private javax.swing.JPanel casePanel;
private javax.swing.JLabel caseTypeField; private javax.swing.JLabel caseTypeField;
@ -500,7 +500,6 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
private javax.swing.JLabel dbNameField; private javax.swing.JLabel dbNameField;
private javax.swing.JPanel detailsPanel; private javax.swing.JPanel detailsPanel;
private javax.swing.JLabel examinerLabel; private javax.swing.JLabel examinerLabel;
private javax.swing.JScrollPane examinerNotesScrollPane;
private javax.swing.JPanel examinerPanel; private javax.swing.JPanel examinerPanel;
private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTextArea jTextArea1; private javax.swing.JTextArea jTextArea1;

8
Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
View File

@ -88,8 +88,8 @@ final class NewCaseVisualPanel2 extends javax.swing.JPanel {
return propertiesPanel.getExaminerEmail(); return propertiesPanel.getExaminerEmail();
} }
String getExaminerNotes() { String getCaseNotes() {
return propertiesPanel.getExaminerNotes(); return propertiesPanel.getCaseNotes();
} }
String getOrganization() { String getOrganization() {
@ -112,8 +112,8 @@ final class NewCaseVisualPanel2 extends javax.swing.JPanel {
propertiesPanel.setExaminerEmailField(examinerEmail); propertiesPanel.setExaminerEmailField(examinerEmail);
} }
void setExaminerNotes(String examinerNotes) { void setCaseNotes(String caseNotes) {
propertiesPanel.setExaminerNotesField(examinerNotes); propertiesPanel.setCaseNotesField(caseNotes);
} }
void setOrganization(String organizationName) { void setOrganization(String organizationName) {

4
Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
View File

@ -82,12 +82,12 @@ final class NewCaseWizardAction extends CallableSystemAction {
String examinerName = (String) wizardDescriptor.getProperty("caseExaminerName"); //NON-NLS String examinerName = (String) wizardDescriptor.getProperty("caseExaminerName"); //NON-NLS
String examinerPhone = (String) wizardDescriptor.getProperty("caseExaminerPhone"); //NON-NLS String examinerPhone = (String) wizardDescriptor.getProperty("caseExaminerPhone"); //NON-NLS
String examinerEmail = (String) wizardDescriptor.getProperty("caseExaminerEmail"); //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 String organizationName = (String) wizardDescriptor.getProperty("caseOrganization"); //NON-NLS
final String caseName = (String) wizardDescriptor.getProperty("caseName"); //NON-NLS final String caseName = (String) wizardDescriptor.getProperty("caseName"); //NON-NLS
String createdDirectory = (String) wizardDescriptor.getProperty("createdDirectory"); //NON-NLS String createdDirectory = (String) wizardDescriptor.getProperty("createdDirectory"); //NON-NLS
CaseType caseType = CaseType.values()[(int) wizardDescriptor.getProperty("caseType")]; //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 if (EamDb.isEnabled()) { //if the eam is enabled we need to save the case organization information now
try { try {
EamDb dbManager = EamDb.getInstance(); EamDb dbManager = EamDb.getInstance();

10
Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
View File

@ -42,7 +42,7 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
private static final String PROP_EXAMINER_NAME = "LBL_EXAMINER_NAME"; //NON-NLS private static final String PROP_EXAMINER_NAME = "LBL_EXAMINER_NAME"; //NON-NLS
private static final String PROP_EXAMINER_PHONE = "LBL_EXAMINER_PHONE"; //NON-NLS private static final String PROP_EXAMINER_PHONE = "LBL_EXAMINER_PHONE"; //NON-NLS
private static final String PROP_EXAMINER_EMAIL = "LBL_EXAMINER_EMAIL"; //NON-NLS private static final String PROP_EXAMINER_EMAIL = "LBL_EXAMINER_EMAIL"; //NON-NLS
private static final String PROP_EXAMINER_NOTES = "LBL_EXAMINER_NOTES"; //NON-NLS private static final String PROP_CASE_NOTES = "LBL_CASE_NOTES"; //NON-NLS
private static final String PROP_ORGANIZATION_NAME = "LBL_ORGANIZATION_NAME"; //NON-NLS private static final String PROP_ORGANIZATION_NAME = "LBL_ORGANIZATION_NAME"; //NON-NLS
private NewCaseVisualPanel2 component; private NewCaseVisualPanel2 component;
private final Set<ChangeListener> listeners = new HashSet<>(1); private final Set<ChangeListener> listeners = new HashSet<>(1);
@ -142,12 +142,12 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
String lastExaminerName = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_NAME); String lastExaminerName = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_NAME);
String lastExaminerPhone = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_PHONE); String lastExaminerPhone = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_PHONE);
String lastExaminerEmail = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_EMAIL); String lastExaminerEmail = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_EMAIL);
String lastExaminerNotes = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_NOTES); String lastCaseNotes = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_CASE_NOTES);
String lastOrganizationName = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_ORGANIZATION_NAME); String lastOrganizationName = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_ORGANIZATION_NAME);
panel.setExaminerName(lastExaminerName); panel.setExaminerName(lastExaminerName);
panel.setExaminerPhone(lastExaminerPhone); panel.setExaminerPhone(lastExaminerPhone);
panel.setExaminerEmail(lastExaminerEmail); panel.setExaminerEmail(lastExaminerEmail);
panel.setExaminerNotes(lastExaminerNotes); panel.setCaseNotes(lastCaseNotes);
panel.setOrganization(EamDb.isEnabled() ? lastOrganizationName : ""); panel.setOrganization(EamDb.isEnabled() ? lastOrganizationName : "");
panel.setCaseNumber(""); //clear the number field panel.setCaseNumber(""); //clear the number field
} catch (Exception e) { } catch (Exception e) {
@ -173,8 +173,8 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_PHONE, component.getExaminerPhone()); ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_PHONE, component.getExaminerPhone());
settings.putProperty("caseExaminerEmail", component.getExaminerEmail()); //NON-NLS settings.putProperty("caseExaminerEmail", component.getExaminerEmail()); //NON-NLS
ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_EMAIL, component.getExaminerEmail()); ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_EMAIL, component.getExaminerEmail());
settings.putProperty("caseExaminerNotes", component.getExaminerNotes()); //NON-NLS settings.putProperty("caseNotes", component.getCaseNotes()); //NON-NLS
ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_EXAMINER_NOTES, component.getExaminerNotes()); ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_CASE_NOTES, component.getCaseNotes());
settings.putProperty("caseOrganization", component.getOrganization()); //NON-NLS settings.putProperty("caseOrganization", component.getOrganization()); //NON-NLS
ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_ORGANIZATION_NAME, component.getOrganization()); ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_ORGANIZATION_NAME, component.getOrganization());
} }

6
Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.form
View File

@ -177,7 +177,7 @@
</Group> </Group>
<EmptySpace min="-2" pref="10" max="-2" attributes="0"/> <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="examinerNotesScrollPane" max="32767" attributes="0"/> <Component id="caseNotesScrollPane" max="32767" attributes="0"/>
<Component id="tfExaminerPhoneText" max="32767" attributes="0"/> <Component id="tfExaminerPhoneText" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
@ -218,7 +218,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="lbNotesLabel" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="lbNotesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="examinerNotesScrollPane" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="caseNotesScrollPane" alignment="0" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/> <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
</Group> </Group>
@ -244,7 +244,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Container class="javax.swing.JScrollPane" name="examinerNotesScrollPane"> <Container class="javax.swing.JScrollPane" name="caseNotesScrollPane">
<Properties> <Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo"> <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">

20
Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
View File

@ -66,7 +66,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
examinerTextField.setText(Case.getCurrentCase().getExaminer()); examinerTextField.setText(Case.getCurrentCase().getExaminer());
tfExaminerEmailText.setText(Case.getCurrentCase().getExaminerEmail()); tfExaminerEmailText.setText(Case.getCurrentCase().getExaminerEmail());
tfExaminerPhoneText.setText(Case.getCurrentCase().getExaminerPhone()); tfExaminerPhoneText.setText(Case.getCurrentCase().getExaminerPhone());
taNotesText.setText(Case.getCurrentCase().getExaminerNotes()); taNotesText.setText(Case.getCurrentCase().getCaseNotes());
setUpCentralRepoFields(); setUpCentralRepoFields();
setUpOrganizationData(); setUpOrganizationData();
} else { } else {
@ -159,7 +159,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
return tfExaminerEmailText.getText(); return tfExaminerEmailText.getText();
} }
String getExaminerNotes() { String getCaseNotes() {
return taNotesText.getText(); return taNotesText.getText();
} }
@ -187,8 +187,8 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
tfExaminerEmailText.setText(examinerEmail == null ? "" : examinerEmail); tfExaminerEmailText.setText(examinerEmail == null ? "" : examinerEmail);
} }
void setExaminerNotesField(String examinerNotes) { void setCaseNotesField(String caseNotes) {
taNotesText.setText(examinerNotes == null ? "" : examinerNotes); taNotesText.setText(caseNotes == null ? "" : caseNotes);
} }
@Messages({"OptionalCasePropertiesPanel.caseDisplayNameLabel.text=Name:", @Messages({"OptionalCasePropertiesPanel.caseDisplayNameLabel.text=Name:",
@ -223,7 +223,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
examinerPanel = new javax.swing.JPanel(); examinerPanel = new javax.swing.JPanel();
tfExaminerPhoneText = new javax.swing.JTextField(); tfExaminerPhoneText = new javax.swing.JTextField();
lbExaminerPhoneLabel = new javax.swing.JLabel(); lbExaminerPhoneLabel = new javax.swing.JLabel();
examinerNotesScrollPane = new javax.swing.JScrollPane(); caseNotesScrollPane = new javax.swing.JScrollPane();
taNotesText = new javax.swing.JTextArea(); taNotesText = new javax.swing.JTextArea();
tfExaminerEmailText = new javax.swing.JTextField(); tfExaminerEmailText = new javax.swing.JTextField();
examinerTextField = 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.setMinimumSize(new java.awt.Dimension(41, 14));
lbExaminerPhoneLabel.setPreferredSize(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.setColumns(20);
taNotesText.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N 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.setRows(2);
taNotesText.setWrapStyleWord(true); taNotesText.setWrapStyleWord(true);
taNotesText.setBorder(null); taNotesText.setBorder(null);
examinerNotesScrollPane.setViewportView(taNotesText); caseNotesScrollPane.setViewportView(taNotesText);
examinerTextField.setFont(examinerTextField.getFont().deriveFont(examinerTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); 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)) .addComponent(lbExaminerPhoneLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(10, 10, 10) .addGap(10, 10, 10)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(examinerNotesScrollPane) .addComponent(caseNotesScrollPane)
.addComponent(tfExaminerPhoneText))) .addComponent(tfExaminerPhoneText)))
.addGroup(examinerPanelLayout.createSequentialGroup() .addGroup(examinerPanelLayout.createSequentialGroup()
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(examinerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .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(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)) .addGap(6, 6, 6))
); );
@ -583,12 +583,12 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
private javax.swing.JButton bnNewOrganization; private javax.swing.JButton bnNewOrganization;
private javax.swing.JLabel caseDisplayNameLabel; private javax.swing.JLabel caseDisplayNameLabel;
private javax.swing.JTextField caseDisplayNameTextField; private javax.swing.JTextField caseDisplayNameTextField;
private javax.swing.JScrollPane caseNotesScrollPane;
private javax.swing.JLabel caseNumberLabel; private javax.swing.JLabel caseNumberLabel;
private javax.swing.JTextField caseNumberTextField; private javax.swing.JTextField caseNumberTextField;
private javax.swing.JPanel casePanel; private javax.swing.JPanel casePanel;
private javax.swing.JComboBox<String> comboBoxOrgName; private javax.swing.JComboBox<String> comboBoxOrgName;
private javax.swing.JLabel examinerLabel; private javax.swing.JLabel examinerLabel;
private javax.swing.JScrollPane examinerNotesScrollPane;
private javax.swing.JPanel examinerPanel; private javax.swing.JPanel examinerPanel;
private javax.swing.JTextField examinerTextField; private javax.swing.JTextField examinerTextField;
private javax.swing.JLabel lbExaminerEmailLabel; private javax.swing.JLabel lbExaminerEmailLabel;

2
Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
View File

@ -207,7 +207,7 @@ public class SingleUserCaseConverter {
oldCaseMetadata.getExaminer(), oldCaseMetadata.getExaminer(),
oldCaseMetadata.getExaminerPhone(), oldCaseMetadata.getExaminerPhone(),
oldCaseMetadata.getExaminerEmail(), oldCaseMetadata.getExaminerEmail(),
oldCaseMetadata.getExaminerNotes())); oldCaseMetadata.getCaseNotes()));
newCaseMetadata.setCaseDatabaseName(dbName); newCaseMetadata.setCaseDatabaseName(dbName);
// Set created date. This calls writefile, no need to call it again // Set created date. This calls writefile, no need to call it again
newCaseMetadata.setCreatedDate(oldCaseMetadata.getCreatedDate()); newCaseMetadata.setCreatedDate(oldCaseMetadata.getCreatedDate());

2
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
View File

@ -277,7 +277,7 @@ public abstract class AbstractSqlEamDb implements EamDb {
autopsyCase.getExaminer(), autopsyCase.getExaminer(),
autopsyCase.getExaminerEmail(), autopsyCase.getExaminerEmail(),
autopsyCase.getExaminerPhone(), autopsyCase.getExaminerPhone(),
autopsyCase.getExaminerNotes()); autopsyCase.getCaseNotes());
newCase(curCeCase); newCase(curCeCase);
return curCeCase; return curCeCase;
} }

2
Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
View File

@ -294,7 +294,7 @@ public class CaseEventListener implements PropertyChangeListener {
curCase.getExaminer(), curCase.getExaminer(),
curCase.getExaminerEmail(), curCase.getExaminerEmail(),
curCase.getExaminerPhone(), curCase.getExaminerPhone(),
curCase.getExaminerNotes()); curCase.getCaseNotes());
if (!EamDb.isEnabled()) { if (!EamDb.isEnabled()) {
break; break;

2
Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
View File

@ -243,7 +243,7 @@ class IngestModule implements FileIngestModule {
curCase.getExaminer(), curCase.getExaminer(),
curCase.getExaminerEmail(), curCase.getExaminerEmail(),
curCase.getExaminerPhone(), curCase.getExaminerPhone(),
curCase.getExaminerNotes()); curCase.getCaseNotes());
try { try {
dbManager.newCase(curCeCase); dbManager.newCase(curCeCase);
eamCase = dbManager.getCaseByUUID(curCase.getName()); eamCase = dbManager.getCaseByUUID(curCase.getName());