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

Address 3 PR problems.

Browse Source
This commit is contained in:
Joe Ho 2019-05-14 11:24:34 -04:00
parent 6f259e0b1a
commit d0868cb0af
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@
</Group> </Group>
</Group> </Group>
</Group> </Group>
<EmptySpace pref="68" max="32767" attributes="0"/> <EmptySpace pref="48" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>

14
Core/src/org/sleuthkit/autopsy/casemodule/LogicalImagerPanel.java
View File

@ -27,12 +27,12 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Vector;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import javax.swing.filechooser.FileSystemView; import javax.swing.filechooser.FileSystemView;
@ -94,6 +94,7 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
LogicalImagerPanel instance = new LogicalImagerPanel(context); LogicalImagerPanel instance = new LogicalImagerPanel(context);
// post-constructor initialization of listener support without leaking references of uninitialized objects // post-constructor initialization of listener support without leaking references of uninitialized objects
instance.messageLabel.setText(Bundle.LogicalImagerPanel_messageLabel_clickScanOrBrowse()); instance.messageLabel.setText(Bundle.LogicalImagerPanel_messageLabel_clickScanOrBrowse());
instance.imageTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
return instance; return instance;
} }
@ -227,7 +228,7 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGap(144, 144, 144) .addGap(144, 144, 144)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 116, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 116, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap(68, Short.MAX_VALUE)))) .addContainerGap(48, Short.MAX_VALUE))))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -275,7 +276,7 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
// Scan external drives for sparse_image.vhd // Scan external drives for sparse_image.vhd
clearImageTable(); clearImageTable();
setNormalMessage(Bundle.LogicalImagerPanel_messageLabel_scanningExternalDrives()); setNormalMessage(Bundle.LogicalImagerPanel_messageLabel_scanningExternalDrives());
Vector<String> listData = new Vector<>(); List<String> listData = new ArrayList<>();
File[] roots = File.listRoots(); File[] roots = File.listRoots();
int firstRemovableDrive = -1; int firstRemovableDrive = -1;
int i = 0; int i = 0;
@ -296,7 +297,7 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
} }
i++; i++;
} }
driveList.setListData(listData); driveList.setListData(listData.toArray(new String[0]));
if (!listData.isEmpty()) { if (!listData.isEmpty()) {
// auto-select the first external drive, if any // auto-select the first external drive, if any
driveList.setSelectedIndex(firstRemovableDrive == -1 ? 0 : firstRemovableDrive); driveList.setSelectedIndex(firstRemovableDrive == -1 ? 0 : firstRemovableDrive);
@ -305,6 +306,7 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
} else { } else {
setErrorMessage(Bundle.LogicalImagerPanel_messageLabel_noExternalDriveFound()); setErrorMessage(Bundle.LogicalImagerPanel_messageLabel_noExternalDriveFound());
} }
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false);
}//GEN-LAST:event_scanButtonActionPerformed }//GEN-LAST:event_scanButtonActionPerformed
@Messages({ @Messages({
@ -333,7 +335,6 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
} else { } else {
setErrorMessage(Bundle.LogicalImagerPanel_messageLabel_directoryFormatInvalid(path)); setErrorMessage(Bundle.LogicalImagerPanel_messageLabel_directoryFormatInvalid(path));
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false); firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false);
return;
} }
} else { } else {
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false); firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false);
@ -434,14 +435,17 @@ public class LogicalImagerPanel extends JPanel implements DocumentListener {
private void driveListMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_driveListMouseClicked private void driveListMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_driveListMouseClicked
driveListSelect(); driveListSelect();
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false);
}//GEN-LAST:event_driveListMouseClicked }//GEN-LAST:event_driveListMouseClicked
private void driveListKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_driveListKeyReleased private void driveListKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_driveListKeyReleased
driveListSelect(); driveListSelect();
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false);
}//GEN-LAST:event_driveListKeyReleased }//GEN-LAST:event_driveListKeyReleased
private void imageTableKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_imageTableKeyReleased private void imageTableKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_imageTableKeyReleased
imageTableSelect(); imageTableSelect();
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), true, false);
}//GEN-LAST:event_imageTableKeyReleased }//GEN-LAST:event_imageTableKeyReleased
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables