diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
index 6ac747bd6c..62b7d19ab5 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
@@ -3,21 +3,17 @@ OptionsCategory_Name_FileExtMismatchOptions=File Extension Mismatch
OptionsCategory_FileExtMismatch=File Extension Mismatch
AddFileExtensionAction.msgDlg.msg2=File extension mismatch settings could not be read, extensions update not available.
AddFileExtensionAction.msgDlg.title=Add Mismatch Extension Error
-AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for
+AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for
FileExtMismatchConfigPanel.addExtButton.errLabel.empty=Extension text is empty\!
FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=No MIME type selected\!
FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=Extension already exists\!
-FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=Extension {0} added.
FileExtMismatchConfigPanel.addTypeButton.empty=MIME type text is empty\!
FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME type not supported\!
FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME type already exists\!
FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME type is not detectable by this module.
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME type {0} added.
FileExtMismatchConfigPanel.removeTypeButton.noneSelected=No MIME type selected\!
-FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME type {0} deleted.
FileExtMismatchConfigPanel.removeExtButton.noneSelected=No extension selected\!
FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected=No MIME type selected\!
-FileExtMismatchConfigPanel.removeExtButton.deleted=Extension {0} deleted.
FileExtMismatchConfigPanel.store.msg=Saved.
FileExtMismatchConfigPanel.store.msgDlg.msg=File extension mismatch settings could not be saved.
FileExtMismatchConfigPanel.save.msgDlg.title=Save Error
@@ -38,15 +34,12 @@ FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=Skip files without ext
FileExtMismatchSettingsPanel.addTypeButton.text=Add Type
FileExtMismatchSettingsPanel.extErrorLabel.text=\
FileExtMismatchSettingsPanel.extHeaderLabel.text=Allowed Extensions:
-FileExtMismatchSettingsPanel.saveMsgLabel.text=\
-FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text=\
-FileExtMismatchSettingsPanel.extRemoveErrLabel.text=\
FileExtMismatchSettingsPanel.mimeErrLabel.text=\
-FileExtMismatchSettingsPanel.removeTypeButton.text=Remove Selected Type
+FileExtMismatchSettingsPanel.removeTypeButton.text=Remove Type
FileExtMismatchSettingsPanel.jLabel1.text=File Types:
FileExtMismatchSettingsPanel.userExtTextField.text=
FileExtMismatchSettingsPanel.addExtButton.text=Add Extension
-FileExtMismatchSettingsPanel.removeExtButton.text=Remove Selected Extension
+FileExtMismatchSettingsPanel.removeExtButton.text=Remove Extension
FileExtMismatchSettingsPanel.userTypeTextField.text=
FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form
index 3b5f5d7758..126d42e0af 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form
@@ -16,20 +16,25 @@
-
+
-
+
-
+
+
+
+
+
+
@@ -45,14 +50,7 @@
-
-
-
-
-
-
-
-
+
@@ -61,9 +59,7 @@
-
-
-
+
@@ -97,13 +93,13 @@
+
+
-
-
+
-
@@ -115,19 +111,18 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
@@ -165,6 +160,9 @@
+
+
+
@@ -175,6 +173,9 @@
+
+
+
@@ -193,13 +194,6 @@
-
-
-
-
-
-
-
@@ -215,45 +209,39 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
-
-
+
-
+
+
-
+
-
-
-
-
@@ -271,6 +259,9 @@
+
+
+
@@ -294,6 +285,9 @@
+
+
+
@@ -319,27 +313,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
index 35bc8d539c..4978eb3119 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
@@ -93,10 +93,14 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
updateExtList();
extTableModel.resync();
+ removeTypeButton.setEnabled(true);
+ addExtButton.setEnabled(true);
//initButtons();
} else {
selectedMime = "";
currentExtensions = null;
+ removeTypeButton.setEnabled(false);
+ addExtButton.setEnabled(false);
extTableModel.resync();
}
@@ -115,23 +119,22 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
listSelectionModel.setSelectionInterval(index, index);
selectedExt = currentExtensions.get(index);
+ removeExtButton.setEnabled(true);
} else {
selectedExt = "";
+ removeExtButton.setEnabled(false);
}
- extRemoveErrLabel.setText(" ");
-
}
});
-
+ removeExtButton.setEnabled(false);
+ removeTypeButton.setEnabled(false);
+ addExtButton.setEnabled(false);
}
private void clearErrLabels() {
mimeErrLabel.setText(" ");
- mimeRemoveErrLabel.setText(" ");
- extRemoveErrLabel.setText(" ");
extErrorLabel.setText(" ");
- saveMsgLabel.setText(" ");
}
/**
@@ -153,7 +156,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
addTypeButton = new javax.swing.JButton();
removeTypeButton = new javax.swing.JButton();
mimeErrLabel = new javax.swing.JLabel();
- mimeRemoveErrLabel = new javax.swing.JLabel();
extensionPanel = new javax.swing.JPanel();
userExtTextField = new javax.swing.JTextField();
addExtButton = new javax.swing.JButton();
@@ -162,8 +164,8 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
removeExtButton = new javax.swing.JButton();
extHeaderLabel = new javax.swing.JLabel();
extErrorLabel = new javax.swing.JLabel();
- extRemoveErrLabel = new javax.swing.JLabel();
- saveMsgLabel = new javax.swing.JLabel();
+
+ jScrollPane1.setBorder(null);
jPanel1.setPreferredSize(new java.awt.Dimension(687, 450));
@@ -181,6 +183,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
}
});
+ addTypeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N
addTypeButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.addTypeButton.text")); // NOI18N
addTypeButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -188,6 +191,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
}
});
+ removeTypeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N
removeTypeButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.removeTypeButton.text")); // NOI18N
removeTypeButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -198,8 +202,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
mimeErrLabel.setForeground(new java.awt.Color(255, 0, 0));
mimeErrLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.mimeErrLabel.text")); // NOI18N
- mimeRemoveErrLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text")); // NOI18N
-
javax.swing.GroupLayout mimePanelLayout = new javax.swing.GroupLayout(mimePanel);
mimePanel.setLayout(mimePanelLayout);
mimePanelLayout.setHorizontalGroup(
@@ -214,11 +216,11 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
.addGroup(mimePanelLayout.createSequentialGroup()
.addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(addTypeButton))
- .addComponent(removeTypeButton))
- .addGap(0, 196, Short.MAX_VALUE))
- .addComponent(mimeErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(mimeRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(addTypeButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(removeTypeButton)))
+ .addGap(0, 0, Short.MAX_VALUE))
+ .addComponent(mimeErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
mimePanelLayout.setVerticalGroup(
@@ -227,18 +229,16 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
.addContainerGap()
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(addTypeButton))
- .addGap(3, 3, 3)
+ .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 374, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(removeTypeButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(addTypeButton)))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(mimeErrLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(removeTypeButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(mimeRemoveErrLabel)
- .addContainerGap(83, Short.MAX_VALUE))
+ .addContainerGap())
);
jSplitPane1.setLeftComponent(mimePanel);
@@ -250,6 +250,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
}
});
+ addExtButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N
addExtButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.addExtButton.text")); // NOI18N
addExtButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -260,6 +261,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
extTable.setModel(extTableModel);
jScrollPane3.setViewportView(extTable);
+ removeExtButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N
removeExtButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.removeExtButton.text")); // NOI18N
removeExtButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -272,8 +274,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
extErrorLabel.setForeground(new java.awt.Color(255, 0, 0));
extErrorLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.extErrorLabel.text")); // NOI18N
- extRemoveErrLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.extRemoveErrLabel.text")); // NOI18N
-
javax.swing.GroupLayout extensionPanelLayout = new javax.swing.GroupLayout(extensionPanel);
extensionPanel.setLayout(extensionPanelLayout);
extensionPanelLayout.setHorizontalGroup(
@@ -281,19 +281,17 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
.addGroup(extensionPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
- .addComponent(extHeaderLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(extensionPanelLayout.createSequentialGroup()
- .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(removeExtButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(extensionPanelLayout.createSequentialGroup()
- .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(addExtButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .addGap(0, 46, Short.MAX_VALUE))
+ .addComponent(extHeaderLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(37, Short.MAX_VALUE))
.addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, extensionPanelLayout.createSequentialGroup()
+ .addComponent(userExtTextField)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(addExtButton)
+ .addGap(4, 4, 4)
+ .addComponent(removeExtButton))))
);
extensionPanelLayout.setVerticalGroup(
extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -301,46 +299,33 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
.addContainerGap()
.addComponent(extHeaderLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 285, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(addExtButton))
- .addGap(2, 2, 2)
+ .addComponent(addExtButton)
+ .addComponent(removeExtButton))
+ .addGap(5, 5, 5)
.addComponent(extErrorLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(removeExtButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(extRemoveErrLabel)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
);
jSplitPane1.setRightComponent(extensionPanel);
- saveMsgLabel.setForeground(new java.awt.Color(0, 0, 255));
- saveMsgLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.saveMsgLabel.text")); // NOI18N
-
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jSplitPane1)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
- .addGap(0, 0, Short.MAX_VALUE)
- .addComponent(saveMsgLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addContainerGap())
+ .addComponent(jSplitPane1))
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addComponent(jSplitPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 466, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(saveMsgLabel)
- .addContainerGap())
+ .addGap(31, 31, 31))
);
jScrollPane1.setViewportView(jPanel1);
@@ -349,13 +334,13 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jScrollPane1)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 838, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 482, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 8, Short.MAX_VALUE))
+ .addContainerGap(18, Short.MAX_VALUE))
);
}// //GEN-END:initComponents
@@ -392,15 +377,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
// Refresh table
updateExtList();
extTableModel.resync();
-
- // user feedback for successful add
- extErrorLabel.setForeground(Color.blue);
- extErrorLabel.setText(
- NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded",
- newExt));
- extRemoveErrLabel.setText(" ");
- userExtTextField.setText("");
- setIsModified();
+ this.userExtTextField.setText("");
}//GEN-LAST:event_addExtButtonActionPerformed
private void addTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addTypeButtonActionPerformed
@@ -436,15 +413,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
// Refresh table
updateMimeList();
mimeTableModel.resync();
-
- // user feedback for successful add
- //selectByMimeString(newMime);
- mimeErrLabel.setForeground(Color.blue);
- mimeErrLabel.setText(
- NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded", newMime));
- mimeRemoveErrLabel.setText(" ");
userTypeTextField.setText("");
- setIsModified();
}//GEN-LAST:event_addTypeButtonActionPerformed
private void userExtTextFieldFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_userExtTextFieldFocusGained
@@ -457,8 +426,8 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
private void removeTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeTypeButtonActionPerformed
if (selectedMime.isEmpty()) {
- mimeRemoveErrLabel.setForeground(Color.red);
- mimeRemoveErrLabel.setText(
+ mimeErrLabel.setForeground(Color.red);
+ mimeErrLabel.setText(
NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeTypeButton.noneSelected"));
return;
}
@@ -469,18 +438,12 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
// Refresh table
updateMimeList();
mimeTableModel.resync();
-
- // user feedback for successful add
- mimeRemoveErrLabel.setForeground(Color.blue);
- mimeRemoveErrLabel.setText(
- NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.remoteTypeButton.deleted", deadMime));
- setIsModified();
}//GEN-LAST:event_removeTypeButtonActionPerformed
private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed
if (selectedExt.isEmpty()) {
- extRemoveErrLabel.setForeground(Color.red);
- extRemoveErrLabel.setText(
+ extErrorLabel.setForeground(Color.red);
+ extErrorLabel.setText(
NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeExtButton.noneSelected"));
return;
}
@@ -502,12 +465,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
// Refresh tables
updateExtList();
extTableModel.resync();
-
- // user feedback for successful add
- extRemoveErrLabel.setForeground(Color.blue);
- extRemoveErrLabel.setText(
- NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeExtButton.deleted", deadExt));
- setIsModified();
}//GEN-LAST:event_removeExtButtonActionPerformed
private void updateMimeList() {
@@ -534,11 +491,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
try {
FileExtMismatchSettings.writeSettings(new FileExtMismatchSettings(editableMap));
mimeErrLabel.setText(" ");
- mimeRemoveErrLabel.setText(" ");
- extRemoveErrLabel.setText(" ");
extErrorLabel.setText(" ");
-
- saveMsgLabel.setText(NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.store.msg"));
} catch (FileExtMismatchSettings.FileExtMismatchSettingsException ex) {
//error
JOptionPane.showMessageDialog(this,
@@ -575,10 +528,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
saveSettings();
}
- private void setIsModified() {
- saveMsgLabel.setText(" ");
- }
-
public void cancel() {
clearErrLabels();
load(); // The next time this panel is opened, we want it to be fresh
@@ -598,7 +547,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
private javax.swing.JButton addTypeButton;
private javax.swing.JLabel extErrorLabel;
private javax.swing.JLabel extHeaderLabel;
- private javax.swing.JLabel extRemoveErrLabel;
private javax.swing.JTable extTable;
private javax.swing.JPanel extensionPanel;
private javax.swing.JLabel jLabel1;
@@ -609,11 +557,9 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
private javax.swing.JSplitPane jSplitPane1;
private javax.swing.JLabel mimeErrLabel;
private javax.swing.JPanel mimePanel;
- private javax.swing.JLabel mimeRemoveErrLabel;
private javax.swing.JTable mimeTable;
private javax.swing.JButton removeExtButton;
private javax.swing.JButton removeTypeButton;
- private javax.swing.JLabel saveMsgLabel;
private javax.swing.JTextField userExtTextField;
private javax.swing.JTextField userTypeTextField;
// End of variables declaration//GEN-END:variables
@@ -633,15 +579,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
@Override
public String getColumnName(int column) {
String colName = null;
-
- switch (column) {
- case 0:
- colName = NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.mimeTableModel.colName");
- break;
- default:
- ;
-
- }
return colName;
}
@@ -697,15 +634,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel
@Override
public String getColumnName(int column) {
String colName = null;
-
- switch (column) {
- case 0:
- colName = NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.extTableModel.colName");
- break;
- default:
- ;
-
- }
return colName;
}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index d500c116ec..c190f625f9 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -22,7 +22,7 @@ KeywordSearchEditListPanel.saveListButton.text=Copy List
KeywordSearchEditListPanel.addWordField.text=
KeywordSearchEditListPanel.addWordButton.text=Add
KeywordSearchEditListPanel.chRegex.text=Regular Expression
-KeywordSearchEditListPanel.deleteWordButton.text=Remove Selected
+KeywordSearchEditListPanel.deleteWordButton.text=Remove
KeywordSearchEditListPanel.cutMenuItem.text=Cut
KeywordSearchEditListPanel.selectAllMenuItem.text=Select All
KeywordSearchEditListPanel.pasteMenuItem.text=Paste
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form
index 366415f49d..df0173a112 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form
@@ -190,16 +190,15 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -211,12 +210,11 @@
+
-
+
-
-
-
+
@@ -224,6 +222,9 @@
+
+
+
@@ -251,6 +252,9 @@
+
+
+
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
index f4f2596956..2af3f77da7 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
@@ -28,8 +28,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
-import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.coreutils.Logger;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import javax.swing.JFileChooser;
@@ -41,7 +39,9 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableColumn;
+import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
+import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.ingest.IngestManager;
/**
@@ -227,6 +227,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
keywordTable.getTableHeader().setReorderingAllowed(false);
jScrollPane1.setViewportView(keywordTable);
+ addWordButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/new16.png"))); // NOI18N
addWordButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.addWordButton.text")); // NOI18N
addWordButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -243,6 +244,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
chRegex.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.chRegex.text")); // NOI18N
+ deleteWordButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N
deleteWordButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.deleteWordButton.text")); // NOI18N
deleteWordButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -256,13 +258,13 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(addKeywordPanelLayout.createSequentialGroup()
.addGroup(addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(addKeywordPanelLayout.createSequentialGroup()
- .addComponent(addWordField, javax.swing.GroupLayout.PREFERRED_SIZE, 216, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(addWordButton))
- .addComponent(deleteWordButton))
+ .addGroup(addKeywordPanelLayout.createSequentialGroup()
+ .addComponent(addWordField, javax.swing.GroupLayout.PREFERRED_SIZE, 216, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(addWordButton))
.addComponent(chRegex, javax.swing.GroupLayout.Alignment.LEADING))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(deleteWordButton)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
addKeywordPanelLayout.setVerticalGroup(
@@ -271,12 +273,11 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
.addGap(0, 0, 0)
.addGroup(addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(addWordField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(addWordButton))
- .addGap(7, 7, 7)
+ .addComponent(addWordButton)
+ .addComponent(deleteWordButton))
+ .addGap(6, 6, 6)
.addComponent(chRegex)
- .addGap(7, 7, 7)
- .addComponent(deleteWordButton)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(43, Short.MAX_VALUE))
);
ingestMessagesCheckbox.setSelected(true);
@@ -294,13 +295,13 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
listOptionsLabel.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.listOptionsLabel.text")); // NOI18N
- deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N NON-NLS
+ deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N
deleteListButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.deleteListButton.text")); // NOI18N
- saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N NON-NLS
+ saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N
saveListButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.saveListButton.text")); // NOI18N
- exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N NON-NLS
+ exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N
exportButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.exportButton.text")); // NOI18N
exportButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {