From dc4d7051a217ffb8f45872a5b55c8ae75d0c9582 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Wed, 23 Jan 2019 16:58:29 -0500
Subject: [PATCH] 4652 fix presence of scroll bar on top explorer view showing
 datasources

---
 .../datasourceSummary/DataSourceBrowser.form          | 11 -----------
 .../datasourceSummary/DataSourceBrowser.java          |  7 +------
 .../datasourceSummary/DataSourceSummaryDialog.form    |  4 ++--
 .../datasourceSummary/DataSourceSummaryDialog.java    |  4 ++--
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.form b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.form
index f40ce46f0a..bb3b76f532 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.form
@@ -15,15 +15,4 @@
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-  <SubComponents>
-    <Container class="javax.swing.JScrollPane" name="dataSourcesScrollPane">
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-          <BorderConstraints direction="Center"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-    </Container>
-  </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.java b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.java
index 662e938aa0..440f253f53 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceBrowser.java
@@ -69,7 +69,6 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
         initComponents();
         explorerManager = new ExplorerManager();
         outlineView = new org.openide.explorer.view.OutlineView();
-        dataSourcesScrollPane.setViewportView(outlineView);
         this.setVisible(true);
         outlineView.setPropertyColumns(
                 Bundle.DataSourceSummaryNode_column_type_header(), Bundle.DataSourceSummaryNode_column_type_header(),
@@ -81,7 +80,7 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
         outline.setRootVisible(false);
         dataSourceSummaryList = getDataSourceSummaryList();
         ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.DataSourceSummaryNode_column_dataSourceName_header());
-        dataSourcesScrollPane.setViewportView(outlineView);
+        add(outlineView, java.awt.BorderLayout.CENTER);
         explorerManager.setRootContext(new DataSourceSummaryNode(dataSourceSummaryList));
         this.setVisible(true);
     }
@@ -300,10 +299,7 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        dataSourcesScrollPane = new javax.swing.JScrollPane();
-
         setLayout(new java.awt.BorderLayout());
-        add(dataSourcesScrollPane, java.awt.BorderLayout.CENTER);
     }// </editor-fold>//GEN-END:initComponents
 
     @Override
@@ -313,7 +309,6 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JScrollPane dataSourcesScrollPane;
     // End of variables declaration//GEN-END:variables
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.form b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.form
index 89a17afc68..c207379cd4 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.form
@@ -36,7 +36,7 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace min="-2" max="-2" attributes="0"/>
-              <Component id="dataSourceSummarySplitPane" pref="353" max="32767" attributes="0"/>
+              <Component id="dataSourceSummarySplitPane" pref="362" max="32767" attributes="0"/>
               <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="closeButton" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" max="-2" attributes="0"/>
@@ -57,7 +57,7 @@
     </Component>
     <Container class="javax.swing.JSplitPane" name="dataSourceSummarySplitPane">
       <Properties>
-        <Property name="dividerLocation" type="int" value="100"/>
+        <Property name="dividerLocation" type="int" value="140"/>
         <Property name="orientation" type="int" value="0"/>
       </Properties>
       <AuxValues>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.java
index 33856e21c1..00955c9bae 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/DataSourceSummaryDialog.java
@@ -96,7 +96,7 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
             }
         });
 
-        dataSourceSummarySplitPane.setDividerLocation(100);
+        dataSourceSummarySplitPane.setDividerLocation(140);
         dataSourceSummarySplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
         dataSourceSummarySplitPane.setRightComponent(dataSourceTabbedPane);
 
@@ -119,7 +119,7 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                .addComponent(dataSourceSummarySplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 353, Short.MAX_VALUE)
+                .addComponent(dataSourceSummarySplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(closeButton)
                 .addContainerGap())