Merge branch 'master' of github.com:sleuthkit/autopsy

This commit is contained in:
Brian Carrier 2013-09-10 10:20:02 -04:00
commit a8ad1d872b
2 changed files with 1 additions and 2 deletions

View File

@ -48,7 +48,7 @@ final class AddImageVisualPanel1 extends JPanel {
static final String encaseDesc = "Encase Images (*.e01)"; static final String encaseDesc = "Encase Images (*.e01)";
static GeneralFilter encaseFilter = new GeneralFilter(encaseExt, encaseDesc); static GeneralFilter encaseFilter = new GeneralFilter(encaseExt, encaseDesc);
static final List<String> allExt = new ArrayList<String>(); static final List<String> allExt = new ArrayList<String>();
{ static {
allExt.addAll(rawExt); allExt.addAll(rawExt);
allExt.addAll(encaseExt); allExt.addAll(encaseExt);
} }

View File

@ -43,7 +43,6 @@ public class ImageFilePanel extends ContentTypePanel 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(AddImageVisualPanel1.allFilter);
fc.addChoosableFileFilter(AddImageVisualPanel1.rawFilter); fc.addChoosableFileFilter(AddImageVisualPanel1.rawFilter);
fc.addChoosableFileFilter(AddImageVisualPanel1.encaseFilter); fc.addChoosableFileFilter(AddImageVisualPanel1.encaseFilter);
fc.setFileFilter(AddImageVisualPanel1.allFilter); fc.setFileFilter(AddImageVisualPanel1.allFilter);