From 5cf5159ff9990c51c00a622e9b072cce3a5ede08 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Fri, 4 May 2018 17:49:38 -0400 Subject: [PATCH] Restore ability to have a result view panel with no content view --- .../corecomponents/DataResultPanel.java | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java index 1e98e40a43..91a4493411 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java @@ -142,8 +142,8 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C * contains instances of the result viewers (DataResultViewer) provided by * the result viewer extension point (service providers that implement * DataResultViewer). The result view panel will push single node selections - * from its child result viewers to the supplied custom content view, which - * can be null if a content view is not needed. + * from its child result viewers to the supplied content view, which can be + * null if a content view is not needed. * * @param title The title for the result view panel. * @param description Descriptive text about the source of the nodes @@ -151,11 +151,7 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C * @param currentRootNode The current root (parent) node for the nodes * displayed. May be changed by calling setNode. * @param childNodeCount The cardinality of the root node's children. - * @param customContentView A custom content view to use instead of the - * "main" content view that is normally docked into - * the lower right hand side of the main - * application window. May be null, if no content - * view is needed. + * @param customContentView A content view,mMay be null. * * @return A result view panel. */ @@ -215,24 +211,24 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C * contains a collection of result viewers that is either supplied or * provided by the result viewer extension point. * - * @param title The title of the result view panel. - * @param isMain Whether or not the result view panel is the - * "main" instance of the panel that resides in the - * "main" results view (DataResultTopComponent) - * that is normally docked into the upper right - * hand side of the main application window. - * @param viewers A collection of result viewers to use instead of - * the result viewers provided by the results - * viewer extension point, may be empty. - * @param customContentView A custom content view to use instead of the - * "main" content view that is normally docked into - * the lower right hand side of the main - * application window, may be null. + * @param title The title of the result view panel. + * @param isMain Whether or not the result view panel is the "main" + * instance of the panel that resides in the "main" + * results view (DataResultTopComponent) that is normally + * docked into the upper right hand side of the main + * application window. + * @param viewers A collection of result viewers to use instead of the + * result viewers provided by the results viewer + * extension point, may be empty. + * @param contentView A custom content view to use instead of the "main" + * content view that is normally docked into the lower + * right hand side of the main application window, may be + * null. */ - DataResultPanel(String title, boolean isMain, Collection viewers, DataContent customContentView) { + DataResultPanel(String title, boolean isMain, Collection viewers, DataContent contentView) { this.setTitle(title); this.isMain = isMain; - this.contentView = customContentView; + this.contentView = contentView; this.resultViewers = new ArrayList<>(viewers); this.explorerManagerListener = new ExplorerManagerListener(); this.rootNodeListener = new RootNodeListener();