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

Ensure that the core DataSourceProcessors appear at the top in the wizard, and in a specific order.

Browse Source 
And there is a separator between 'core' DSPs and others.
This commit is contained in:
raman-bt 2013-10-29 14:30:51 -04:00
parent 657552661d
commit 0b985703b7
4 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,22 +22,20 @@ package org.sleuthkit.autopsy.casemodule;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.Component;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
import java.util.logging.Level;
import javax.swing.ComboBoxModel;
import javax.swing.JPanel;
import javax.swing.JList;
import javax.swing.JSeparator;
import javax.swing.event.DocumentEvent;
import javax.swing.event.ListDataListener;
import javax.swing.ListCellRenderer;
import org.openide.util.Lookup;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
@ -57,6 +55,7 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
private Map<String, DataSourceProcessor> datasourceProcessorsMap = new HashMap<String, DataSourceProcessor>();
List<String> coreDSPTypes = new ArrayList<String>();
/**
* Creates new form AddImageVisualPanel1
@ -71,28 +70,49 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
}
private void customInit() {
typePanel.setLayout(new BorderLayout());
discoverDataSourceProcessors();
// set up the DSP type combobox
typeComboBox.removeAllItems();
Set<String> dspTypes = datasourceProcessorsMap.keySet();
for(String dspType:dspTypes){
// make a list of core DSPs
// ensure that the core DSPs are at the top and in a fixed order
coreDSPTypes.add(ImageDSProcessor.dsType);
coreDSPTypes.add(LocalDiskDSProcessor.dsType);
coreDSPTypes.add(LocalFilesDSProcessor.dsType);
for(String dspType:coreDSPTypes){
typeComboBox.addItem(dspType);
}
// now add any addtional DSPs that haven't already been added
for(String dspType:dspTypes){
if (!coreDSPTypes.contains(dspType)) {
typeComboBox.addItem(dspType);
}
}
// set a custom renderer that draws a separator at the end of the core DSPs in the combobox
typeComboBox.setRenderer(new ComboboxSeparatorRenderer(typeComboBox.getRenderer()){
@Override
protected boolean addSeparatorAfter(JList list, Object value, int index){
return (index == coreDSPTypes.size() - 1);
}
});
//add actionlistner to listen for change
ActionListener cbActionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
dspSelectionChanged();
}
};
typeComboBox.addActionListener(cbActionListener);
typePanel.setLayout(new BorderLayout());
typeComboBox.setSelectedIndex(0);
}
@ -290,4 +310,27 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
this.wizPanel.enableNextButton(getCurrentDSProcessor().validatePanel());
}
public abstract class ComboboxSeparatorRenderer implements ListCellRenderer{
private ListCellRenderer delegate;
private JPanel separatorPanel = new JPanel(new BorderLayout());
private JSeparator separator = new JSeparator();
public ComboboxSeparatorRenderer(ListCellRenderer delegate){
this.delegate = delegate;
}
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus){
Component comp = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if(index!=-1 && addSeparatorAfter(list, value, index)){
separatorPanel.removeAll();
separatorPanel.add(comp, BorderLayout.CENTER);
separatorPanel.add(separator, BorderLayout.SOUTH);
return separatorPanel;
}else
return comp;
}
protected abstract boolean addSeparatorAfter(JList list, Object value, int index);
}
}

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

@ -40,7 +40,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
static final Logger logger = Logger.getLogger(ImageDSProcessor.class.getName());
// Data source type handled by this processor
private final String dsType = "Image File";
protected final static String dsType = "Image File";
// The Config UI panel that plugins into the Choose Data Source Wizard
private ImageFilePanel imageFilePanel;

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

@ -33,7 +33,7 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
static final Logger logger = Logger.getLogger(ImageDSProcessor.class.getName());
// Data source type handled by this processor
private final String dsType = "Local Disk";
static protected final String dsType = "Local Disk";
// The Config UI panel that plugins into the Choose Data Source Wizard
private LocalDiskPanel localDiskPanel;

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

@ -32,7 +32,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor {
static final Logger logger = Logger.getLogger(LocalFilesDSProcessor.class.getName());
// Data source type handled by this processor
private final String dsType = "Logical Files";
protected static final String dsType = "Logical Files";
// The Config UI panel that plugins into the Choose Data Source Wizard
private LocalFilesPanel localFilesPanel;