From 19c15deac2a04d176ae7926c953787b3044e8add Mon Sep 17 00:00:00 2001 From: Dick Fickling Date: Wed, 21 Mar 2012 17:36:09 -0400 Subject: [PATCH 1/2] Disable setting focus policy --- .../src/org/sleuthkit/autopsy/report/reportPanel.form | 11 ++++------- .../src/org/sleuthkit/autopsy/report/reportPanel.java | 6 ++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Report/src/org/sleuthkit/autopsy/report/reportPanel.form b/Report/src/org/sleuthkit/autopsy/report/reportPanel.form index 39a8765e76..624e825e98 100644 --- a/Report/src/org/sleuthkit/autopsy/report/reportPanel.form +++ b/Report/src/org/sleuthkit/autopsy/report/reportPanel.form @@ -7,9 +7,6 @@ - - - @@ -49,14 +46,14 @@ - - - + + + - + diff --git a/Report/src/org/sleuthkit/autopsy/report/reportPanel.java b/Report/src/org/sleuthkit/autopsy/report/reportPanel.java index c03e38ccfe..4be6b4eb90 100644 --- a/Report/src/org/sleuthkit/autopsy/report/reportPanel.java +++ b/Report/src/org/sleuthkit/autopsy/report/reportPanel.java @@ -44,8 +44,6 @@ public class reportPanel extends javax.swing.JPanel { jButton1 = new javax.swing.JButton(); saveReport = new javax.swing.JButton(); - setFocusTraversalPolicyProvider(true); - jEditorPane1.setContentType(org.openide.util.NbBundle.getMessage(reportPanel.class, "reportPanel.jEditorPane1.contentType")); // NOI18N jEditorPane1.setEditable(false); jScrollPane1.setViewportView(jEditorPane1); @@ -79,12 +77,12 @@ public class reportPanel extends javax.swing.JPanel { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 599, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 547, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jButton1) .addComponent(saveReport)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap()) ); getAccessibleContext().setAccessibleName(""); From e8f73ecea60bd3ce3a23c7f04b74f3d61880b058 Mon Sep 17 00:00:00 2001 From: Alex Ebadirad Date: Wed, 21 Mar 2012 15:07:46 -0700 Subject: [PATCH 2/2] Bug fix to the stack overflow issue Signed-off-by: Alex Ebadirad --- Report/src/org/sleuthkit/autopsy/report/reportFilter.form | 7 +++++-- Report/src/org/sleuthkit/autopsy/report/reportFilter.java | 5 +++-- .../org/sleuthkit/autopsy/report/reportPanelAction.java | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Report/src/org/sleuthkit/autopsy/report/reportFilter.form b/Report/src/org/sleuthkit/autopsy/report/reportFilter.form index 8c3a8123f9..d6a44ab924 100644 --- a/Report/src/org/sleuthkit/autopsy/report/reportFilter.form +++ b/Report/src/org/sleuthkit/autopsy/report/reportFilter.form @@ -81,11 +81,11 @@ - - + + @@ -154,6 +154,9 @@ + + + diff --git a/Report/src/org/sleuthkit/autopsy/report/reportFilter.java b/Report/src/org/sleuthkit/autopsy/report/reportFilter.java index f3404291f0..0af6be7cbb 100644 --- a/Report/src/org/sleuthkit/autopsy/report/reportFilter.java +++ b/Report/src/org/sleuthkit/autopsy/report/reportFilter.java @@ -91,6 +91,7 @@ public class reportFilter extends javax.swing.JPanel { progBar.setEnabled(false); progBar.setName(""); // NOI18N + progBar.setPreferredSize(new java.awt.Dimension(146, 23)); cancelButton.setText(org.openide.util.NbBundle.getMessage(reportFilter.class, "reportFilter.cancelButton.text")); // NOI18N cancelButton.setActionCommand(org.openide.util.NbBundle.getMessage(reportFilter.class, "reportFilter.cancelButton.actionCommand")); // NOI18N @@ -144,10 +145,10 @@ public class reportFilter extends javax.swing.JPanel { .addComponent(jCheckBox3) .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(progBar, javax.swing.GroupLayout.DEFAULT_SIZE, 23, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addComponent(cancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(progBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap()) ); }// //GEN-END:initComponents diff --git a/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java b/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java index 9d3dc3f8c5..44bfac8e3a 100644 --- a/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java +++ b/Report/src/org/sleuthkit/autopsy/report/reportPanelAction.java @@ -96,9 +96,9 @@ public class reportPanelAction { }); // add the panel to the popup window popUpWindow.add(panel); - popUpWindow.pack(); + popUpWindow.setResizable(true); - + popUpWindow.pack(); // set the location of the popUp Window on the center of the screen Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize(); double w = popUpWindow.getSize().getWidth();