diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java index 441187f752..5868c7fb44 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java @@ -90,7 +90,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { column = listsTable.getColumnModel().getColumn(i); if (i == 0) { column.setPreferredWidth(((int) (leftWidth * 0.10))); - column.setCellRenderer(new CheckBoxRenderer()); + column.setCellRenderer(new LeftCheckBoxRenderer()); } else { column.setPreferredWidth(((int) (leftWidth * 0.89))); } @@ -102,6 +102,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { column.setPreferredWidth(((int) (rightWidth * 0.84))); } else { column.setPreferredWidth(((int) (rightWidth * 0.15))); + column.setCellRenderer(new RightCheckBoxRenderer()); } } @@ -612,7 +613,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { } } - private class CheckBoxRenderer extends JCheckBox implements TableCellRenderer{ + private class LeftCheckBoxRenderer extends JCheckBox implements TableCellRenderer{ @Override public Component getTableCellRendererComponent( @@ -638,4 +639,27 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { return this; } } + + private class RightCheckBoxRenderer extends JCheckBox implements TableCellRenderer{ + + @Override + public Component getTableCellRendererComponent( + JTable table, Object value, + boolean isSelected, boolean hasFocus, + int row, int column) { + + this.setHorizontalAlignment(JCheckBox.CENTER); + this.setVerticalAlignment(JCheckBox.CENTER); + + Boolean selected = (Boolean) table.getModel().getValueAt(row, 1); + setSelected(selected); + if(isSelected) + setBackground(keywordsTable.getSelectionBackground()); + else + setBackground(keywordsTable.getBackground()); + setEnabled(false); + + return this; + } + } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java index 01778abf56..fb31e7d953 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java @@ -116,10 +116,10 @@ public class KeywordSearchListsXML { urls.add(new Keyword("ftp|sftp|ssh|http|https|www", false)); - addList("Phone Numbers", phones, true, true); - addList("IP Addresses", ips, true, true); - addList("Email Addresses", emails, true, true); - addList("URLs", urls, true, true); + addList("Phone Numbers", phones, false, true); + addList("IP Addresses", ips, false, true); + addList("Email Addresses", emails, false, true); + addList("URLs", urls, false, true); } /**