diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 2c82f1327c..10fd73991a 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -50,5 +50,7 @@ ExtractedContentPanel.pageTotalLabel.text=-
ExtractedContentPanel.hitLabel.toolTipText=
KeywordSearchEditListPanel.ingestMessagesCheckbox.text=Send messages during triage / ingest
KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=Send messages during triage / ingest when hits on keyword from this list occur
-KeywordSearchListsManagementPanel.skipNSRLCheckBox.text=Skip files in NSRL
-KeywordSearchListsManagementPanel.skipNSRLCheckBox.toolTipText=Please make sure you have either selected to run or have previously run the Hash DB Ingest Service.
+KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text=Skip files in NSRL
+KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Please make sure you have either selected to run or have previously run the Hash DB Ingest Service.
+KeywordSearchConfigurationPanel2.filesIndexedValue.text=-
+KeywordSearchConfigurationPanel2.filesIndexedLabel.text=Files indexed:
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form
index d88483b1ff..2f3a898c5a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form
@@ -1,6 +1,6 @@
-
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java
index 298045c0ff..e79b446182 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2012 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,34 +17,19 @@
* limitations under the License.
*/
-/*
- * KeywordSearchConfigurationPanel.java
- *
- * Created on Feb 28, 2012, 4:12:47 PM
- */
package org.sleuthkit.autopsy.keywordsearch;
-import java.util.logging.Logger;
-import org.sleuthkit.autopsy.ingest.IngestManager;
-
/**
- *
- * @author dfickling
+ * Container for KeywordSearchConfigurationPanelX tabs
*/
public class KeywordSearchConfigurationPanel extends javax.swing.JPanel {
-
- KeywordSearchListsManagementPanel listsManagementPanel;
- KeywordSearchEditListPanel editListPanel;
- private static final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel.class.getName());
- private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig");
- private static KeywordSearchConfigurationPanel instance;
+ private static KeywordSearchConfigurationPanel instance = null;
+
/** Creates new form KeywordSearchConfigurationPanel */
- private KeywordSearchConfigurationPanel() {
-
+ public KeywordSearchConfigurationPanel() {
initComponents();
customizeComponents();
- setName(KEYWORD_CONFIG_NAME);
}
public static KeywordSearchConfigurationPanel getDefault() {
@@ -52,17 +37,12 @@ public class KeywordSearchConfigurationPanel extends javax.swing.JPanel {
instance = new KeywordSearchConfigurationPanel();
return instance;
}
-
+
private void customizeComponents() {
- listsManagementPanel = KeywordSearchListsManagementPanel.getDefault();
- editListPanel = KeywordSearchEditListPanel.getDefault();
-
- listsManagementPanel.addListSelectionListener(editListPanel);
+ setName("Keyword List Configuration");
+ tabbedPane.insertTab("Lists", null, KeywordSearchConfigurationPanel1.getDefault(), "List configuration", 0);
+ tabbedPane.insertTab("General", null, KeywordSearchConfigurationPanel2.getDefault(), "General configuration", 1);
- mainSplitPane.setLeftComponent(listsManagementPanel);
- mainSplitPane.setRightComponent(editListPanel);
- mainSplitPane.revalidate();
- mainSplitPane.repaint();
}
/** This method is called from within the constructor to
@@ -74,51 +54,20 @@ public class KeywordSearchConfigurationPanel extends javax.swing.JPanel {
// //GEN-BEGIN:initComponents
private void initComponents() {
- mainSplitPane = new javax.swing.JSplitPane();
- jPanel1 = new javax.swing.JPanel();
- jPanel2 = new javax.swing.JPanel();
- javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
- jPanel1.setLayout(jPanel1Layout);
- jPanel1Layout.setHorizontalGroup(
- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 100, Short.MAX_VALUE)
- );
- jPanel1Layout.setVerticalGroup(
- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 242, Short.MAX_VALUE)
- );
-
- mainSplitPane.setLeftComponent(jPanel1);
-
- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
- jPanel2.setLayout(jPanel2Layout);
- jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 291, Short.MAX_VALUE)
- );
- jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 242, Short.MAX_VALUE)
- );
-
- mainSplitPane.setRightComponent(jPanel2);
+ tabbedPane = new javax.swing.JTabbedPane();
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(mainSplitPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(mainSplitPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
);
}// //GEN-END:initComponents
-
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JSplitPane mainSplitPane;
+ private javax.swing.JTabbedPane tabbedPane;
// End of variables declaration//GEN-END:variables
-
}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.form
new file mode 100644
index 0000000000..d88483b1ff
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.form
@@ -0,0 +1,76 @@
+
+
+
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java
new file mode 100644
index 0000000000..f44355b7ff
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java
@@ -0,0 +1,125 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * KeywordSearchConfigurationPanel1.java
+ *
+ * Created on Feb 28, 2012, 4:12:47 PM
+ */
+package org.sleuthkit.autopsy.keywordsearch;
+
+import java.util.logging.Logger;
+import org.sleuthkit.autopsy.ingest.IngestManager;
+
+/**
+ *
+ * @author dfickling
+ */
+public class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel {
+
+ KeywordSearchListsManagementPanel listsManagementPanel;
+ KeywordSearchEditListPanel editListPanel;
+ private static final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel1.class.getName());
+ private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig");
+ private static KeywordSearchConfigurationPanel1 instance;
+
+ /** Creates new form KeywordSearchConfigurationPanel1 */
+ private KeywordSearchConfigurationPanel1() {
+
+ initComponents();
+ customizeComponents();
+ setName(KEYWORD_CONFIG_NAME);
+ }
+
+ public static KeywordSearchConfigurationPanel1 getDefault() {
+ if(instance == null)
+ instance = new KeywordSearchConfigurationPanel1();
+ return instance;
+ }
+
+ private void customizeComponents() {
+ listsManagementPanel = KeywordSearchListsManagementPanel.getDefault();
+ editListPanel = KeywordSearchEditListPanel.getDefault();
+
+ listsManagementPanel.addListSelectionListener(editListPanel);
+
+ mainSplitPane.setLeftComponent(listsManagementPanel);
+ mainSplitPane.setRightComponent(editListPanel);
+ mainSplitPane.revalidate();
+ mainSplitPane.repaint();
+ }
+
+ /** 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 regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ mainSplitPane = new javax.swing.JSplitPane();
+ jPanel1 = new javax.swing.JPanel();
+ jPanel2 = new javax.swing.JPanel();
+
+ javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
+ jPanel1.setLayout(jPanel1Layout);
+ jPanel1Layout.setHorizontalGroup(
+ jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 100, Short.MAX_VALUE)
+ );
+ jPanel1Layout.setVerticalGroup(
+ jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 242, Short.MAX_VALUE)
+ );
+
+ mainSplitPane.setLeftComponent(jPanel1);
+
+ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+ jPanel2.setLayout(jPanel2Layout);
+ jPanel2Layout.setHorizontalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 291, Short.MAX_VALUE)
+ );
+ jPanel2Layout.setVerticalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 242, Short.MAX_VALUE)
+ );
+
+ mainSplitPane.setRightComponent(jPanel2);
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(mainSplitPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(mainSplitPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ );
+ }// //GEN-END:initComponents
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JPanel jPanel1;
+ private javax.swing.JPanel jPanel2;
+ private javax.swing.JSplitPane mainSplitPane;
+ // End of variables declaration//GEN-END:variables
+
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form
new file mode 100644
index 0000000000..f51e2984b1
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form
@@ -0,0 +1,82 @@
+
+
+
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java
new file mode 100644
index 0000000000..3f4fb82ee3
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java
@@ -0,0 +1,147 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2012 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.keywordsearch;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.solr.client.solrj.SolrServerException;
+
+/**
+ *
+ * General, not per list, keyword search configuration and status display widget
+ */
+public class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel {
+
+ private static KeywordSearchConfigurationPanel2 instance = null;
+ private final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel2.class.getName());
+
+ /** Creates new form KeywordSearchConfigurationPanel2 */
+ public KeywordSearchConfigurationPanel2() {
+ initComponents();
+ customizeComponents();
+ }
+
+ public static KeywordSearchConfigurationPanel2 getDefault() {
+ if (instance == null) {
+ instance = new KeywordSearchConfigurationPanel2();
+ }
+ return instance;
+ }
+
+ /** 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 regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ skipNSRLCheckBox = new javax.swing.JCheckBox();
+ filesIndexedLabel = new javax.swing.JLabel();
+ filesIndexedValue = new javax.swing.JLabel();
+ jSeparator1 = new javax.swing.JSeparator();
+
+ skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text")); // NOI18N
+ skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText")); // NOI18N
+ skipNSRLCheckBox.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ skipNSRLCheckBoxActionPerformed(evt);
+ }
+ });
+
+ filesIndexedLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.filesIndexedLabel.text")); // NOI18N
+
+ filesIndexedValue.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.filesIndexedValue.text")); // NOI18N
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(filesIndexedLabel)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(filesIndexedValue, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(285, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(skipNSRLCheckBox)
+ .addContainerGap(289, Short.MAX_VALUE))
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(19, 19, 19)
+ .addComponent(skipNSRLCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(filesIndexedLabel)
+ .addComponent(filesIndexedValue))
+ .addContainerGap(226, Short.MAX_VALUE))
+ );
+ }// //GEN-END:initComponents
+
+private void skipNSRLCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipNSRLCheckBoxActionPerformed
+ KeywordSearchIngestService.getDefault().setSkipKnown(skipNSRLCheckBox.isSelected());
+}//GEN-LAST:event_skipNSRLCheckBoxActionPerformed
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JLabel filesIndexedLabel;
+ private javax.swing.JLabel filesIndexedValue;
+ private javax.swing.JSeparator jSeparator1;
+ private javax.swing.JCheckBox skipNSRLCheckBox;
+ // End of variables declaration//GEN-END:variables
+
+ private void customizeComponents() {
+ this.skipNSRLCheckBox.setSelected(KeywordSearchIngestService.getDefault().getSkipKnown());
+
+ try {
+ filesIndexedValue.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedFiles()));
+ } catch (SolrServerException ex) {
+ logger.log(Level.WARNING, "Could not get number of indexed files");
+
+ } catch (NoOpenCoreException ex) {
+ logger.log(Level.WARNING, "Could not get number of indexed files");
+ }
+
+ KeywordSearch.changeSupport.addPropertyChangeListener(KeywordSearch.NUM_FILES_CHANGE_EVT,
+ new PropertyChangeListener() {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ String changed = evt.getPropertyName();
+ Object newValue = evt.getNewValue();
+
+ if (changed.equals(KeywordSearch.NUM_FILES_CHANGE_EVT)) {
+ int newFilesIndexed = ((Integer) newValue).intValue();
+ filesIndexedValue.setText(Integer.toString(newFilesIndexed));
+
+ }
+ }
+ });
+
+
+
+ }
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form
index 536a1b4ca7..54124bc461 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form
@@ -26,7 +26,6 @@
-
@@ -48,8 +47,7 @@
-
-
+
@@ -104,19 +102,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
index 6fa2ce3951..43ed99cc80 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
@@ -96,7 +96,6 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
}
}
});
- this.skipNSRLCheckBox.setSelected(KeywordSearchIngestService.getDefault().getSkipKnown());
}
@@ -113,7 +112,6 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
listsTable = new javax.swing.JTable();
newListButton = new javax.swing.JButton();
importButton = new javax.swing.JButton();
- skipNSRLCheckBox = new javax.swing.JCheckBox();
setMinimumSize(new java.awt.Dimension(200, 0));
setPreferredSize(new java.awt.Dimension(200, 297));
@@ -145,22 +143,12 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
}
});
- skipNSRLCheckBox.setSelected(true);
- skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchListsManagementPanel.class, "KeywordSearchListsManagementPanel.skipNSRLCheckBox.text")); // NOI18N
- skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchListsManagementPanel.class, "KeywordSearchListsManagementPanel.skipNSRLCheckBox.toolTipText")); // NOI18N
- skipNSRLCheckBox.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- skipNSRLCheckBoxActionPerformed(evt);
- }
- });
-
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(skipNSRLCheckBox)
.addGroup(layout.createSequentialGroup()
.addGap(18, 18, 18)
.addComponent(newListButton)
@@ -177,8 +165,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(newListButton)
.addComponent(importButton))
- .addGap(2, 2, 2)
- .addComponent(skipNSRLCheckBox))
+ .addGap(25, 25, 25))
);
}// //GEN-END:initComponents
@@ -293,10 +280,6 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
}
}//GEN-LAST:event_importButtonActionPerformed
- private void skipNSRLCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipNSRLCheckBoxActionPerformed
- KeywordSearchIngestService.getDefault().setSkipKnown(skipNSRLCheckBox.isSelected());
- }//GEN-LAST:event_skipNSRLCheckBoxActionPerformed
-
private void listsTableKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_listsTableKeyPressed
if(evt.getKeyCode() == KeyEvent.VK_DELETE) {
int[] selected = listsTable.getSelectedRows();
@@ -314,7 +297,6 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTable listsTable;
private javax.swing.JButton newListButton;
- private javax.swing.JCheckBox skipNSRLCheckBox;
// End of variables declaration//GEN-END:variables