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

1916 remove no longer used button group

Browse Source
This commit is contained in:
William Schaefer 2018-02-12 14:23:27 -05:00
parent 4f3de1bae7
commit 0f64a5a8a6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat
private static final String DATA_SOURCE_TYPE = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType"); private static final String DATA_SOURCE_TYPE = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType");
private final LogicalFilesDspPanel configPanel; private final LogicalFilesDspPanel configPanel;
private static final String L01_EXTRACTION_DIR = "ModuleOutput\\L01";
/* /*
* TODO: Remove the setDataSourceOptionsCalled flag and the settings fields * TODO: Remove the setDataSourceOptionsCalled flag and the settings fields
* when the deprecated method setDataSourceOptions is removed. * when the deprecated method setDataSourceOptions is removed.
@ -144,6 +145,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat
} }
private List<String> extractL01Contents(List<String> l01FilePaths) { private List<String> extractL01Contents(List<String> l01FilePaths) {
//WJS-TODO -- add ewfexport and any196 other necessary files to software package
final String EWFEXPORT_EXE = "C:\\project_libs\\libewf_64bit\\msvscpp\\x64\\Release\\ewfexport.exe"; final String EWFEXPORT_EXE = "C:\\project_libs\\libewf_64bit\\msvscpp\\x64\\Release\\ewfexport.exe";
List<String> extractedPaths = new ArrayList<>(); List<String> extractedPaths = new ArrayList<>();
@ -153,7 +155,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat
command.add("-f"); command.add("-f");
command.add("files"); command.add("files");
command.add("-t"); command.add("-t");
File l01Dir = new File(Case.getCurrentCase().getCaseDirectory(), "ModuleOutput\\L01"); File l01Dir = new File(Case.getCurrentCase().getCaseDirectory(), L01_EXTRACTION_DIR);
if (!l01Dir.exists()) { if (!l01Dir.exists()) {
l01Dir.mkdir(); l01Dir.mkdir();
} }
@ -166,7 +168,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat
ProcessBuilder processBuilder = new ProcessBuilder(command); ProcessBuilder processBuilder = new ProcessBuilder(command);
processBuilder.directory(l01Dir); processBuilder.directory(l01Dir);
try { try {
// //WJS-TODO redirect stdout and stderr in a method similar to bulk extractor
// // redirect BE stdout and stderr to txt files // // redirect BE stdout and stderr to txt files
// Path logFileName = Paths.get(outputDirPath.getParent().toString(), outputDirPath.getFileName().toString() + "_out.txt"); // Path logFileName = Paths.get(outputDirPath.getParent().toString(), outputDirPath.getFileName().toString() + "_out.txt");
// File logFile = new File(logFileName.toString()); // File logFile = new File(logFileName.toString());
@ -181,6 +183,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat
extractedPaths.add(l01Dir.toPath().resolve(dirPath).toString()); extractedPaths.add(l01Dir.toPath().resolve(dirPath).toString());
} }
else { //if we failed to extract anything add it as a regular file else { //if we failed to extract anything add it as a regular file
//WJS-TODO notify user of that the file was added as a regular file
extractedPaths.add(l01Path); extractedPaths.add(l01Path);
} }

2
Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.form
View File

@ -17,8 +17,6 @@
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Component class="javax.swing.ButtonGroup" name="fileTypeButtonGroup">
</Component>
</NonVisualComponents> </NonVisualComponents>
<AuxValues> <AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/> <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>

4
Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.java
View File

@ -106,7 +106,6 @@ final class LogicalFilesDspPanel extends JPanel {
jScrollPane1 = new javax.swing.JScrollPane(); jScrollPane1 = new javax.swing.JScrollPane();
jTextArea1 = new javax.swing.JTextArea(); jTextArea1 = new javax.swing.JTextArea();
fileTypeButtonGroup = new javax.swing.ButtonGroup();
jPanel1 = new javax.swing.JPanel(); jPanel1 = new javax.swing.JPanel();
jComboBox1 = new javax.swing.JComboBox<>(); jComboBox1 = new javax.swing.JComboBox<>();
@ -120,7 +119,7 @@ final class LogicalFilesDspPanel extends JPanel {
jPanel1.setLayout(jPanel1Layout); jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup( jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 467, Short.MAX_VALUE) .addGap(0, 466, Short.MAX_VALUE)
); );
jPanel1Layout.setVerticalGroup( jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -186,7 +185,6 @@ final class LogicalFilesDspPanel extends JPanel {
} }
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.ButtonGroup fileTypeButtonGroup;
private javax.swing.JComboBox<String> jComboBox1; private javax.swing.JComboBox<String> jComboBox1;
private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel1;
private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane1;