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

Sundry cleanup.

Browse Source
This commit is contained in:
raman-bt 2013-10-17 15:35:26 -04:00
parent 09fb5edba5
commit 26fcd4b49e
5 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
View File

@ -53,20 +53,7 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
UPDATE_UI, FOCUS_NEXT UPDATE_UI, FOCUS_NEXT
}; };
static final List<String> rawExt = Arrays.asList(new String[]{".img", ".dd", ".001", ".aa", ".raw"});
static final String rawDesc = "Raw Images (*.img, *.dd, *.001, *.aa, *.raw)";
static GeneralFilter rawFilter = new GeneralFilter(rawExt, rawDesc);
static final List<String> encaseExt = Arrays.asList(new String[]{".e01"});
static final String encaseDesc = "Encase Images (*.e01)";
static GeneralFilter encaseFilter = new GeneralFilter(encaseExt, encaseDesc);
static final List<String> allExt = new ArrayList<String>();
static {
allExt.addAll(rawExt);
allExt.addAll(encaseExt);
}
static final String allDesc = "All Supported Types";
static GeneralFilter allFilter = new GeneralFilter(allExt, allDesc);
private AddImageWizardChooseDataSourcePanel wizPanel; private AddImageWizardChooseDataSourcePanel wizPanel;
private JPanel currentPanel; private JPanel currentPanel;
@ -123,6 +110,8 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
if (!datasourceProcessorsMap.containsKey(dsProcessor.getType()) ) { if (!datasourceProcessorsMap.containsKey(dsProcessor.getType()) ) {
if (!datasourceProcessorsMap.containsKey(dsProcessor.getType()) ) { if (!datasourceProcessorsMap.containsKey(dsProcessor.getType()) ) {
dsProcessor.reset();
datasourceProcessorsMap.put(dsProcessor.getType(), dsProcessor); datasourceProcessorsMap.put(dsProcessor.getType(), dsProcessor);
} }
else { else {

11
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
View File

@ -273,6 +273,17 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
// disable the cleanup task // disable the cleanup task
cleanupTask.disable(); cleanupTask.disable();
// Get attention for the process finish
java.awt.Toolkit.getDefaultToolkit().beep(); //BEEP!
AddImageWizardAddingProgressVisual panel = progressPanel.getComponent();
if (panel != null) {
Window w = SwingUtilities.getWindowAncestor(panel);
if (w != null) {
w.toFront();
}
}
//check the result and display to user //check the result and display to user
if (result == DSPCallback.DSP_Result.NO_ERRORS) if (result == DSPCallback.DSP_Result.NO_ERRORS)
progressPanel.getComponent().setProgressBarTextAndColor("*Data Source added.", 100, Color.black); progressPanel.getComponent().setProgressBarTextAndColor("*Data Source added.", 100, Color.black);

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

@ -54,7 +54,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
public ImageDSProcessor() { public ImageDSProcessor() {
logger.log(Level.INFO, "RAMAN ImageDSHandler()..."); logger.log(Level.INFO, "RAMAN ImageDSProcessor()...");
// Create the config panel // Create the config panel
imageFilePanel = ImageFilePanel.getDefault(); imageFilePanel = ImageFilePanel.getDefault();
@ -381,24 +381,6 @@ public class ImageDSProcessor implements DataSourceProcessor {
try { try {
// RAMAN TBD: this should not be happening in here - caller should do this
// Get attention for the process finish
/******
java.awt.Toolkit.getDefaultToolkit().beep(); //BEEP!
AddImageWizardAddingProgressVisual panel = progressPanel.getComponent();
if (panel != null) {
Window w = SwingUtilities.getWindowAncestor(panel);
if (w != null) {
w.toFront();
}
}
* *******/
// Tell the panel we're done // Tell the panel we're done
progressMonitor.setProgress(100); progressMonitor.setProgress(100);

4
Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.form
View File

@ -60,13 +60,13 @@
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="timeZoneLabel" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="timeZoneLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="timeZoneComboBox" alignment="3" min="-2" pref="14" max="-2" attributes="0"/> <Component id="timeZoneComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="noFatOrphansCheckbox" min="-2" max="-2" attributes="0"/> <Component id="noFatOrphansCheckbox" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="descLabel" min="-2" max="-2" attributes="0"/> <Component id="descLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="19" max="32767" attributes="0"/> <EmptySpace pref="13" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

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

@ -22,6 +22,7 @@ import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.SimpleTimeZone; import java.util.SimpleTimeZone;
@ -35,6 +36,24 @@ import javax.swing.JPanel;
* ImageTypePanel for adding an image file such as .img, .E0x, .00x, etc. * ImageTypePanel for adding an image file such as .img, .E0x, .00x, etc.
*/ */
public class ImageFilePanel extends JPanel implements DocumentListener { public class ImageFilePanel extends JPanel implements DocumentListener {
static final List<String> rawExt = Arrays.asList(new String[]{".img", ".dd", ".001", ".aa", ".raw"});
static final String rawDesc = "Raw Images (*.img, *.dd, *.001, *.aa, *.raw)";
static GeneralFilter rawFilter = new GeneralFilter(rawExt, rawDesc);
static final List<String> encaseExt = Arrays.asList(new String[]{".e01"});
static final String encaseDesc = "Encase Images (*.e01)";
static GeneralFilter encaseFilter = new GeneralFilter(encaseExt, encaseDesc);
static final List<String> allExt = new ArrayList<String>();
static {
allExt.addAll(rawExt);
allExt.addAll(encaseExt);
}
static final String allDesc = "All Supported Types";
static GeneralFilter allFilter = new GeneralFilter(allExt, allDesc);
private static ImageFilePanel instance = null; private static ImageFilePanel instance = null;
private PropertyChangeSupport pcs = null; private PropertyChangeSupport pcs = null;
private JFileChooser fc = new JFileChooser(); private JFileChooser fc = new JFileChooser();
@ -47,13 +66,11 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
fc.setDragEnabled(false); fc.setDragEnabled(false);
fc.setFileSelectionMode(JFileChooser.FILES_ONLY); fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setMultiSelectionEnabled(false); fc.setMultiSelectionEnabled(false);
fc.addChoosableFileFilter(AddImageWizardChooseDataSourceVisual.rawFilter); fc.addChoosableFileFilter(rawFilter);
fc.addChoosableFileFilter(AddImageWizardChooseDataSourceVisual.encaseFilter); fc.addChoosableFileFilter(encaseFilter);
fc.setFileFilter(AddImageWizardChooseDataSourceVisual.allFilter); fc.setFileFilter(allFilter);
createTimeZoneList(); createTimeZoneList();
noFatOrphansCheckbox.setEnabled(true);
} }
/** /**
@ -148,12 +165,12 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(timeZoneLabel) .addComponent(timeZoneLabel)
.addComponent(timeZoneComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(timeZoneComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(noFatOrphansCheckbox) .addComponent(noFatOrphansCheckbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(descLabel) .addComponent(descLabel)
.addContainerGap(19, Short.MAX_VALUE)) .addContainerGap(13, Short.MAX_VALUE))
); );
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@ -213,7 +230,11 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
} }
public void reset() { public void reset() {
//nothing to reset //reset the UI elements to default
pathTextField.setText(null);
} }
/** /**