From f6fa07b5d5bb31fe7d69a825ef63bce8dae249f7 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 27 Oct 2020 13:08:18 -0400 Subject: [PATCH] 6773 adjust comments remove unnecessary code --- .../autopsy/discovery/ui/ArtifactsListPanel.java | 4 ++++ .../autopsy/discovery/ui/ArtifactsWorker.java | 2 +- .../autopsy/discovery/ui/DiscoveryTopComponent.form | 1 - .../autopsy/discovery/ui/DiscoveryTopComponent.java | 10 ---------- .../autopsy/discovery/ui/DomainArtifactsTabPanel.java | 8 +++++++- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java index 2d0d9e6dc7..c717efed38 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsListPanel.java @@ -92,6 +92,10 @@ class ArtifactsListPanel extends JPanel { return tableModel.getRowCount() <= 0; } + /** + * Select the first available artifact in the list if it is not empty to + * populate the panel to the right. + */ void selectFirst() { if (!isEmpty()) { jTable1.setRowSelectionInterval(0, 0); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java index fb53ec95ac..eeb6870df2 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ArtifactsWorker.java @@ -1,7 +1,7 @@ /* * Autopsy * - * Copyright 2019-2020 Basis Technology Corp. + * Copyright 2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.form b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.form index 2c828a28bc..c84525148c 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.form @@ -50,7 +50,6 @@ - diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java index 16f5b1b16e..1b51a6fa54 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryTopComponent.java @@ -149,7 +149,6 @@ public final class DiscoveryTopComponent extends TopComponent { DiscoveryEventUtils.getDiscoveryEventBus().unregister(groupListPanel); DiscoveryEventUtils.getDiscoveryEventBus().unregister(resultsPanel); DiscoveryEventUtils.getDiscoveryEventBus().unregister(rightSplitPane.getBottomComponent()); - setDetailsVisible(false); super.componentClosed(); } @@ -180,9 +179,6 @@ public final class DiscoveryTopComponent extends TopComponent { rightSplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); rightSplitPane.setResizeWeight(1.0); rightSplitPane.setPreferredSize(new java.awt.Dimension(800, 700)); - - setDetailsVisible(false); - mainSplitPane.setRightComponent(rightSplitPane); add(mainSplitPane, java.awt.BorderLayout.CENTER); @@ -293,11 +289,6 @@ public final class DiscoveryTopComponent extends TopComponent { progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchInProgress_text(searchType.name())); } - private void setDetailsVisible(boolean isVisible) { - rightSplitPane.getComponent(1).setVisible(isVisible); - rightSplitPane.getComponent(2).setVisible(isVisible); - } - /** * Subscribe to the SearchCompleteEvent for updating the UI accordingly. * @@ -324,7 +315,6 @@ public final class DiscoveryTopComponent extends TopComponent { } else { rightSplitPane.setBottomComponent(new FileDetailsPanel()); } - setDetailsVisible(true); DiscoveryEventUtils.getDiscoveryEventBus().register(rightSplitPane.getBottomComponent()); descriptionText += searchCompleteEvent.getFilters().stream().map(AbstractFilter::getDesc).collect(Collectors.joining("; ")); progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchComplete_text(descriptionText)); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainArtifactsTabPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainArtifactsTabPanel.java index 2d5bafbbc8..c793e3306e 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainArtifactsTabPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainArtifactsTabPanel.java @@ -102,10 +102,16 @@ final class DomainArtifactsTabPanel extends JPanel { void setStatus(ArtifactRetrievalStatus status) { this.status = status; if (status == ArtifactRetrievalStatus.UNPOPULATED && rightPanel != null) { - rightPanel.setArtifact(null); + rightPanel.setArtifact(null); } } + /** + * Handle the event which indicates the artifacts have been retrieved. + * + * @param artifactListEvent The event which indicates the artifacts have + * been retrieved. + */ @Subscribe void handleArtifactListRetrievedEvent(DiscoveryEventUtils.ArtifactListRetrievedEvent artifactListEvent) { SwingUtilities.invokeLater(() -> {