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

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2461-DisableMenuForAutoIngest

Browse Source
This commit is contained in:
William Schaefer 2017-04-07 11:56:04 -04:00
commit 0020d9f5a2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
View File

@ -501,8 +501,6 @@ final class LocalDiskPanel extends JPanel {
*/ */
private class LocalDiskModel implements TableModel { private class LocalDiskModel implements TableModel {
private List<LocalDisk> physicalDrives = new ArrayList<>();
private List<LocalDisk> partitions = new ArrayList<>();
private LocalDiskThread worker = null; private LocalDiskThread worker = null;
private boolean ready = false; private boolean ready = false;
private volatile boolean loadingDisks = false; private volatile boolean loadingDisks = false;
@ -609,6 +607,8 @@ final class LocalDiskPanel extends JPanel {
class LocalDiskThread extends SwingWorker<Object, Void> { class LocalDiskThread extends SwingWorker<Object, Void> {
private final Logger logger = Logger.getLogger(LocalDiskThread.class.getName()); private final Logger logger = Logger.getLogger(LocalDiskThread.class.getName());
private List<LocalDisk> physicalDrives = new ArrayList<>();
private List<LocalDisk> partitions = new ArrayList<>();
@Override @Override
protected Object doInBackground() throws Exception { protected Object doInBackground() throws Exception {
@ -674,10 +674,6 @@ final class LocalDiskPanel extends JPanel {
pathTextField.setText(""); pathTextField.setText("");
fireUpdateEvent(); fireUpdateEvent();
ready = true; ready = true;
} else {
//this should not be possible but happens
//possible threading error when this method is called while running
logger.log(Level.INFO, "Loading local disks was canceled"); //NON-NLS
} }
} }
diskTable.revalidate(); diskTable.revalidate();

4
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
View File

@ -125,6 +125,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
} }
} }
@NbBundle.Messages("GlobalEditListPanel.editKeyword.title=Edit Keyword")
/** /**
* Adds keywords to a keyword list, returns true if at least one keyword was successfully added and no * Adds keywords to a keyword list, returns true if at least one keyword was successfully added and no
* duplicates were found. * duplicates were found.
@ -139,6 +140,9 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
int dupeCount = 0; int dupeCount = 0;
int badCount = 1; // Default to 1 so we enter the loop the first time int badCount = 1; // Default to 1 so we enter the loop the first time
if (!existingKeywords.isEmpty()){ //if there is an existing keyword then this action was called by the edit button
dialog.setTitle(NbBundle.getMessage(GlobalEditListPanel.class, "GlobalEditListPanel.editKeyword.title"));
}
while (badCount > 0) { while (badCount > 0) {
dialog.setInitialKeywordList(keywordsToRedisplay, isLiteral, isWholeWord); dialog.setInitialKeywordList(keywordsToRedisplay, isLiteral, isWholeWord);
dialog.display(); dialog.display();