From f896b6724821ccfacbe62bed757e960f97af04fb Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Tue, 1 Dec 2020 17:26:16 -0500
Subject: [PATCH] 6985 attempt to fix resizing

---
 .../autopsy/discovery/ui/ContentViewerDetailsPanel.form      | 5 +++++
 .../autopsy/discovery/ui/ContentViewerDetailsPanel.java      | 1 +
 .../sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.form    | 2 +-
 .../sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.java    | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.form
index 2c7924e2a4..9281965410 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.form
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.4" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+      <Dimension value="[500, 0]"/>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.java
index 81e4fcaddc..9667ff94d8 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/ContentViewerDetailsPanel.java
@@ -50,6 +50,7 @@ final class ContentViewerDetailsPanel extends AbstractArtifactDetailsPanel {
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
+        setPreferredSize(new java.awt.Dimension(500, 0));
         setLayout(new java.awt.BorderLayout());
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.form b/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.form
index 0689e6b316..3e133fcf77 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.form
@@ -50,7 +50,7 @@
               <Dimension value="[0, 0]"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[0, 0]"/>
+              <Dimension value="[300, 0]"/>
             </Property>
           </Properties>
           <Constraints>
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.java
index 5283c57b83..361a0facc4 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/MiniTimelinePanel.java
@@ -56,7 +56,7 @@ class MiniTimelinePanel extends javax.swing.JPanel {
             public void valueChanged(ListSelectionEvent event) {
                 if (!event.getValueIsAdjusting()) {
                     BlackboardArtifact artifact = artifactListPanel.getSelectedArtifact();
-                    if (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_CACHE.getTypeID() || artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD.getTypeID()) {
+                    if (artifact != null && (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_CACHE.getTypeID() || artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD.getTypeID())) {
                         rightPanel = new ContentViewerDetailsPanel();
                     } else {
                         rightPanel = new GeneralPurposeArtifactViewer();
@@ -167,7 +167,7 @@ class MiniTimelinePanel extends javax.swing.JPanel {
 
         leftSplitPane.setResizeWeight(0.5);
         leftSplitPane.setMinimumSize(new java.awt.Dimension(0, 0));
-        leftSplitPane.setPreferredSize(new java.awt.Dimension(0, 0));
+        leftSplitPane.setPreferredSize(new java.awt.Dimension(300, 0));
         mainSplitPane.setLeftComponent(leftSplitPane);
 
         add(mainSplitPane, java.awt.BorderLayout.CENTER);