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

Added shortcut to timeline view, removed unnecessary hashset construction

Browse Source
This commit is contained in:
Sophie Mori 2016-10-04 17:30:37 -04:00
parent e112806bc2
commit dfdc033a52
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
View File

@ -74,9 +74,9 @@ public class AddContentTagAction extends AddTagAction {
* We don't want VirtualFile and DerivedFile objects to be tagged. * We don't want VirtualFile and DerivedFile objects to be tagged.
*/ */
final Collection<AbstractFile> selectedFiles = new HashSet<>(); final Collection<AbstractFile> selectedFiles = new HashSet<>();
selectedFiles.addAll(new HashSet<>(Utilities.actionsGlobalContext().lookupAll(FsContent.class))); selectedFiles.addAll(Utilities.actionsGlobalContext().lookupAll(FsContent.class));
selectedFiles.addAll(new HashSet<>(Utilities.actionsGlobalContext().lookupAll(LayoutFile.class))); selectedFiles.addAll(Utilities.actionsGlobalContext().lookupAll(LayoutFile.class));
selectedFiles.addAll(new HashSet<>(Utilities.actionsGlobalContext().lookupAll(LocalFile.class))); selectedFiles.addAll(Utilities.actionsGlobalContext().lookupAll(LocalFile.class));
new Thread(() -> { new Thread(() -> {
for (AbstractFile file : selectedFiles) { for (AbstractFile file : selectedFiles) {

4
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
View File

@ -109,8 +109,8 @@ public class DataResultTopComponent extends TopComponent implements DataResult,
setTitle(title); // set the title setTitle(title); // set the title
setName(title); setName(title);
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_MASK), "addBookmarkTag"); getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_MASK), "addBookmarkTag"); //NON-NLS
getActionMap().put("addBookmarkTag", new BookmarkFileAction()); getActionMap().put("addBookmarkTag", new BookmarkFileAction()); //NON-NLS
putClientProperty(TopComponent.PROP_CLOSING_DISABLED, isMain); // set option to close compoment in GUI putClientProperty(TopComponent.PROP_CLOSING_DISABLED, isMain); // set option to close compoment in GUI
putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, true); putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, true);

7
Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
View File

@ -18,6 +18,7 @@
*/ */
package org.sleuthkit.autopsy.timeline; package org.sleuthkit.autopsy.timeline;
import java.awt.event.InputEvent;
import java.beans.PropertyVetoException; import java.beans.PropertyVetoException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -35,6 +36,8 @@ import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javax.swing.JComponent;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import org.controlsfx.control.Notifications; import org.controlsfx.control.Notifications;
import org.joda.time.Interval; import org.joda.time.Interval;
@ -49,6 +52,7 @@ import org.openide.windows.Mode;
import org.openide.windows.TopComponent; import org.openide.windows.TopComponent;
import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED; import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED;
import org.openide.windows.WindowManager; import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.actions.BookmarkFileAction;
import org.sleuthkit.autopsy.corecomponents.DataContentPanel; import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
import org.sleuthkit.autopsy.corecomponents.DataResultPanel; import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
@ -200,6 +204,9 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
setToolTipText(NbBundle.getMessage(TimeLineTopComponent.class, "HINT_TimeLineTopComponent")); setToolTipText(NbBundle.getMessage(TimeLineTopComponent.class, "HINT_TimeLineTopComponent"));
setIcon(WindowManager.getDefault().getMainWindow().getIconImage()); //use the same icon as main application setIcon(WindowManager.getDefault().getMainWindow().getIconImage()); //use the same icon as main application
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_B, InputEvent.CTRL_MASK), "addBookmarkTag"); //NON-NLS
getActionMap().put("addBookmarkTag", new BookmarkFileAction()); //NON-NLS
this.controller = controller; this.controller = controller;
//create linked result and content views //create linked result and content views

2
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
View File

@ -225,7 +225,7 @@ public class DrawableTagsManager {
try { try {
return autopsyTagsManager.addTagName(displayName); return autopsyTagsManager.addTagName(displayName);
} catch (TagsManager.TagNameAlreadyExistsException ex) { } catch (TagsManager.TagNameAlreadyExistsException ex) {
throw new TskCoreException("tagame exists but wasn't found", ex); throw new TskCoreException("tag name exists but wasn't found", ex);
} }
} catch (NullPointerException | IllegalStateException ex) { } catch (NullPointerException | IllegalStateException ex) {
LOGGER.log(Level.SEVERE, "Case was closed out from underneath", ex); //NON-NLS LOGGER.log(Level.SEVERE, "Case was closed out from underneath", ex); //NON-NLS