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

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into kws_open_core_error_handling

Browse Source
This commit is contained in:
Richard Cordovano 2015-10-26 11:45:44 -04:00
commit 3bff5a7b8e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
View File

@ -60,7 +60,6 @@ import org.joda.time.ReadablePeriod;
import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatter;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import static org.sleuthkit.autopsy.casemodule.Case.Events.CURRENT_CASE; import static org.sleuthkit.autopsy.casemodule.Case.Events.CURRENT_CASE;
import static org.sleuthkit.autopsy.casemodule.Case.Events.DATA_SOURCE_ADDED; import static org.sleuthkit.autopsy.casemodule.Case.Events.DATA_SOURCE_ADDED;
@ -546,16 +545,11 @@ public class TimeLineController {
/** /**
* private method to build gui if necessary and make it visible. * private method to build gui if necessary and make it visible.
*/ */
private void showWindow() { synchronized private void showWindow() {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
synchronized (TimeLineController.this) { synchronized (TimeLineController.this) {
if (mainFrame == null) { if (mainFrame == null) {
LOGGER.log(Level.WARNING, "Tried to show timeline with invalid window. Rebuilding GUI."); // NON-NLS mainFrame = new TimeLineTopComponent(this);
mainFrame = (TimeLineTopComponent) WindowManager.getDefault().findTopComponent(
NbBundle.getMessage(TimeLineController.class, "CTL_TimeLineTopComponentAction"));
if (mainFrame == null) {
mainFrame = new TimeLineTopComponent(this);
}
} }
mainFrame.open(); mainFrame.open();
mainFrame.toFront(); mainFrame.toFront();

1
Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailsChart.java
View File

@ -661,6 +661,7 @@ public final class EventDetailsChart extends XYChart<DateTime, EventCluster> imp
HideDescriptionAction(String description, DescriptionLoD descriptionLoD) { HideDescriptionAction(String description, DescriptionLoD descriptionLoD) {
super("Hide"); super("Hide");
setLongText("Hide this group from the details view.");
setGraphic(new ImageView(HIDE)); setGraphic(new ImageView(HIDE));
setEventHandler((ActionEvent t) -> { setEventHandler((ActionEvent t) -> {
final DescriptionFilter testFilter = new DescriptionFilter( final DescriptionFilter testFilter = new DescriptionFilter(