From d6e0366c735ba3fd12854e6d0897a41670efaa4c Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Mon, 27 Jan 2014 16:25:11 -0500 Subject: [PATCH] Reformatted code. --- .../keywordsearch/AbstractFileChunk.java | 10 +- .../keywordsearch/AbstractFileExtract.java | 75 ++-- .../AbstractFileHtmlExtract.java | 11 +- .../AbstractFileStringContentStream.java | 8 +- .../AbstractFileStringExtract.java | 13 +- .../AbstractFileStringIntStream.java | 56 +-- .../AbstractFileStringStream.java | 24 +- .../AbstractFileTikaTextExtract.java | 24 +- .../AbstractKeywordSearchPerformer.java | 30 +- .../keywordsearch/ByteContentStream.java | 20 +- .../autopsy/keywordsearch/ContentHit.java | 6 +- .../keywordsearch/ExtractedContentPanel.java | 375 ++++++++++-------- .../keywordsearch/ExtractedContentViewer.java | 38 +- .../HighlightedMatchesSource.java | 10 +- .../autopsy/keywordsearch/Ingester.java | 80 ++-- .../autopsy/keywordsearch/Installer.java | 15 +- .../keywordsearch/JerichoParserWrapper.java | 46 ++- .../autopsy/keywordsearch/Keyword.java | 26 +- .../keywordsearch/KeywordQueryFilter.java | 9 +- .../autopsy/keywordsearch/KeywordSearch.java | 10 +- .../keywordsearch/KeywordSearchAction.java | 1 + .../KeywordSearchConfigurationAction.java | 14 +- .../KeywordSearchConfigurationPanel.java | 42 +- .../KeywordSearchConfigurationPanel1.java | 83 ++-- .../KeywordSearchConfigurationPanel2.java | 64 +-- .../KeywordSearchConfigurationPanel3.java | 113 +++--- .../KeywordSearchEditListPanel.java | 216 ++++++---- .../KeywordSearchFilterNode.java | 19 +- .../KeywordSearchIngestModule.java | 252 +++++++----- .../KeywordSearchIngestSimplePanel.java | 85 ++-- .../KeywordSearchListsAbstract.java | 72 ++-- .../KeywordSearchListsEncase.java | 90 +++-- .../KeywordSearchListsManagementPanel.java | 185 +++++---- .../KeywordSearchListsViewerPanel.java | 50 ++- .../keywordsearch/KeywordSearchListsXML.java | 39 +- .../KeywordSearchModuleException.java | 4 +- .../KeywordSearchOptionsPanelController.java | 14 +- .../keywordsearch/KeywordSearchPanel.java | 100 +++-- .../KeywordSearchPerformerInterface.java | 31 +- .../keywordsearch/KeywordSearchQuery.java | 49 ++- .../KeywordSearchQueryManager.java | 30 +- .../KeywordSearchResultFactory.java | 89 +++-- .../keywordsearch/KeywordSearchSettings.java | 166 ++++---- .../keywordsearch/KeywordSearchUtil.java | 14 +- .../keywordsearch/KeywordWriteResult.java | 1 + .../autopsy/keywordsearch/KeywordsSchema.xsd | 14 +- .../autopsy/keywordsearch/LuceneQuery.java | 67 ++-- .../autopsy/keywordsearch/MarkupSource.java | 68 ++-- .../keywordsearch/NoOpenCoreException.java | 3 +- .../autopsy/keywordsearch/Server.java | 118 +++--- .../keywordsearch/TermComponentQuery.java | 19 +- .../keywordsearch/TextLanguageIdentifier.java | 6 +- .../keywordsearch/TikaLanguageIdentifier.java | 7 +- .../keywordsearch/docs/package-info.java | 4 +- .../sleuthkit/autopsy/keywordsearch/layer.xml | 19 +- 55 files changed, 1791 insertions(+), 1243 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java index 9e5e0a2da2..88ce54707c 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java @@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.nio.charset.Charset; + import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException; /** @@ -51,7 +52,8 @@ class AbstractFileChunk { return Server.getChunkIdString(this.parent.getSourceFile().getId(), this.chunkID); } - public boolean index(Ingester ingester, byte[] content, long contentSize, Charset indexCharset) throws IngesterException { + public boolean index(Ingester ingester, byte[] content, long contentSize, Charset indexCharset) + throws IngesterException { boolean success = true; ByteContentStream bcs = new ByteContentStream(content, contentSize, parent.getSourceFile(), indexCharset); try { @@ -59,9 +61,11 @@ class AbstractFileChunk { //logger.log(Level.INFO, "Ingesting string chunk: " + this.getName() + ": " + chunkID); } catch (Exception ingEx) { success = false; - throw new IngesterException("Problem ingesting file string chunk: " + parent.getSourceFile().getId() + ", chunk: " + chunkID, ingEx); + throw new IngesterException("Problem ingesting file string chunk: " + + parent.getSourceFile().getId() + + ", chunk: " + chunkID, ingEx); } return success; } - + } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java index dcb8b25728..41fa61801d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.util.Arrays; import java.util.List; import java.util.Map; + import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.datamodel.AbstractFile; @@ -37,44 +38,46 @@ interface AbstractFileExtract { EXTRACT_UTF16, ///< extract UTF16 text, possible values Boolean.TRUE.toString(), Boolean.FALSE.toString() EXTRACT_UTF8, ///< extract UTF8 text, possible values Boolean.TRUE.toString(), Boolean.FALSE.toString() - }; - + } + + ; + //generally text extractors should ignore archives //and let unpacking modules take case of them static final List ARCHIVE_MIME_TYPES = Arrays.asList( - //ignore unstructured binary and compressed data, for which string extraction or unzipper works better - "application/x-7z-compressed", - "application/x-ace-compressed", - "application/x-alz-compressed", - "application/x-arj", - "application/vnd.ms-cab-compressed", - "application/x-cfs-compressed", - "application/x-dgc-compressed", - "application/x-apple-diskimage", - "application/x-gca-compressed", - "application/x-dar", - "application/x-lzx", - "application/x-lzh", - "application/x-rar-compressed", - "application/x-stuffit", - "application/x-stuffitx", - "application/x-gtar", - "application/x-archive", - "application/x-executable", - "application/x-gzip", - "application/zip", - "application/x-zoo", - "application/x-cpio", - "application/x-shar", - "application/x-tar", - "application/x-bzip", - "application/x-bzip2", - "application/x-lzip", - "application/x-lzma", - "application/x-lzop", - "application/x-z", - "application/x-compress"); + //ignore unstructured binary and compressed data, for which string extraction or unzipper works better + "application/x-7z-compressed", + "application/x-ace-compressed", + "application/x-alz-compressed", + "application/x-arj", + "application/vnd.ms-cab-compressed", + "application/x-cfs-compressed", + "application/x-dgc-compressed", + "application/x-apple-diskimage", + "application/x-gca-compressed", + "application/x-dar", + "application/x-lzx", + "application/x-lzh", + "application/x-rar-compressed", + "application/x-stuffit", + "application/x-stuffitx", + "application/x-gtar", + "application/x-archive", + "application/x-executable", + "application/x-gzip", + "application/zip", + "application/x-zoo", + "application/x-cpio", + "application/x-shar", + "application/x-tar", + "application/x-bzip", + "application/x-bzip2", + "application/x-lzip", + "application/x-lzma", + "application/x-lzop", + "application/x-z", + "application/x-compress"); /** * Get number of chunks resulted from extracting this AbstractFile @@ -143,9 +146,9 @@ interface AbstractFileExtract { * Determines if the file content is supported by the extractor if * isContentTypeSpecific() returns true. * - * @param file to test if its content should be supported + * @param file to test if its content should be supported * @param detectedFormat mime-type with detected format (such as text/plain) - * or null if not detected + * or null if not detected * @return true if the file content is supported, false otherwise */ boolean isSupported(AbstractFile file, String detectedFormat); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java index e63545a904..230f67dc96 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.logging.Level; + import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException; @@ -37,7 +38,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; * divided into chunks and indexed with Solr. If HTML extraction succeeds, * chunks are indexed with Solr. */ - class AbstractFileHtmlExtract implements AbstractFileExtract { +class AbstractFileHtmlExtract implements AbstractFileExtract { private static final Logger logger = Logger.getLogger(AbstractFileHtmlExtract.class.getName()); static final Charset outCharset = Server.DEFAULT_INDEXED_TEXT_CHARSET; @@ -58,7 +59,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; "text/html", "text/javascript" //"application/xml", //"application/xml-dtd", - ); + ); private final TikaLanguageIdentifier tikaLanguageIdentifier; AbstractFileHtmlExtract() { @@ -189,10 +190,12 @@ import org.sleuthkit.datamodel.ReadContentInputStream; module.checkRunCommitSearch(); } } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex); + logger.log(Level.WARNING, "Unable to read content stream from " + + sourceFile.getId() + ": " + sourceFile.getName(), ex); success = false; } catch (Exception ex) { - logger.log(Level.WARNING, "Unexpected error, can't read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex); + logger.log(Level.WARNING, "Unexpected error, can't read content stream from " + + sourceFile.getId() + ": " + sourceFile.getName(), ex); success = false; } finally { try { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java index 63873f9dd3..d6de6b4dbe 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java @@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.Charset; + import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.solr.common.util.ContentStream; import org.sleuthkit.datamodel.AbstractContent; @@ -31,7 +32,7 @@ import org.sleuthkit.datamodel.AbstractFile; /** * Wrapper over InputStream that implements ContentStream to feed to Solr. */ - class AbstractFileStringContentStream implements ContentStream { +class AbstractFileStringContentStream implements ContentStream { //input private AbstractFile content; @@ -69,7 +70,8 @@ import org.sleuthkit.datamodel.AbstractFile; @Override public Long getSize() { //return convertedLength; - throw new UnsupportedOperationException("Cannot tell how many chars in converted string, until entire string is converted"); + throw new UnsupportedOperationException( + "Cannot tell how many chars in converted string, until entire string is converted"); } @Override @@ -85,7 +87,7 @@ import org.sleuthkit.datamodel.AbstractFile; @Override protected void finalize() throws Throwable { super.finalize(); - + stream.close(); } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java index 15c6aac52c..1370b9b782 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; + import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException; @@ -51,7 +52,7 @@ class AbstractFileStringExtract implements AbstractFileExtract { private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2; private final List tags scripts.append(tag.getElement().getContent()).append("\n"); numScripts++; - } else if(tag.getName().equals("a")) { + } else if (tag.getName().equals("a")) { links.append(numLinks).append(") "); links.append(tag.getTagContent()).append("\n"); numLinks++; - } else if(tag.getName().equals("img")) { + } else if (tag.getName().equals("img")) { images.append(numImages).append(") "); images.append(tag.getTagContent()).append("\n"); numImages++; - } else if(tag.getTagType().equals(StartTagType.COMMENT)) { + } else if (tag.getTagType().equals(StartTagType.COMMENT)) { comments.append(numComments).append(") "); comments.append(tag.getTagContent()).append("\n"); numComments++; } else { // Make sure it has an attribute Attributes atts = tag.getAttributes(); - if (atts!=null && atts.length()>0) { + if (atts != null && atts.length() > 0) { others.append(numOthers).append(") "); others.append(tag.getName()).append(":"); others.append(tag.getTagContent()).append("\n"); @@ -119,19 +121,23 @@ class JerichoParserWrapper { out.append(text).append("\n\n"); out.append("----------NONVISIBLE TEXT----------\n\n"); - if(numScripts>1) { + if (numScripts > 1) { out.append("---Scripts---\n"); out.append(scripts.toString()).append("\n"); - } if(numLinks>1) { + } + if (numLinks > 1) { out.append("---Links---\n"); out.append(links.toString()).append("\n"); - } if(numImages>1) { + } + if (numImages > 1) { out.append("---Images---\n"); out.append(images.toString()).append("\n"); - } if(numComments>1) { + } + if (numComments > 1) { out.append("---Comments---\n"); out.append(comments.toString()).append("\n"); - } if(numOthers>1) { + } + if (numOthers > 1) { out.append("---Others---\n"); out.append(others.toString()).append("\n"); } @@ -141,7 +147,7 @@ class JerichoParserWrapper { logger.log(Level.WARNING, "Unable to parse the HTML file", ex); } } - + // Extract text from the source, nicely formatted with whitespace and // newlines where appropriate. private String renderHTMLAsPlainText(Source source) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java index 39035a1684..5c1e27980a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java @@ -30,36 +30,33 @@ class Keyword { private BlackboardAttribute.ATTRIBUTE_TYPE keywordType = null; /** - * - * @param query Keyword to search for + * @param query Keyword to search for * @param isLiteral false if reg exp */ Keyword(String query, boolean isLiteral) { this.keywordString = query; this.isLiteral = isLiteral; } - + /** - * - * @param query Keyword to search for - * @param isLiteral false if reg exp - * @param keywordType + * @param query Keyword to search for + * @param isLiteral false if reg exp + * @param keywordType */ Keyword(String query, boolean isLiteral, BlackboardAttribute.ATTRIBUTE_TYPE keywordType) { this(query, isLiteral); this.keywordType = keywordType; } - + void setType(BlackboardAttribute.ATTRIBUTE_TYPE keywordType) { this.keywordType = keywordType; } - + BlackboardAttribute.ATTRIBUTE_TYPE getType() { return this.keywordType; } /** - * * @return Keyword to search for */ String getQuery() { @@ -72,10 +69,10 @@ class Keyword { @Override public String toString() { - return "Keyword{" + "query=" + keywordString + ", isLiteral=" + isLiteral + ", keywordType=" + keywordType + '}'; + return "Keyword{" + "query=" + keywordString + ", isLiteral=" + isLiteral + ", keywordType=" + keywordType + + '}'; } - - + @Override public boolean equals(Object obj) { @@ -86,7 +83,8 @@ class Keyword { return false; } final Keyword other = (Keyword) obj; - if ((this.keywordString == null) ? (other.keywordString != null) : !this.keywordString.equals(other.keywordString)) { + if ((this.keywordString == null) ? (other.keywordString != null) + : !this.keywordString.equals(other.keywordString)) { return false; } if (this.isLiteral != other.isLiteral) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java index 8d7990ba1b..f6cca5df51 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordQueryFilter.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.Set; /** - * * Filter to restrict query only specific files, chunks, images * Single filter supports multiple ids per file/chunk/image, that act as OR filter */ @@ -33,7 +32,7 @@ class KeywordQueryFilter { FILE, CHUNK, DATA_SOURCE }; - private SetidFilters; + private Set idFilters; private FilterType filterType; public KeywordQueryFilter(FilterType filterType, long id) { @@ -42,7 +41,7 @@ class KeywordQueryFilter { this.idFilters.add(id); } - public KeywordQueryFilter(FilterType filterType, Setids) { + public KeywordQueryFilter(FilterType filterType, Set ids) { this.filterType = filterType; this.idFilters = ids; } @@ -59,8 +58,8 @@ class KeywordQueryFilter { public String toString() { StringBuilder sb = new StringBuilder(); String id = null; - - Iteratorit = idFilters.iterator(); + + Iterator it = idFilters.iterator(); for (int i = 0; it.hasNext(); ++i) { if (i > 0) { sb.append(" "); //OR diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java index 96d3562474..e85a62a790 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java @@ -27,6 +27,7 @@ import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger; import java.util.logging.SimpleFormatter; + import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.PlatformUtil; @@ -66,7 +67,8 @@ class KeywordSearch { static { try { final int MAX_TIKA_LOG_FILES = 3; - FileHandler tikaLogHandler = new FileHandler(PlatformUtil.getUserDirectory().getAbsolutePath() + "/var/log/tika.log", + FileHandler tikaLogHandler = new FileHandler( + PlatformUtil.getUserDirectory().getAbsolutePath() + "/var/log/tika.log", 0, MAX_TIKA_LOG_FILES); tikaLogHandler.setFormatter(new SimpleFormatter()); tikaLogHandler.setEncoding(PlatformUtil.getLogFileEncoding()); @@ -88,16 +90,16 @@ class KeywordSearch { static Logger getTikaLogger() { return TIKA_LOGGER; } - + public static void addNumIndexedFilesChangeListener(PropertyChangeListener l) { changeSupport.addPropertyChangeListener(NUM_FILES_CHANGE_EVT, l); } - + public static void removeNumIndexedFilesChangeListener(PropertyChangeListener l) { changeSupport.removePropertyChangeListener(l); } - + static void fireNumIndexedFilesChange(Integer oldNum, Integer newNum) { changeSupport.firePropertyChange(NUM_FILES_CHANGE_EVT, oldNum, newNum); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java index 2134ac55ce..7ae6086728 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchAction.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.awt.Component; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; + import org.openide.util.actions.Presenter; final class KeywordSearchAction extends AbstractAction implements Presenter.Toolbar { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java index faa4f9688e..e3898b58b1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationAction.java @@ -23,6 +23,7 @@ import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; + import org.openide.util.HelpCtx; import org.openide.util.actions.CallableSystemAction; import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; @@ -30,9 +31,10 @@ import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; /** * System action to open the KeywordSearch Options panel. */ -class KeywordSearchConfigurationAction extends CallableSystemAction{ - - private static final String ACTION_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig"); +class KeywordSearchConfigurationAction extends CallableSystemAction { + + private static final String ACTION_NAME = org.openide.util.NbBundle + .getMessage(KeywordSearchPanel.class, "ListBundleConfig"); private KeywordSearchConfigurationPanel panel; @Override @@ -59,9 +61,9 @@ class KeywordSearchConfigurationAction extends CallableSystemAction{ dialog.addWindowListener(exitListener); dialog.display(panel); } - + private KeywordSearchConfigurationPanel getPanel() { - if(panel==null) { + if (panel == null) { panel = new KeywordSearchConfigurationPanel(); } return panel; @@ -76,7 +78,7 @@ class KeywordSearchConfigurationAction extends CallableSystemAction{ public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } - + @Override protected boolean asynchronous() { return false; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java index b7fb10dddc..59f24424cd 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java @@ -35,18 +35,30 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement initComponents(); customizeComponents(); } - + private void customizeComponents() { setName(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.title")); listsPanel = new KeywordSearchConfigurationPanel1(); languagesPanel = new KeywordSearchConfigurationPanel3(); generalPanel = new KeywordSearchConfigurationPanel2(); - tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listTabTitle"), null, - listsPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip"), 0); - tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle"), null, - languagesPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip"), 1); - tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabTitle"), null, - generalPanel, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip"), 2); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.listTabTitle"), + null, + listsPanel, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip"), + 0); + tabbedPane.insertTab(NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle"), + null, + languagesPanel, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip"), + 1); + tabbedPane.insertTab( + NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel.customizeComponents.genTabTitle"), + null, + generalPanel, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip"), + 2); } /** @@ -62,12 +74,14 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 675, Short.MAX_VALUE) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.DEFAULT_SIZE, 675, Short.MAX_VALUE) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) ); }// //GEN-END:initComponents @@ -95,14 +109,14 @@ final class KeywordSearchConfigurationPanel extends javax.swing.JPanel implement } public void cancel() { - KeywordSearchListsXML.getCurrent().reload(); + KeywordSearchListsXML.getCurrent().reload(); } - + boolean valid() { // TODO check whether form is consistent and complete return true; } - + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTabbedPane tabbedPane; // End of variables declaration//GEN-END:variables diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java index 34bb43a679..24861675e3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java @@ -41,11 +41,14 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt KeywordSearchListsManagementPanel listsManagementPanel; KeywordSearchEditListPanel editListPanel; private static final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel1.class.getName()); - private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig"); - - /** Creates new form KeywordSearchConfigurationPanel1 */ + private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, + "ListBundleConfig"); + + /** + * Creates new form KeywordSearchConfigurationPanel1 + */ KeywordSearchConfigurationPanel1() { - + initComponents(); customizeComponents(); setName(KEYWORD_CONFIG_NAME); @@ -57,12 +60,14 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt listsManagementPanel.addListSelectionListener(editListPanel); editListPanel.addDeleteButtonActionPerformed(new ActionListener() { - + @Override public void actionPerformed(ActionEvent e) { - if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.title") - , NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.body" ) - , KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN) ) { + if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.title") + , NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.body") + , KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN)) { KeywordSearchListsXML deleter = KeywordSearchListsXML.getCurrent(); String toDelete = editListPanel.getCurrentKeywordList().getName(); @@ -73,9 +78,9 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt } } }); - + editListPanel.addSaveButtonActionPerformed(new ActionListener() { - + @Override public void actionPerformed(ActionEvent e) { final String FEATURE_NAME = "Save Keyword List"; @@ -84,8 +89,9 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt List keywords = currentKeywordList.getKeywords(); if (keywords.isEmpty()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr"), - KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); return; } @@ -102,13 +108,18 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt } if (writer.listExists(listName) && writer.getList(listName).isLocked()) { - KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); return; } boolean shouldAdd = false; if (writer.listExists(listName)) { - boolean replace = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg", listName), - KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); + boolean replace = KeywordSearchUtil.displayConfirmDialog(FEATURE_NAME, + NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg", + listName), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN); if (replace) { shouldAdd = true; } @@ -119,34 +130,38 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt if (shouldAdd) { writer.addList(listName, keywords); - KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg", listName), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); + KeywordSearchUtil.displayDialog(FEATURE_NAME, NbBundle.getMessage(this.getClass(), + "KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg", + listName), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO); } //currentKeywordList = writer.getList(listName); - + listsManagementPanel.resync(); } }); - + mainSplitPane.setLeftComponent(listsManagementPanel); mainSplitPane.setRightComponent(editListPanel); mainSplitPane.revalidate(); mainSplitPane.repaint(); } - + @Override public void store() { KeywordSearchListsXML.getCurrent().save(false); //refresh the list viewer/searcher panel KeywordSearchListsViewerPanel.getDefault().resync(); } - + @Override public void load() { listsManagementPanel.load(); } - /** This method is called from within the constructor to + /** + * This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. @@ -165,12 +180,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt javax.swing.GroupLayout leftPanelLayout = new javax.swing.GroupLayout(leftPanel); leftPanel.setLayout(leftPanelLayout); leftPanelLayout.setHorizontalGroup( - leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 275, Short.MAX_VALUE) + leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 275, Short.MAX_VALUE) ); leftPanelLayout.setVerticalGroup( - leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 327, Short.MAX_VALUE) + leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 327, Short.MAX_VALUE) ); mainSplitPane.setLeftComponent(leftPanel); @@ -178,12 +193,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt javax.swing.GroupLayout rightPanelLayout = new javax.swing.GroupLayout(rightPanel); rightPanel.setLayout(rightPanelLayout); rightPanelLayout.setHorizontalGroup( - rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 318, Short.MAX_VALUE) + rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 318, Short.MAX_VALUE) ); rightPanelLayout.setVerticalGroup( - rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 327, Short.MAX_VALUE) + rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 327, Short.MAX_VALUE) ); mainSplitPane.setRightComponent(rightPanel); @@ -191,12 +206,12 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(mainSplitPane) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(mainSplitPane) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(mainSplitPane) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(mainSplitPane) ); }// //GEN-END:initComponents @@ -205,5 +220,5 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt private javax.swing.JSplitPane mainSplitPane; private javax.swing.JPanel rightPanel; // End of variables declaration//GEN-END:variables - + } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java index e0b4dc0d89..ea7e4ee49e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.logging.Level; + import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.solr.client.solrj.SolrServerException; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; @@ -97,35 +98,52 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt timeRadioButton3 = new javax.swing.JRadioButton(); timeRadioButton4 = new javax.swing.JRadioButton(); - skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text")); // NOI18N - skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText")); // NOI18N + skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text")); // NOI18N + skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText")); // NOI18N - filesIndexedLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.filesIndexedLabel.text")); // NOI18N + filesIndexedLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.filesIndexedLabel.text")); // NOI18N - filesIndexedValue.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.filesIndexedValue.text")); // NOI18N + filesIndexedValue.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.filesIndexedValue.text")); // NOI18N filesIndexedValue.setMaximumSize(null); - chunksLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.chunksLabel.text")); // NOI18N + chunksLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.chunksLabel.text")); // NOI18N - chunksValLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.chunksValLabel.text")); // NOI18N + chunksValLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.chunksValLabel.text")); // NOI18N - settingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.settingsLabel.text")); // NOI18N + settingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.settingsLabel.text")); // NOI18N - informationLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.informationLabel.text")); // NOI18N + informationLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.informationLabel.text")); // NOI18N - frequencyLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.frequencyLabel.text")); // NOI18N + frequencyLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.frequencyLabel.text")); // NOI18N - timeRadioButton1.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton1.text")); // NOI18N - timeRadioButton1.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText")); // NOI18N + timeRadioButton1.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton1.text")); // NOI18N + timeRadioButton1.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText")); // NOI18N - timeRadioButton2.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton2.text")); // NOI18N - timeRadioButton2.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText")); // NOI18N + timeRadioButton2.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton2.text")); // NOI18N + timeRadioButton2.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText")); // NOI18N - timeRadioButton3.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton3.text")); // NOI18N - timeRadioButton3.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText")); // NOI18N + timeRadioButton3.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton3.text")); // NOI18N + timeRadioButton3.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText")); // NOI18N - timeRadioButton4.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton4.text_1")); // NOI18N - timeRadioButton4.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText")); // NOI18N + timeRadioButton4.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton4.text_1")); // NOI18N + timeRadioButton4.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, + "KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -239,14 +257,11 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt private UpdateFrequency getSelectedTimeValue() { if (timeRadioButton1.isSelected()) { return UpdateFrequency.FAST; - } - else if (timeRadioButton2.isSelected()) { + } else if (timeRadioButton2.isSelected()) { return UpdateFrequency.AVG; - } - else if (timeRadioButton3.isSelected()) { + } else if (timeRadioButton3.isSelected()) { return UpdateFrequency.SLOW; - } - else if (timeRadioButton4.isSelected()) { + } else if (timeRadioButton4.isSelected()) { return UpdateFrequency.SLOWEST; } return UpdateFrequency.DEFAULT; @@ -282,7 +297,8 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt int newFilesIndexed = ((Integer) newValue).intValue(); filesIndexedValue.setText(Integer.toString(newFilesIndexed)); try { - chunksValLabel.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks())); + chunksValLabel + .setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks())); } catch (KeywordSearchModuleException ex) { logger.log(Level.WARNING, "Could not get number of indexed chunks"); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java index ff736bfc2e..ae52c60839 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java @@ -26,8 +26,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.sleuthkit.autopsy.coreutils.Logger; + import javax.swing.JCheckBox; + import org.sleuthkit.autopsy.corecomponents.OptionsPanel; import org.sleuthkit.autopsy.coreutils.StringExtract; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; @@ -40,7 +43,8 @@ class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel implements Opt private static KeywordSearchConfigurationPanel3 instance = null; private final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel3.class.getName()); - private final Map scripts = new HashMap(); + private final Map scripts + = new HashMap(); private ActionListener updateLanguagesAction; private List