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

Merge branch 'develop' of github.com:sleuthkit/autopsy into develop

Browse Source
This commit is contained in:
Richard Cordovano 2017-03-23 00:22:55 -04:00
commit 7aebdfcaff
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardSelectDspVisual.java
View File

@ -37,6 +37,7 @@ import javax.swing.JPanel;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import javax.swing.JToggleButton; import javax.swing.JToggleButton;
import org.openide.util.Lookup; import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor; import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
import org.sleuthkit.autopsy.datasourceprocessors.RawDSProcessor; import org.sleuthkit.autopsy.datasourceprocessors.RawDSProcessor;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
@ -56,8 +57,11 @@ final class AddImageWizardSelectDspVisual extends JPanel {
AddImageWizardSelectDspVisual(String lastDspUsed) { AddImageWizardSelectDspVisual(String lastDspUsed) {
initComponents(); initComponents();
selectedDsp = lastDspUsed; selectedDsp = lastDspUsed;
//if the last selected DSP was the Local Disk DSP and it would be disabled then we want to select a different DSP
if ((Case.getCurrentCase().getCaseType() == Case.CaseType.MULTI_USER_CASE) && selectedDsp.equals(LocalDiskDSProcessor.getType())) {
selectedDsp = ImageDSProcessor.getType();
}
createDataSourceProcessorButtons(); createDataSourceProcessorButtons();
//add actionlistner to listen for change //add actionlistner to listen for change
} }
@ -87,6 +91,7 @@ final class AddImageWizardSelectDspVisual extends JPanel {
return selectedDsp; return selectedDsp;
} }
@NbBundle.Messages("AddImageWizardSelectDspVisual.multiUserWarning.text=This type of Data Source Processor is not available in multi-user mode")
/** /**
* Create the a button for each DataSourceProcessor that should exist as an * Create the a button for each DataSourceProcessor that should exist as an
* option. * option.
@ -110,6 +115,7 @@ final class AddImageWizardSelectDspVisual extends JPanel {
constraints.anchor = GridBagConstraints.LINE_START; constraints.anchor = GridBagConstraints.LINE_START;
Dimension spacerBlockDimension = new Dimension(6, 4); // Space between left edge and button, Space between rows Dimension spacerBlockDimension = new Dimension(6, 4); // Space between left edge and button, Space between rows
for (String dspType : dspList) { for (String dspType : dspList) {
boolean shouldAddMultiUserWarning = false;
constraints.weightx = 1; constraints.weightx = 1;
//Add a spacer //Add a spacer
Filler spacer = new Filler(spacerBlockDimension, spacerBlockDimension, spacerBlockDimension); Filler spacer = new Filler(spacerBlockDimension, spacerBlockDimension, spacerBlockDimension);
@ -120,6 +126,11 @@ final class AddImageWizardSelectDspVisual extends JPanel {
//Add the button //Add the button
JToggleButton dspButton = createDspButton(dspType); JToggleButton dspButton = createDspButton(dspType);
dspButton.addActionListener(cbActionListener); dspButton.addActionListener(cbActionListener);
if ((Case.getCurrentCase().getCaseType() == Case.CaseType.MULTI_USER_CASE) && dspType.equals(LocalDiskDSProcessor.getType())){
dspButton.setEnabled(false); //disable the button for local disk DSP when this is a multi user case
dspButton.setSelected(false);
shouldAddMultiUserWarning = true;
}
jPanel1.add(dspButton); jPanel1.add(dspButton);
buttonGroup1.add(dspButton); buttonGroup1.add(dspButton);
gridBagLayout.setConstraints(dspButton, constraints); gridBagLayout.setConstraints(dspButton, constraints);
@ -130,7 +141,14 @@ final class AddImageWizardSelectDspVisual extends JPanel {
jPanel1.add(buttonTextSpacer); jPanel1.add(buttonTextSpacer);
constraints.gridx++; constraints.gridx++;
//Add the text area serving as a label to the right of the button //Add the text area serving as a label to the right of the button
JTextArea myLabel = new JTextArea(dspType);
JTextArea myLabel = new JTextArea();
if (shouldAddMultiUserWarning) {
myLabel.setText(dspType + " - " + NbBundle.getMessage(this.getClass(), "AddImageWizardSelectDspVisual.multiUserWarning.text"));
myLabel.setEnabled(false); //gray out the text
} else {
myLabel.setText(dspType);
}
myLabel.setBackground(new Color(240, 240, 240));//matches background of panel myLabel.setBackground(new Color(240, 240, 240));//matches background of panel
myLabel.setEditable(false); myLabel.setEditable(false);
myLabel.setWrapStyleWord(true); myLabel.setWrapStyleWord(true);
@ -169,12 +187,7 @@ final class AddImageWizardSelectDspVisual extends JPanel {
} }
} }
dspList.add(ImageDSProcessor.getType()); dspList.add(ImageDSProcessor.getType());
if (Case.getCurrentCase().getCaseType() != Case.CaseType.MULTI_USER_CASE) { dspList.add(LocalDiskDSProcessor.getType());
dspList.add(LocalDiskDSProcessor.getType());
} else {
// remove LocalDiskDSProcessor from list of DSPs
datasourceProcessorsMap.remove(LocalDiskDSProcessor.getType());
}
dspList.add(LocalFilesDSProcessor.getType()); dspList.add(LocalFilesDSProcessor.getType());
dspList.add(RawDSProcessor.getType()); dspList.add(RawDSProcessor.getType());
// now add any addtional DSPs that haven't already been added // now add any addtional DSPs that haven't already been added

2
Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
View File

@ -241,4 +241,4 @@ CasePropertiesPanel.lbDbType.text=Case Type:
CasePropertiesPanel.examinerLabel.text=Examiner: CasePropertiesPanel.examinerLabel.text=Examiner:
CasePropertiesPanel.caseNumberLabel.text=Case Number: CasePropertiesPanel.caseNumberLabel.text=Case Number:
CasePropertiesPanel.deleteCaseButton.text=Delete Case CasePropertiesPanel.deleteCaseButton.text=Delete Case
LocalDiskPanel.changeDatabasePathCheckbox.text=Change image path in the case to the VHD upon completion LocalDiskPanel.changeDatabasePathCheckbox.text=Update case to use VHD file upon completion