From b137b342b77e2a0c8105ece601d16450cefabc2c Mon Sep 17 00:00:00 2001 From: Dick Fickling Date: Thu, 19 Jan 2012 13:44:32 -0500 Subject: [PATCH] resize "Text View" text area to match other content viewers, reset match count on new file selection --- .../autopsy/keywordsearch/ExtractedContentPanel.form | 4 ++-- .../autopsy/keywordsearch/ExtractedContentPanel.java | 12 ++++++++++-- .../keywordsearch/ExtractedContentViewer.java | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form index 1f8c206d52..8dd5ac4c53 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form @@ -53,8 +53,8 @@ - - + + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java index 079fd35179..426140f34c 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java @@ -135,8 +135,8 @@ class ExtractedContentPanel extends javax.swing.JPanel { .addComponent(hitCountLabel)) .addComponent(hitPreviousButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(hitNextButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 287, Short.MAX_VALUE)) + .addGap(0, 0, 0) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 293, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables @@ -220,6 +220,14 @@ class ExtractedContentPanel extends javax.swing.JPanel { public void updateTotalDisplay(int total) { hitTotalLabel.setText(Integer.toString(total)); } + + /** + * reset the current/total display + */ + public void resetHitDisplay() { + hitTotalLabel.setText("-"); + hitCountLabel.setText("-"); + } /** * enable previous match control diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java index 6ec0ab0902..46dd5dd973 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java @@ -138,6 +138,7 @@ public class ExtractedContentViewer implements DataContentViewer { @Override public void resetComponent() { setPanel(Collections.EMPTY_LIST); + panel.resetHitDisplay(); } @Override