From 21962d46b73f694bc8eb9ac42a5606a4be16ac03 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Wed, 7 Jun 2017 12:37:47 -0400
Subject: [PATCH] 2647 fix minor text cut off issues with metadata and hex
 panels for datacontentviewer

---
 .../org/sleuthkit/autopsy/contentviewers/Metadata.form   | 9 +++++++--
 .../org/sleuthkit/autopsy/contentviewers/Metadata.java   | 6 ++++--
 .../autopsy/corecomponents/DataContentViewerHex.form     | 9 +++++++--
 .../autopsy/corecomponents/DataContentViewerHex.java     | 6 ++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form
index d8e93ffd83..b9cd3d0fdd 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form
@@ -9,6 +9,11 @@
       </Layout>
     </Container>
   </NonVisualComponents>
+  <Properties>
+    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+      <Dimension value="[610, 52]"/>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -38,7 +43,7 @@
       <Properties>
         <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[400, 52]"/>
+          <Dimension value="[610, 52]"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -51,7 +56,7 @@
           <Properties>
             <Property name="editable" type="boolean" value="false"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[400, 52]"/>
+              <Dimension value="[600, 52]"/>
             </Property>
           </Properties>
         </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
index 3cd8cad70f..f282d7ffb2 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
@@ -59,11 +59,13 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer {
         jScrollPane2 = new javax.swing.JScrollPane();
         jTextPane1 = new javax.swing.JTextPane();
 
+        setPreferredSize(new java.awt.Dimension(610, 52));
+
         jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        jScrollPane2.setPreferredSize(new java.awt.Dimension(400, 52));
+        jScrollPane2.setPreferredSize(new java.awt.Dimension(610, 52));
 
         jTextPane1.setEditable(false);
-        jTextPane1.setPreferredSize(new java.awt.Dimension(400, 52));
+        jTextPane1.setPreferredSize(new java.awt.Dimension(600, 52));
         jScrollPane2.setViewportView(jTextPane1);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form
index 391cfd841b..acbf07db40 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form
@@ -27,7 +27,7 @@
   </NonVisualComponents>
   <Properties>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[600, 58]"/>
+      <Dimension value="[610, 58]"/>
     </Property>
   </Properties>
   <AuxValues>
@@ -62,6 +62,11 @@
   </Layout>
   <SubComponents>
     <Container class="javax.swing.JPanel" name="hexViewerPanel">
+      <Properties>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[610, 23]"/>
+        </Property>
+      </Properties>
 
       <Layout>
         <DimensionLayout dim="0">
@@ -276,7 +281,7 @@
         </Property>
         <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[602, 402]"/>
+          <Dimension value="[610, 402]"/>
         </Property>
       </Properties>
 
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
index 4b3f130bc6..a7a97e4b75 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
@@ -117,7 +117,9 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
         selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(DataContentViewerHex.class, "DataContentViewerHex.selectAllMenuItem.text")); // NOI18N
         rightClickMenu.add(selectAllMenuItem);
 
-        setPreferredSize(new java.awt.Dimension(600, 58));
+        setPreferredSize(new java.awt.Dimension(610, 58));
+
+        hexViewerPanel.setPreferredSize(new java.awt.Dimension(610, 23));
 
         totalPageLabel.setText(org.openide.util.NbBundle.getMessage(DataContentViewerHex.class, "DataContentViewerHex.totalPageLabel.text_1")); // NOI18N
 
@@ -234,7 +236,7 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
 
         jScrollPane1.setBackground(new java.awt.Color(255, 255, 255));
         jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        jScrollPane1.setPreferredSize(new java.awt.Dimension(602, 402));
+        jScrollPane1.setPreferredSize(new java.awt.Dimension(610, 402));
 
         outputViewPane.setEditable(false);
         outputViewPane.setFont(new java.awt.Font("Courier New", 0, 11)); // NOI18N