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

2347 repaired writer error display for LocalDiskPanel

Browse Source
This commit is contained in:
William Schaefer 2017-03-14 11:52:03 -04:00
parent 4a6f6da03f
commit 3587783304
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
View File

@ -3,10 +3,10 @@
<Form version="1.6" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <Form version="1.6" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties> <Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 65]"/> <Dimension value="[0, 420]"/>
</Property> </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[485, 65]"/> <Dimension value="[485, 410]"/>
</Property> </Property>
</Properties> </Properties>
<AuxValues> <AuxValues>

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

@ -71,7 +71,7 @@ final class LocalDiskPanel extends JPanel {
public void valueChanged(ListSelectionEvent e) { public void valueChanged(ListSelectionEvent e) {
if (diskTable.getSelectedRow() >= 0 && diskTable.getSelectedRow() < disks.size()) { if (diskTable.getSelectedRow() >= 0 && diskTable.getSelectedRow() < disks.size()) {
enableNext = true; enableNext = true;
setPotentialImageWriterPath((LocalDisk) disks.get(diskTable.getSelectedRow())); setPotentialImageWriterPath(disks.get(diskTable.getSelectedRow()));
try { try {
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true); firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
} catch (Exception ex) { } catch (Exception ex) {
@ -101,7 +101,7 @@ final class LocalDiskPanel extends JPanel {
errorLabel.setVisible(false); errorLabel.setVisible(false);
errorLabel.setText(""); errorLabel.setText("");
diskTable.setEnabled(false); diskTable.setEnabled(false);
imageWriterErrorLabel.setOpaque(true); imageWriterErrorLabel.setVisible(false);
imageWriterErrorLabel.setText(""); imageWriterErrorLabel.setText("");
pathTextField.setEnabled(copyImageCheckbox.isSelected()); pathTextField.setEnabled(copyImageCheckbox.isSelected());
browseButton.setEnabled(copyImageCheckbox.isSelected()); browseButton.setEnabled(copyImageCheckbox.isSelected());
@ -130,8 +130,8 @@ final class LocalDiskPanel extends JPanel {
jLabel1 = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel();
imageWriterErrorLabel = new javax.swing.JLabel(); imageWriterErrorLabel = new javax.swing.JLabel();
setMinimumSize(new java.awt.Dimension(0, 65)); setMinimumSize(new java.awt.Dimension(0, 420));
setPreferredSize(new java.awt.Dimension(485, 65)); setPreferredSize(new java.awt.Dimension(485, 410));
diskLabel.setFont(diskLabel.getFont().deriveFont(diskLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); diskLabel.setFont(diskLabel.getFont().deriveFont(diskLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
org.openide.awt.Mnemonics.setLocalizedText(diskLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.diskLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(diskLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.diskLabel.text")); // NOI18N
@ -343,6 +343,7 @@ final class LocalDiskPanel extends JPanel {
private boolean imageWriterPathIsValid() { private boolean imageWriterPathIsValid() {
if (pathTextField.getText().isEmpty()) { if (pathTextField.getText().isEmpty()) {
imageWriterErrorLabel.setVisible(true);
imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterEmptyPathError.text")); imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterEmptyPathError.text"));
return false; return false;
} }
@ -350,18 +351,21 @@ final class LocalDiskPanel extends JPanel {
File f = new File(pathTextField.getText()); File f = new File(pathTextField.getText());
if (((f.getParentFile() != null) && (!f.getParentFile().exists())) if (((f.getParentFile() != null) && (!f.getParentFile().exists()))
|| (f.getParentFile() == null)) { || (f.getParentFile() == null)) {
imageWriterErrorLabel.setVisible(true);
imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterDirError.text")); imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterDirError.text"));
return false; return false;
} }
if (f.isDirectory()) { if (f.isDirectory()) {
imageWriterErrorLabel.setVisible(true);
imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterIsDirError.text")); imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterIsDirError.text"));
return false; return false;
} }
if (f.exists()) { if (f.exists()) {
imageWriterErrorLabel.setVisible(true);
imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterFileExistsError.text")); imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterFileExistsError.text"));
return false; return false;
} }
imageWriterErrorLabel.setVisible(false);
imageWriterErrorLabel.setText(""); imageWriterErrorLabel.setText("");
return true; return true;
} }