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

Merge http://www.github.com/sleuthkit/autopsy

Browse Source
This commit is contained in:
Smoss 2013-05-17 11:10:07 -04:00
commit 04187abca2
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/org/sleuthkit/autopsy/core/layer.xml
View File

@ -287,11 +287,6 @@
<attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/> <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
<attr name="position" intvalue="250"/> <attr name="position" intvalue="250"/>
</file> </file>
<file name="org-sleuthkit-autopsy-ingest-IngestDialogPanel.instance">
<attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.casemodule.IngestConfigurator"/>
<attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.ingest.IngestDialogPanel.getDefault"/>
<attr name="position" intvalue="50"/>
</file>
<file name="org-sleuthkit-autopsy-report-ReportHTML.instance"> <file name="org-sleuthkit-autopsy-report-ReportHTML.instance">
<attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.TableReportModule"/> <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.TableReportModule"/>
<attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/> <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/>

2
Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
View File

@ -47,7 +47,7 @@ public class IngestDialog extends JDialog {
public IngestDialog(JFrame frame, String title, boolean modal) { public IngestDialog(JFrame frame, String title, boolean modal) {
super(frame, title, modal); super(frame, title, modal);
panel = IngestDialogPanel.getDefault(); panel = new IngestDialogPanel();
} }
public IngestDialog(){ public IngestDialog(){

14
Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java
View File

@ -33,7 +33,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.JCheckBox;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTable; import javax.swing.JTable;
@ -43,7 +42,7 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
import org.openide.util.Exceptions; import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.casemodule.IngestConfigurator; import org.sleuthkit.autopsy.casemodule.IngestConfigurator;
import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog;
import org.sleuthkit.autopsy.coreutils.ModuleSettings; import org.sleuthkit.autopsy.coreutils.ModuleSettings;
@ -52,6 +51,7 @@ import org.sleuthkit.datamodel.Image;
/** /**
* main configuration panel for all ingest modules, reusable JPanel component * main configuration panel for all ingest modules, reusable JPanel component
*/ */
@ServiceProvider(service = IngestConfigurator.class)
public class IngestDialogPanel extends javax.swing.JPanel implements IngestConfigurator { public class IngestDialogPanel extends javax.swing.JPanel implements IngestConfigurator {
private IngestManager manager = null; private IngestManager manager = null;
@ -64,10 +64,9 @@ public class IngestDialogPanel extends javax.swing.JPanel implements IngestConfi
public static final String PARSE_UNALLOC = "Process_Unallocated_Space"; public static final String PARSE_UNALLOC = "Process_Unallocated_Space";
// The image that's just been added to the database // The image that's just been added to the database
private Image image; private Image image;
private static IngestDialogPanel instance = null;
/** Creates new form IngestDialogPanel */ /** Creates new form IngestDialogPanel */
private IngestDialogPanel() { public IngestDialogPanel() {
tableModel = new ModulesTableModel(); tableModel = new ModulesTableModel();
modules = new ArrayList<IngestModuleAbstract>(); modules = new ArrayList<IngestModuleAbstract>();
moduleStates = new HashMap<String, Boolean>(); moduleStates = new HashMap<String, Boolean>();
@ -75,13 +74,6 @@ public class IngestDialogPanel extends javax.swing.JPanel implements IngestConfi
customizeComponents(); customizeComponents();
} }
synchronized static IngestDialogPanel getDefault() {
if (instance == null) {
instance = new IngestDialogPanel();
}
return instance;
}
private void loadModules() { private void loadModules() {
this.modules.clear(); this.modules.clear();
//this.moduleStates.clear(); maintain the state //this.moduleStates.clear(); maintain the state

2
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -75,7 +75,7 @@ public class IngestManager {
//module loader //module loader
private IngestModuleLoader moduleLoader = null; private IngestModuleLoader moduleLoader = null;
//property file name id for the module //property file name id for the module
final static String MODULE_PROPERTIES = "ingest"; public final static String MODULE_PROPERTIES = "ingest";
/** /**
* Possible events about ingest modules Event listeners can get the event * Possible events about ingest modules Event listeners can get the event