diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java index f5ee742f8b..13ee9b0a1b 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java @@ -18,8 +18,6 @@ */ package org.sleuthkit.autopsy.corecomponents; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.text.NumberFormat; import javax.swing.DefaultComboBoxModel; import javax.swing.JFormattedTextField; @@ -34,8 +32,6 @@ import org.sleuthkit.autopsy.core.UserPreferences; */ final class AutopsyOptionsPanel extends javax.swing.JPanel { - private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - AutopsyOptionsPanel() { initComponents(); int availableProcessors = Runtime.getRuntime().availableProcessors(); @@ -82,17 +78,17 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel { @Override public void insertUpdate(DocumentEvent e) { - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } @Override public void removeUpdate(DocumentEvent e) { - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } @Override public void changedUpdate(DocumentEvent e) { - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } }; this.jFormattedTextFieldProcTimeOutHrs.getDocument().addDocumentListener(docListener); @@ -138,17 +134,7 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel { UserPreferences.setProcessTimeOutHrs((int) timeOutHrs); } } - - @Override - public void addPropertyChangeListener(PropertyChangeListener l) { - pcs.addPropertyChangeListener(l); - } - - @Override - public void removePropertyChangeListener(PropertyChangeListener l) { - pcs.removePropertyChangeListener(l); - } - + boolean valid() { return true; } @@ -361,39 +347,39 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel { private void jCheckBoxEnableProcTimeoutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBoxEnableProcTimeoutActionPerformed jFormattedTextFieldProcTimeOutHrs.setEditable(jCheckBoxEnableProcTimeout.isSelected()); - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_jCheckBoxEnableProcTimeoutActionPerformed private void useBestViewerRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useBestViewerRBActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_useBestViewerRBActionPerformed private void keepCurrentViewerRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_keepCurrentViewerRBActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_keepCurrentViewerRBActionPerformed private void dataSourcesHideKnownCBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dataSourcesHideKnownCBActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_dataSourcesHideKnownCBActionPerformed private void viewsHideKnownCBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_viewsHideKnownCBActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_viewsHideKnownCBActionPerformed private void useLocalTimeRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useLocalTimeRBActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_useLocalTimeRBActionPerformed private void useGMTTimeRBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useGMTTimeRBActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_useGMTTimeRBActionPerformed private void numberOfFileIngestThreadsComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_numberOfFileIngestThreadsComboBoxActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_numberOfFileIngestThreadsComboBoxActionPerformed private void jFormattedTextFieldProcTimeOutHrsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jFormattedTextFieldProcTimeOutHrsActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_jFormattedTextFieldProcTimeOutHrsActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java index 59a7cb38b1..7d2c379ab2 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java @@ -22,8 +22,6 @@ import org.openide.util.NbBundle; import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.io.File; import java.io.IOException; import java.util.logging.Level; @@ -38,7 +36,6 @@ public class ReportProgressPanel extends javax.swing.JPanel { private static final Logger logger = Logger.getLogger(ReportProgressPanel.class.getName()); private static final Color GREEN = new Color(50, 205, 50); private static final Color RED = new Color(178, 34, 34); - private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); private ReportStatus status; /** @@ -115,26 +112,6 @@ public class ReportProgressPanel extends javax.swing.JPanel { } } - /** - * Adds a property change listener to this panel. - * - * @param listener The listener to be added. - */ - @Override - public void addPropertyChangeListener(PropertyChangeListener listener) { - this.pcs.addPropertyChangeListener(listener); - } - - /** - * Removes a property change listener from this panel. - * - * @param listener The listener to be removed. - */ - @Override - public void removePropertyChangeListener(PropertyChangeListener listener) { - this.pcs.removePropertyChangeListener(listener); - } - /** * Gets the current status of the generation of the report. * @@ -242,7 +219,7 @@ public class ReportProgressPanel extends javax.swing.JPanel { reportProgressBar.setStringPainted(true); reportProgressBar.setForeground(GREEN); reportProgressBar.setString("Complete"); //NON-NLS - pcs.firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status); + firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status); break; } case ERROR: { @@ -254,7 +231,7 @@ public class ReportProgressPanel extends javax.swing.JPanel { reportProgressBar.setStringPainted(true); reportProgressBar.setForeground(RED); reportProgressBar.setString("Error"); //NON-NLS - pcs.firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status); + firePropertyChange(ReportStatus.COMPLETE.toString(), oldValue, status); break; } default: { @@ -285,7 +262,7 @@ public class ReportProgressPanel extends javax.swing.JPanel { reportProgressBar.setStringPainted(true); reportProgressBar.setForeground(RED); // Red reportProgressBar.setString("Cancelled"); //NON-NLS - pcs.firePropertyChange(ReportStatus.CANCELED.toString(), oldValue, status); + firePropertyChange(ReportStatus.CANCELED.toString(), oldValue, status); statusMessageLabel.setForeground(RED); statusMessageLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text")); break; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java index 8190c5d83b..4d97ca7332 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java @@ -23,7 +23,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -47,7 +46,6 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestManager; import java.awt.Component; import javax.swing.ImageIcon; -import javax.swing.JLabel; import static javax.swing.SwingConstants.CENTER; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; @@ -62,7 +60,6 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis private static final long serialVersionUID = 1L; private final KeywordTableModel tableModel; private KeywordList currentKeywordList; - private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); /** * Creates new form GlobalEditListPanel @@ -150,16 +147,6 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis }); } - @Override - public void addPropertyChangeListener(PropertyChangeListener l) { - pcs.addPropertyChangeListener(l); - } - - @Override - public void removePropertyChangeListener(PropertyChangeListener l) { - pcs.removePropertyChangeListener(l); - } - void setButtonStates() { boolean isIngestRunning = IngestManager.getInstance().isIngestRunning(); boolean isListSelected = currentKeywordList != null; @@ -453,7 +440,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis XmlKeywordSearchList.getCurrent().addList(currentKeywordList); chRegex.setSelected(false); addWordField.setText(""); - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); setFocusOnKeywordTextBox(); setButtonStates(); }//GEN-LAST:event_addWordButtonActionPerformed @@ -464,7 +451,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis tableModel.deleteSelected(keywordTable.getSelectedRows()); XmlKeywordSearchList.getCurrent().addList(currentKeywordList); setButtonStates(); - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } }//GEN-LAST:event_deleteWordButtonActionPerformed @@ -527,11 +514,11 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis currentKeywordList.setIngestMessages(ingestMessagesCheckbox.isSelected()); XmlKeywordSearchList updater = XmlKeywordSearchList.getCurrent(); updater.addList(currentKeywordList); - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_ingestMessagesCheckboxActionPerformed private void deleteListButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteListButtonActionPerformed - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_deleteListButtonActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java index 1f7baf6ece..8d04e2a8f6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java @@ -19,8 +19,6 @@ package org.sleuthkit.autopsy.keywordsearch; import java.awt.event.KeyEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -44,7 +42,6 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa private Logger logger = Logger.getLogger(GlobalListsManagementPanel.class.getName()); private KeywordListTableModel tableModel; - private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); private final org.sleuthkit.autopsy.keywordsearch.GlobalListSettingsPanel globalListSettingsPanel; GlobalListsManagementPanel(org.sleuthkit.autopsy.keywordsearch.GlobalListSettingsPanel gsp) { @@ -90,16 +87,6 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa */ } - @Override - public void addPropertyChangeListener(PropertyChangeListener l) { - pcs.addPropertyChangeListener(l); - } - - @Override - public void removePropertyChangeListener(PropertyChangeListener l) { - pcs.removePropertyChangeListener(l); - } - /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -220,7 +207,7 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa listsTable.getSelectionModel().addSelectionInterval(i, i); } } - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); globalListSettingsPanel.setFocusOnKeywordTextBox(); }//GEN-LAST:event_newListButtonActionPerformed @@ -316,7 +303,7 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa } } } - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_importButtonActionPerformed private void listsTableKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_listsTableKeyPressed if (evt.getKeyCode() == KeyEvent.VK_DELETE) { @@ -326,7 +313,7 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa } else if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.title"), NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.body"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN)) { String listName = (String) listsTable.getModel().getValueAt(selected[0], 0); XmlKeywordSearchList.getCurrent().deleteList(listName); - pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } else { return; }