diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java index b3ff6aff36..cb7599369f 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java @@ -30,6 +30,7 @@ class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implements Opti private FilesSetDefsPanel filterPanel; private IngestSettingsPanel settingsPanel; + private ProfileSettingsPanel profilePanel; IngestOptionsPanel() { @@ -41,10 +42,13 @@ class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implements Opti setName("Temporary Name"); filterPanel = new FilesSetDefsPanel(PANEL_TYPE.FILE_INGEST_FILTERS); settingsPanel = new IngestSettingsPanel(); + profilePanel = new ProfileSettingsPanel(); tabbedPane.insertTab("Settings", null, settingsPanel, "Tootip 1", 0); - tabbedPane.insertTab("Filters", null, + tabbedPane.insertTab("File Filters", null, filterPanel, "Tooltip 2", 1); + tabbedPane.insertTab("Profiles", null, + profilePanel, "Tooltip 3", 2); } @@ -52,18 +56,21 @@ class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implements Opti public void addPropertyChangeListener(PropertyChangeListener l) { filterPanel.addPropertyChangeListener(l); settingsPanel.addPropertyChangeListener(l); + profilePanel.addPropertyChangeListener(l); } @Override public void removePropertyChangeListener(PropertyChangeListener l) { filterPanel.removePropertyChangeListener(l); settingsPanel.removePropertyChangeListener(l); + profilePanel.removePropertyChangeListener(l); } @Override public void saveSettings() { filterPanel.store(); settingsPanel.store(); + profilePanel.store(); } @Override @@ -75,6 +82,7 @@ class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implements Opti public void load() { filterPanel.load(); settingsPanel.load(); + profilePanel.load(); } boolean valid() { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.form new file mode 100644 index 0000000000..4f9abb50dc --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.form @@ -0,0 +1,28 @@ + + +
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java new file mode 100644 index 0000000000..93f39178df --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/ingest/ProfileSettingsPanel.java @@ -0,0 +1,59 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.sleuthkit.autopsy.ingest; + +import org.sleuthkit.autopsy.corecomponents.OptionsPanel; + + +public class ProfileSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel { + + /** + * Creates new form ProfileOptionsPanel + */ + public ProfileSettingsPanel() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + //