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

fixed bug where toggling between any data source and single data source on intra case search would not always run the correct algorithm

Browse Source
This commit is contained in:
Brian Sweeney 2018-08-08 18:41:51 -06:00
parent 0673c49c12
commit 93bf1b2e9c
2 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.form
View File

@ -86,9 +86,6 @@
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/> <Property name="enabled" type="boolean" value="false"/>
</Properties> </Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="selectDataSourceComboBoxActionPerformed"/>
</Events>
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/> <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
</AuxValues> </AuxValues>

36
Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java
View File

@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.swing.ComboBoxModel; import javax.swing.ComboBoxModel;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.Logger;
/** /**
* UI controls for Common Files Search scenario where the user intends to find * UI controls for Common Files Search scenario where the user intends to find
@ -38,10 +37,7 @@ public class IntraCasePanel extends javax.swing.JPanel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
static final long NO_DATA_SOURCE_SELECTED = -1; static final long NO_DATA_SOURCE_SELECTED = -1;
private static final Logger LOGGER = Logger.getLogger(CommonAttributePanel.class.getName());
private boolean singleDataSource; private boolean singleDataSource;
private String selectedDataSource;
private ComboBoxModel<String> dataSourcesList = new DataSourceComboBoxModel(); private ComboBoxModel<String> dataSourcesList = new DataSourceComboBoxModel();
private final Map<Long, String> dataSourceMap; private final Map<Long, String> dataSourceMap;
@ -54,18 +50,7 @@ public class IntraCasePanel extends javax.swing.JPanel {
initComponents(); initComponents();
this.errorMessage = ""; this.errorMessage = "";
this.dataSourceMap = new HashMap<>(); this.dataSourceMap = new HashMap<>();
} this.singleDataSource = true;
public boolean isSingleDataSource(){
return this.singleDataSource;
}
public String getSelectedDataSource(){
if(this.singleDataSource && this.selectedDataSource != null){
return selectedDataSource;
} else {
return "";
}
} }
public Map<Long, String> getDataSourceMap(){ public Map<Long, String> getDataSourceMap(){
@ -73,6 +58,10 @@ public class IntraCasePanel extends javax.swing.JPanel {
} }
Long getSelectedDataSourceId(){ Long getSelectedDataSourceId(){
if(!this.singleDataSource){
return IntraCasePanel.NO_DATA_SOURCE_SELECTED;
}
for(Entry<Long, String> entry : this.dataSourceMap.entrySet()){ for(Entry<Long, String> entry : this.dataSourceMap.entrySet()){
if(entry.getValue().equals(this.selectDataSourceComboBox.getSelectedItem())){ if(entry.getValue().equals(this.selectDataSourceComboBox.getSelectedItem())){
return entry.getKey(); return entry.getKey();
@ -115,12 +104,8 @@ public class IntraCasePanel extends javax.swing.JPanel {
}); });
selectDataSourceComboBox.setModel(dataSourcesList); selectDataSourceComboBox.setModel(dataSourcesList);
selectDataSourceComboBox.setActionCommand(org.openide.util.NbBundle.getMessage(IntraCasePanel.class, "IntraCasePanel.selectDataSourceComboBox.actionCommand")); // NOI18N
selectDataSourceComboBox.setEnabled(false); selectDataSourceComboBox.setEnabled(false);
selectDataSourceComboBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
selectDataSourceComboBoxActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
@ -158,15 +143,6 @@ public class IntraCasePanel extends javax.swing.JPanel {
withinDataSourceSelected(withinDataSourceRadioButton.isSelected()); withinDataSourceSelected(withinDataSourceRadioButton.isSelected());
}//GEN-LAST:event_withinDataSourceRadioButtonActionPerformed }//GEN-LAST:event_withinDataSourceRadioButtonActionPerformed
private void selectDataSourceComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectDataSourceComboBoxActionPerformed
final Object selectedItem = selectDataSourceComboBox.getSelectedItem();
if (selectedItem != null) {
selectedDataSource = selectedItem.toString();
} else {
selectedDataSource = "";
}
}//GEN-LAST:event_selectDataSourceComboBoxActionPerformed
private void withinDataSourceSelected(boolean selected) { private void withinDataSourceSelected(boolean selected) {
selectDataSourceComboBox.setEnabled(selected); selectDataSourceComboBox.setEnabled(selected);
if (selectDataSourceComboBox.isEnabled()) { if (selectDataSourceComboBox.isEnabled()) {