diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java index dcb8b25728..1a8b8ae6aa 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java @@ -44,37 +44,37 @@ interface AbstractFileExtract { 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"); + "application/x-7z-compressed", //NON-NLS + "application/x-ace-compressed", //NON-NLS + "application/x-alz-compressed", //NON-NLS + "application/x-arj", //NON-NLS + "application/vnd.ms-cab-compressed", //NON-NLS + "application/x-cfs-compressed", //NON-NLS + "application/x-dgc-compressed", //NON-NLS + "application/x-apple-diskimage", //NON-NLS + "application/x-gca-compressed", //NON-NLS + "application/x-dar", //NON-NLS + "application/x-lzx", //NON-NLS + "application/x-lzh", //NON-NLS + "application/x-rar-compressed", //NON-NLS + "application/x-stuffit", //NON-NLS + "application/x-stuffitx", //NON-NLS + "application/x-gtar", //NON-NLS + "application/x-archive", //NON-NLS + "application/x-executable", //NON-NLS + "application/x-gzip", //NON-NLS + "application/zip", //NON-NLS + "application/x-zoo", //NON-NLS + "application/x-cpio", //NON-NLS + "application/x-shar", //NON-NLS + "application/x-tar", //NON-NLS + "application/x-bzip", //NON-NLS + "application/x-bzip2", //NON-NLS + "application/x-lzip", //NON-NLS + "application/x-lzma", //NON-NLS + "application/x-lzop", //NON-NLS + "application/x-z", //NON-NLS + "application/x-compress"); //NON-NLS /** * Get number of chunks resulted from extracting this AbstractFile diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java index 38a5a51e71..1faf6ada56 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java @@ -53,12 +53,13 @@ import org.sleuthkit.datamodel.ReadContentInputStream; private int numChunks = 0; static final List WEB_MIME_TYPES = Arrays.asList( - "application/javascript", - "application/xhtml+xml", - "application/json", - "text/css", - "text/html", - "text/javascript" //"application/xml", + "application/javascript", //NON-NLS + "application/xhtml+xml", //NON-NLS + "application/json", //NON-NLS + "text/css", //NON-NLS + "text/html", //NON-NLS NON-NLS + "text/javascript" //NON-NLS + //"application/xml", //"application/xml-dtd", ); @@ -114,7 +115,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream; // In case there is an exception or parse() isn't called if (reader == null) { - logger.log(Level.WARNING, "No reader available from HTML parser"); + logger.log(Level.WARNING, "No reader available from HTML parser"); //NON-NLS return false; } @@ -174,29 +175,29 @@ import org.sleuthkit.datamodel.ReadContentInputStream; ++this.numChunks; } catch (Ingester.IngesterException ingEx) { success = false; - logger.log(Level.WARNING, "Ingester had a problem with extracted HTML from file '" - + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); + logger.log(Level.WARNING, "Ingester had a problem with extracted HTML from file '" //NON-NLS + + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); //NON-NLS throw ingEx; //need to rethrow/return to signal error and move on } } } 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); //NON-NLS 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); //NON-NLS success = false; } finally { try { stream.close(); } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to close content stream from " + sourceFile.getId(), ex); + logger.log(Level.WARNING, "Unable to close content stream from " + sourceFile.getId(), ex); //NON-NLS } try { if (reader != null) { reader.close(); } } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex); + logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex); //NON-NLS } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java index 22c3c5a5fb..78a8f5faf0 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java @@ -54,7 +54,7 @@ import org.sleuthkit.datamodel.AbstractFile; @Override public String getContentType() { - return "text/plain;charset=" + charset.name(); + return "text/plain;charset=" + charset.name(); //NON-NLS } @Override diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java index 17b419ffab..65ef4c31a1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java @@ -141,7 +141,7 @@ class AbstractFileStringExtract implements AbstractFileExtract { ++this.numChunks; } catch (IngesterException ingEx) { success = false; - logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); + logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); //NON-NLS throw ingEx; //need to rethrow/return to signal error and move on } @@ -153,13 +153,13 @@ class AbstractFileStringExtract implements AbstractFileExtract { ingester.ingest(this); } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to read input stream to divide and send to Solr, file: " + sourceFile.getName(), ex); + logger.log(Level.WARNING, "Unable to read input stream to divide and send to Solr, file: " + sourceFile.getName(), ex); //NON-NLS success = false; } finally { try { stringStream.close(); } catch (IOException ex) { - logger.log(Level.WARNING, "Error closing input stream stream, file: " + sourceFile.getName(), ex); + logger.log(Level.WARNING, "Error closing input stream stream, file: " + sourceFile.getName(), ex); //NON-NLS } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java index 4090d8b570..b04ec4d2d9 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java @@ -80,7 +80,7 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { for (MediaType mt : mediaTypes) { TIKA_SUPPORTED_TYPES.add(mt.getType() + "/" + mt.getSubtype()); } - logger.log(Level.INFO, "Tika supported media types: {0}", TIKA_SUPPORTED_TYPES); + logger.log(Level.INFO, "Tika supported media types: {0}", TIKA_SUPPORTED_TYPES); //NON-NLS } @Override @@ -149,7 +149,7 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { reader = parseTask.getReader(); if (reader == null) { //likely due to exception in parse() - logger.log(Level.WARNING, "No reader available from Tika parse"); + logger.log(Level.WARNING, "No reader available from Tika parse"); //NON-NLS return false; } @@ -206,7 +206,7 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { //sort meta data keys List sortedKeyList = Arrays.asList(meta.names()); Collections.sort(sortedKeyList); - sb.append("\n\n------------------------------METADATA------------------------------\n\n"); + sb.append("\n\n------------------------------METADATA------------------------------\n\n"); //NON-NLS for (String key : sortedKeyList) { String value = meta.get(key); sb.append(key).append(": ").append(value).append("\n"); @@ -224,18 +224,18 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { ++this.numChunks; } catch (Ingester.IngesterException ingEx) { success = false; - logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" - + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); + logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" //NON-NLS + + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); //NON-NLS throw ingEx; //need to rethrow/return to signal error and move on } } } catch (IOException ex) { - final String msg = "Exception: Unable to read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName(); + final String msg = "Exception: Unable to read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName(); //NON-NLS KeywordSearch.getTikaLogger().log(Level.WARNING, msg, ex); logger.log(Level.WARNING, msg); success = false; } catch (Exception ex) { - final String msg = "Exception: Unexpected error, can't read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName(); + final String msg = "Exception: Unexpected error, can't read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName(); //NON-NLS KeywordSearch.getTikaLogger().log(Level.WARNING, msg, ex); logger.log(Level.WARNING, msg); success = false; @@ -243,14 +243,14 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { try { stream.close(); } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to close Tika content stream from " + sourceFile.getId(), ex); + logger.log(Level.WARNING, "Unable to close Tika content stream from " + sourceFile.getId(), ex); //NON-NLS } try { if (reader != null) { reader.close(); } } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex); + logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex); //NON-NLS } } @@ -269,17 +269,17 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { public boolean isSupported(AbstractFile file, String detectedFormat) { if (detectedFormat == null) { return false; - } else if (detectedFormat.equals("application/octet-stream") - || detectedFormat.equals("application/x-msdownload")) { + } else if (detectedFormat.equals("application/octet-stream") //NON-NLS + || detectedFormat.equals("application/x-msdownload")) { //NON-NLS //any binary unstructured blobs (string extraction will be used) return false; } else if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) { return false; } //skip video other than flv (tika supports flv only) - else if (detectedFormat.contains("video/") - && !detectedFormat.equals("video/x-flv")) { + else if (detectedFormat.contains("video/") //NON-NLS + && !detectedFormat.equals("video/x-flv")) { //NON-NLS return false; - } else if (detectedFormat.contains("application/x-font-ttf")) { + } else if (detectedFormat.contains("application/x-font-ttf")) { //NON-NLS // Tika currently has a bug in the ttf parser in fontbox. // It will throw an out of memory exception return false; @@ -319,11 +319,11 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract { try { reader = tika.parse(stream, meta); } catch (IOException ex) { - KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex); + KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex); //NON-NLS tika = null; reader = null; } catch (Exception ex) { - KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex); + KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex); //NON-NLS tika = null; reader = null; } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java index 8dc2b4fe80..97157facbb 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java @@ -65,7 +65,7 @@ class ByteContentStream implements ContentStream { @Override public String getContentType() { - return "text/plain;charset=" + charset.name(); + return "text/plain;charset=" + charset.name(); //NON-NLS } @Override diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java index 96f48ad393..934953d4d3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java @@ -161,7 +161,7 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer { org.openide.awt.Mnemonics.setLocalizedText(selectAllMenuItem, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.selectAllMenuItem.text")); // NOI18N rightClickMenu.add(selectAllMenuItem); - keywordTextField.setFont(new java.awt.Font("Monospaced", 0, 14)); // NOI18N + keywordTextField.setFont(new java.awt.Font("Monospaced", 0, 14)); // NOI18N NON-NLS keywordTextField.setText(org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.keywordTextField.text")); // NOI18N keywordTextField.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(192, 192, 192), 1, true)); keywordTextField.setMinimumSize(new java.awt.Dimension(2, 25)); @@ -177,7 +177,7 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer { } }); - searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N + searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N NON-NLS org.openide.awt.Mnemonics.setLocalizedText(searchButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.searchButton.text")); // NOI18N searchButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -239,7 +239,7 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer { try { search(); } catch(Exception e) { - logger.log(Level.SEVERE, "search() threw exception", e); + logger.log(Level.SEVERE, "search() threw exception", e); //NON-NLS } }//GEN-LAST:event_keywordTextFieldActionPerformed diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java index d2010818c3..f5b3f7fedc 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java @@ -122,7 +122,7 @@ class ExtractedContentPanel extends javax.swing.JPanel { // set font size manually in an effort to get fonts in this panel to look // similar to what is in the 'String View' content viewer. StyleSheet ss = editorKit.getStyleSheet(); - ss.addRule("body {font-size: 8.5px;}"); + ss.addRule("body {font-size: 8.5px;}"); //NON-NLS extractedTextPane.setEditorKit(editorKit); @@ -226,43 +226,43 @@ class ExtractedContentPanel extends javax.swing.JPanel { hitButtonsLabel.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitButtonsLabel.text")); // NOI18N - hitPreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N + hitPreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N NON-NLS hitPreviousButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitPreviousButton.text")); // NOI18N hitPreviousButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); hitPreviousButton.setBorderPainted(false); hitPreviousButton.setContentAreaFilled(false); - hitPreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N + hitPreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N NON-NLS hitPreviousButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); hitPreviousButton.setPreferredSize(new java.awt.Dimension(23, 23)); - hitPreviousButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_hover.png"))); // NOI18N + hitPreviousButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_hover.png"))); // NOI18N NON-NLS - hitNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N + hitNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N NON-NLS hitNextButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitNextButton.text")); // NOI18N hitNextButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); hitNextButton.setBorderPainted(false); hitNextButton.setContentAreaFilled(false); - hitNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N + hitNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N NON-NLS hitNextButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); hitNextButton.setPreferredSize(new java.awt.Dimension(23, 23)); - hitNextButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_hover.png"))); // NOI18N + hitNextButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_hover.png"))); // NOI18N NON-NLS pageButtonsLabel.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pageButtonsLabel.text")); // NOI18N - pagePreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N + pagePreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N NON-NLS pagePreviousButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pagePreviousButton.text")); // NOI18N pagePreviousButton.setActionCommand(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pagePreviousButton.actionCommand")); // NOI18N pagePreviousButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); pagePreviousButton.setBorderPainted(false); pagePreviousButton.setContentAreaFilled(false); - pagePreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N + pagePreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N NON-NLS pagePreviousButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); - pageNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N + pageNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N NON-NLS pageNextButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pageNextButton.text")); // NOI18N pageNextButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); pageNextButton.setBorderPainted(false); pageNextButton.setContentAreaFilled(false); - pageNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N + pageNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N NON-NLS pageNextButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); pageNextButton.setPreferredSize(new java.awt.Dimension(23, 23)); @@ -416,7 +416,7 @@ class ExtractedContentPanel extends javax.swing.JPanel { //detect text direction using first 1024 chars and set it //get first up to 1024 chars, strip
 tag and unescape html to get the string on which to detect
             final int len = text.length();
-            final int prefixLen = "
".length();
+            final int prefixLen = "
".length(); //NON-NLS
             if (len > prefixLen) {
                 final int maxOrientChars = Math.min(len, 1024);
                 final String orientDetectText = EscapeUtil.unEscapeHtml(text.substring(prefixLen, maxOrientChars));
@@ -708,7 +708,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
-                logger.log(Level.SEVERE, "Error getting marked up text" );
+                logger.log(Level.SEVERE, "Error getting marked up text" ); //NON-NLS
             }
             // catch and ignore if we were cancelled
             catch (java.util.concurrent.CancellationException ex ) { }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
index a72b33bd37..d2f3174c82 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
@@ -62,7 +62,7 @@ public class ExtractedContentViewer implements DataContentViewer {
     private int curContentChunk;
 
     public ExtractedContentViewer() {
-        logger.log(Level.INFO, "Created TextView instance: " + this);
+        logger.log(Level.INFO, "Created TextView instance: " + this); //NON-NLS
     }
 
     @Override
@@ -186,7 +186,7 @@ public class ExtractedContentViewer implements DataContentViewer {
                 try {
                     return getSolrContent(selectedNode, currentPage, hasChunks);
                 } catch (SolrServerException ex) {
-                    logger.log(Level.WARNING, "Couldn't get extracted content.", ex);
+                    logger.log(Level.WARNING, "Couldn't get extracted content.", ex); //NON-NLS
                     return "";
                 }
             }
@@ -234,10 +234,10 @@ public class ExtractedContentViewer implements DataContentViewer {
                     }
                     inited = true;
                 } catch (KeywordSearchModuleException ex) {
-                    logger.log(Level.WARNING, "Could not get number of chunks: ", ex);
+                    logger.log(Level.WARNING, "Could not get number of chunks: ", ex); //NON-NLS
 
                 } catch (NoOpenCoreException ex) {
-                    logger.log(Level.WARNING, "Could not get number of chunks: ", ex);
+                    logger.log(Level.WARNING, "Could not get number of chunks: ", ex); //NON-NLS
                 }
                 return numPages;
             }
@@ -395,10 +395,10 @@ public class ExtractedContentViewer implements DataContentViewer {
         try {
             return solrServer.queryIsIndexed(contentID);
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex);
+            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex); //NON-NLS
             return false;
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex);
+            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex); //NON-NLS
             return false;
         }
     }
@@ -456,12 +456,12 @@ public class ExtractedContentViewer implements DataContentViewer {
         try {
             curContent = EscapeUtil.escapeHtml(solrServer.getSolrContent(contentObj, chunkId)).trim();
             StringBuilder sb = new StringBuilder(curContent.length() + 20);
-            sb.append("
").append(curContent).append("
"); + sb.append("
").append(curContent).append("
"); //NON-NLS curContent = sb.toString(); curContentId = contentId; curContentChunk = chunkId; } catch (NoOpenCoreException ex) { - logger.log(Level.WARNING, "Couldn't get text content.", ex); + logger.log(Level.WARNING, "Couldn't get text content.", ex); //NON-NLS return ""; } return curContent; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java index 79bc54fe73..4dc1beaf15 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java @@ -44,8 +44,8 @@ import org.sleuthkit.datamodel.Content; class HighlightedMatchesSource implements MarkupSource, HighlightLookup { private static final Logger logger = Logger.getLogger(HighlightedMatchesSource.class.getName()); - private static final String HIGHLIGHT_PRE = ""; - private static final String HIGHLIGHT_POST = ""; + private static final String HIGHLIGHT_PRE = ""; //NON-NLS + private static final String HIGHLIGHT_POST = ""; //NON-NLS private static final String ANCHOR_PREFIX = HighlightedMatchesSource.class.getName() + "_"; private Content content; @@ -105,10 +105,10 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { try { this.numberPages = solrServer.queryNumFileChunks(content.getId()); } catch (KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId()); + logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId()); //NON-NLS return; } catch (NoOpenCoreException ex) { - logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId()); + logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId()); //NON-NLS return; } @@ -146,7 +146,7 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { try { hits = chunksQuery.performQuery(); } catch (NoOpenCoreException ex) { - logger.log(Level.INFO, "Could not get chunk info and get highlights", ex); + logger.log(Level.INFO, "Could not get chunk info and get highlights", ex); //NON-NLS return; } } @@ -355,13 +355,13 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { q.setHighlightFragsize(0); // don't fragment the highlight, works with original highlighter, or needs "single" list builder with FVH //tune the highlighter - q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one - q.setParam("hl.tag.pre", HIGHLIGHT_PRE); //makes sense for FastVectorHighlighter only - q.setParam("hl.tag.post", HIGHLIGHT_POST); //makes sense for FastVectorHighlighter only - q.setParam("hl.fragListBuilder", "single"); //makes sense for FastVectorHighlighter only + q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS + q.setParam("hl.tag.pre", HIGHLIGHT_PRE); //makes sense for FastVectorHighlighter only NON-NLS + q.setParam("hl.tag.post", HIGHLIGHT_POST); //makes sense for FastVectorHighlighter only NON-NLS + q.setParam("hl.fragListBuilder", "single"); //makes sense for FastVectorHighlighter only NON-NLS //docs says makes sense for the original Highlighter only, but not really - q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED); + q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED); //NON-NLS try { QueryResponse response = solrServer.query(q, METHOD.POST); @@ -381,13 +381,13 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { highlightedContent = insertAnchors(highlightedContent); - return "
" + highlightedContent + "
"; + return "
" + highlightedContent + "
"; //NON-NLS } } catch (NoOpenCoreException ex) { - logger.log(Level.WARNING, "Couldn't query markup for page: " + currentPage, ex); + logger.log(Level.WARNING, "Couldn't query markup for page: " + currentPage, ex); //NON-NLS return ""; } catch (KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Could not query markup for page: " + currentPage, ex); + logger.log(Level.WARNING, "Could not query markup for page: " + currentPage, ex); //NON-NLS return ""; } } @@ -423,8 +423,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { final String searchToken = HIGHLIGHT_PRE; final int indexSearchTokLen = searchToken.length(); - final String insertPre = ""; + final String insertPre = ""; //NON-NLS int count = 0; while ((index = buf.indexOf(searchToken, searchOffset)) >= 0) { String insertString = insertPre + Integer.toString(count + 1) + insertPost; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java index b772c9e5bf..7aa2bfede8 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java @@ -74,7 +74,7 @@ class Ingester { //for ingesting chunk as SolrInputDocument (non-content-streaming, by-pass tika) //TODO use a streaming way to add content to /update handler private static final int MAX_DOC_CHUNK_SIZE = 1024*1024; - private static final String docContentEncoding = "UTF-8"; + private static final String docContentEncoding = "UTF-8"; //NON-NLS private Ingester() { @@ -94,7 +94,7 @@ class Ingester { // Warn if files might have been left uncommited. if (uncommitedIngests) { - logger.warning("Ingester was used to add files that it never committed."); + logger.warning("Ingester was used to add files that it never committed."); //NON-NLS } } @@ -249,7 +249,7 @@ class Ingester { dataSourceId = curCase.getFileDataSource(af); params.put(Server.Schema.IMAGE_ID.toString(), Long.toString(dataSourceId)); } catch (TskCoreException ex) { - logger.log(Level.SEVERE, "Could not get data source id to properly index the file " + af.getId()); + logger.log(Level.SEVERE, "Could not get data source id to properly index the file " + af.getId()); //NON-NLS params.put(Server.Schema.IMAGE_ID.toString(), Long.toString(-1)); } @@ -309,7 +309,7 @@ class Ingester { try { is.close(); } catch (IOException ex) { - logger.log(Level.WARNING, "Could not close input stream after reading content, " + cs.getName(), ex); + logger.log(Level.WARNING, "Could not close input stream after reading content, " + cs.getName(), ex); //NON-NLS } } @@ -356,34 +356,34 @@ class Ingester { * content, but the Solr server is probably fine. */ private void ingestExtract(ContentStream cs, Map fields, final long size) throws IngesterException { - final ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update/extract"); + final ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update/extract"); //NON-NLS up.addContentStream(cs); setFields(up, fields); up.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true); final String contentType = cs.getContentType(); if (contentType != null && !contentType.trim().equals("")) { - up.setParam("stream.contentType", contentType); + up.setParam("stream.contentType", contentType); //NON-NLS } //logger.log(Level.INFO, "Ingesting " + fields.get("file_name")); - up.setParam("commit", "false"); + up.setParam("commit", "false"); //NON-NLS final Future f = upRequestExecutor.submit(new UpRequestTask(up)); try { f.get(getTimeout(size), TimeUnit.SECONDS); } catch (TimeoutException te) { - logger.log(Level.WARNING, "Solr timeout encountered, trying to restart Solr"); + logger.log(Level.WARNING, "Solr timeout encountered, trying to restart Solr"); //NON-NLS //restart may be needed to recover from some error conditions hardSolrRestart(); throw new IngesterException( NbBundle.getMessage(this.getClass(), "Ingester.ingestExtract.exception.solrTimeout.msg", - fields.get("id"), fields.get("file_name"))); + fields.get("id"), fields.get("file_name"))); //NON-NLS } catch (Exception e) { throw new IngesterException( NbBundle.getMessage(this.getClass(), "Ingester.ingestExtract.exception.probPostToSolr.msg", - fields.get("id"), fields.get("file_name")), e); + fields.get("id"), fields.get("file_name")), e); //NON-NLS } uncommitedIngests = true; } @@ -395,7 +395,7 @@ class Ingester { try { solrServer.closeCore(); } catch (KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Cannot close core", ex); + logger.log(Level.WARNING, "Cannot close core", ex); //NON-NLS } solrServer.stop(); @@ -403,15 +403,15 @@ class Ingester { try { solrServer.start(); } catch (KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Cannot start", ex); + logger.log(Level.WARNING, "Cannot start", ex); //NON-NLS } catch (SolrServerNoPortException ex) { - logger.log(Level.WARNING, "Cannot start server with this port", ex); + logger.log(Level.WARNING, "Cannot start server with this port", ex); //NON-NLS } try { solrServer.openCore(); } catch (KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Cannot open core", ex); + logger.log(Level.WARNING, "Cannot open core", ex); //NON-NLS } } @@ -491,9 +491,9 @@ class Ingester { solrServer.commit(); uncommitedIngests = false; } catch (NoOpenCoreException ex) { - logger.log(Level.WARNING, "Error commiting index", ex); + logger.log(Level.WARNING, "Error commiting index", ex); //NON-NLS } catch (SolrServerException ex) { - logger.log(Level.WARNING, "Error commiting index", ex); + logger.log(Level.WARNING, "Error commiting index", ex); //NON-NLS } } @@ -505,7 +505,7 @@ class Ingester { */ private static void setFields(ContentStreamUpdateRequest up, Map fields) { for (Entry field : fields.entrySet()) { - up.setParam("literal." + field.getKey(), field.getValue()); + up.setParam("literal." + field.getKey(), field.getValue()); //NON-NLS } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java index f38b9fdd81..99f4f288d4 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java @@ -53,19 +53,19 @@ class Installer extends ModuleInstall { //TODO revise this logic, handle other server types, move some logic to Server class try { //check if running from previous application instance and try to shut down - logger.log(Level.INFO, "Checking if server is running"); + logger.log(Level.INFO, "Checking if server is running"); //NON-NLS if (server.isRunning()) { //TODO this could hang if other type of server is running - logger.log(Level.WARNING, "Already a server running on " + server.getCurrentSolrServerPort() - + " port, maybe leftover from a previous run. Trying to shut it down."); + logger.log(Level.WARNING, "Already a server running on " + server.getCurrentSolrServerPort() //NON-NLS + + " port, maybe leftover from a previous run. Trying to shut it down."); //NON-NLS //stop gracefully server.stop(); - logger.log(Level.INFO, "Re-checking if server is running"); + logger.log(Level.INFO, "Re-checking if server is running"); //NON-NLS if (server.isRunning()) { int serverPort = server.getCurrentSolrServerPort(); int serverStopPort = server.getCurrentSolrStopPort(); - logger.log(Level.SEVERE, "There's already a server running on " - + serverPort + " port that can't be shutdown."); + logger.log(Level.SEVERE, "There's already a server running on " //NON-NLS + + serverPort + " port that can't be shutdown."); //NON-NLS if (!Server.isPortAvailable(serverPort)) { reportPortError(serverPort); } else if (!Server.isPortAvailable(serverStopPort)) { @@ -78,13 +78,13 @@ class Installer extends ModuleInstall { //in this case give up } else { - logger.log(Level.INFO, "Old Solr server shutdown successfully."); + logger.log(Level.INFO, "Old Solr server shutdown successfully."); //NON-NLS //make sure there really isn't a hang Solr process, in case isRunning() reported false server.killSolr(); } } } catch (KeywordSearchModuleException e) { - logger.log(Level.SEVERE, "Starting server failed, will try to kill. ", e); + logger.log(Level.SEVERE, "Starting server failed, will try to kill. ", e); //NON-NLS server.killSolr(); } @@ -94,13 +94,13 @@ class Installer extends ModuleInstall { //Try to bind to the port 4 times at 1 second intervals. //TODO move some of this logic to Server class for (int i = 0; i <= 3; i++) { - logger.log(Level.INFO, "Checking if port available."); + logger.log(Level.INFO, "Checking if port available."); //NON-NLS if (Server.isPortAvailable(server.getCurrentSolrServerPort())) { - logger.log(Level.INFO, "Port available, trying to start server."); + logger.log(Level.INFO, "Port available, trying to start server."); //NON-NLS server.start(); break; } else if (i == 3) { - logger.log(Level.INFO, "No port available, done retrying."); + logger.log(Level.INFO, "No port available, done retrying."); //NON-NLS reportPortError(server.getCurrentSolrServerPort()); retries = 0; break; @@ -108,16 +108,16 @@ class Installer extends ModuleInstall { try { Thread.sleep(1000); } catch (InterruptedException iex) { - logger.log(Level.WARNING, "Timer interrupted"); + logger.log(Level.WARNING, "Timer interrupted"); //NON-NLS } } } } catch (SolrServerNoPortException npe) { - logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe); + logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe); //NON-NLS //try to kill it } catch (KeywordSearchModuleException e) { - logger.log(Level.SEVERE, "Starting server failed. ", e); + logger.log(Level.SEVERE, "Starting server failed. ", e); //NON-NLS } @@ -127,25 +127,25 @@ class Installer extends ModuleInstall { try { Thread.sleep(1000); } catch (InterruptedException ex) { - logger.log(Level.WARNING, "Timer interrupted."); + logger.log(Level.WARNING, "Timer interrupted."); //NON-NLS } try { - logger.log(Level.INFO, "Ensuring the server is running, retries remaining: " + retries); + logger.log(Level.INFO, "Ensuring the server is running, retries remaining: " + retries); //NON-NLS if (!server.isRunning()) { - logger.log(Level.WARNING, "Server still not running"); + logger.log(Level.WARNING, "Server still not running"); //NON-NLS try { - logger.log(Level.WARNING, "Trying to start the server. "); + logger.log(Level.WARNING, "Trying to start the server. "); //NON-NLS server.start(); } catch (SolrServerNoPortException npe) { - logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe); + logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe); //NON-NLS } } else { - logger.log(Level.INFO, "Server appears now running. "); + logger.log(Level.INFO, "Server appears now running. "); //NON-NLS break; } } catch (KeywordSearchModuleException ex) { - logger.log(Level.SEVERE, "Starting server failed. ", ex); + logger.log(Level.SEVERE, "Starting server failed. ", ex); //NON-NLS //retry if has retries } @@ -156,12 +156,12 @@ class Installer extends ModuleInstall { try { Thread.sleep(1000); } catch (InterruptedException ex) { - logger.log(Level.WARNING, "Timer interrupted."); + logger.log(Level.WARNING, "Timer interrupted."); //NON-NLS } try { - logger.log(Level.INFO, "Last check if server is running. "); + logger.log(Level.INFO, "Last check if server is running. "); //NON-NLS if (!server.isRunning()) { - logger.log(Level.SEVERE, "Server is still not running. "); + logger.log(Level.SEVERE, "Server is still not running. "); //NON-NLS //check if port is taken or some other reason int serverPort = server.getCurrentSolrServerPort(); int serverStopPort = server.getCurrentSolrStopPort(); @@ -175,7 +175,7 @@ class Installer extends ModuleInstall { } } } catch (KeywordSearchModuleException ex) { - logger.log(Level.SEVERE, "Starting server failed. ", ex); + logger.log(Level.SEVERE, "Starting server failed. ", ex); //NON-NLS reportInitError(); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java index 7c98ec2d18..70a217bdff 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java @@ -83,7 +83,7 @@ class JerichoParserWrapper { // Get all the tags in the source List tags = source.getAllStartTags(); for(StartTag tag : tags) { - if(tag.getName().equals("script")) { + if(tag.getName().equals("script")) { //NON-NLS // If the tags scripts.append(tag.getElement().getContent()).append("\n"); numScripts++; - } else if(tag.getName().equals("a")) { + } else if(tag.getName().equals("a")) { //NON-NLS links.append(numLinks).append(") "); links.append(tag.getTagContent()).append("\n"); numLinks++; - } else if(tag.getName().equals("img")) { + } else if(tag.getName().equals("img")) { //NON-NLS images.append(numImages).append(") "); images.append(tag.getTagContent()).append("\n"); numImages++; @@ -118,27 +118,27 @@ class JerichoParserWrapper { out.append(text).append("\n\n"); - out.append("----------NONVISIBLE TEXT----------\n\n"); + out.append("----------NONVISIBLE TEXT----------\n\n"); //NON-NLS if(numScripts>1) { - out.append("---Scripts---\n"); + out.append("---Scripts---\n"); //NON-NLS out.append(scripts.toString()).append("\n"); } if(numLinks>1) { - out.append("---Links---\n"); + out.append("---Links---\n"); //NON-NLS out.append(links.toString()).append("\n"); } if(numImages>1) { - out.append("---Images---\n"); + out.append("---Images---\n"); //NON-NLS out.append(images.toString()).append("\n"); } if(numComments>1) { - out.append("---Comments---\n"); + out.append("---Comments---\n"); //NON-NLS out.append(comments.toString()).append("\n"); } if(numOthers>1) { - out.append("---Others---\n"); + out.append("---Others---\n"); //NON-NLS out.append(others.toString()).append("\n"); } // All done, now make it a reader reader = new StringReader(out.toString()); } catch (IOException ex) { - logger.log(Level.WARNING, "Unable to parse the HTML file", ex); + logger.log(Level.WARNING, "Unable to parse the HTML file", ex); //NON-NLS } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java index 86ec8f4619..b65fc7d46b 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java @@ -42,12 +42,12 @@ public class KeywordSearch { private static Server server; //we want a custom java.util.logging.Logger here for a reason //a separate logger from framework logs - private static final Logger TIKA_LOGGER = Logger.getLogger("Tika"); + private static final Logger TIKA_LOGGER = Logger.getLogger("Tika"); //NON-NLS private static final Logger logger = Logger.getLogger(Case.class.getName()); public enum QueryType { LITERAL, REGEX }; - public static final String NUM_FILES_CHANGE_EVT = "NUM_FILES_CHANGE_EVT"; + public static final String NUM_FILES_CHANGE_EVT = "NUM_FILES_CHANGE_EVT"; //NON-NLS private static PropertyChangeSupport changeSupport = new PropertyChangeSupport(KeywordSearch.class); /** @@ -66,7 +66,7 @@ public 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", //NON-NLS 0, MAX_TIKA_LOG_FILES); tikaLogHandler.setFormatter(new SimpleFormatter()); tikaLogHandler.setEncoding(PlatformUtil.getLogFileEncoding()); @@ -104,7 +104,7 @@ public class KeywordSearch { changeSupport.firePropertyChange(NUM_FILES_CHANGE_EVT, oldNum, newNum); } catch (Exception e) { - logger.log(Level.SEVERE, "KeywordSearch listener threw exception", e); + logger.log(Level.SEVERE, "KeywordSearch listener threw exception", e); //NON-NLS MessageNotifyUtil.Notify.show(NbBundle.getMessage(KeywordSearch.class, "KeywordSearch.moduleErr"), NbBundle.getMessage(KeywordSearch.class, "KeywordSearch.fireNumIdxFileChg.moduleErr.msg"), @@ -133,7 +133,7 @@ public class KeywordSearch { try { server.openCore(); } catch (Exception e) { - logger.log(Level.WARNING, "Could not open core."); + logger.log(Level.WARNING, "Could not open core."); //NON-NLS } } else if (oldValue != null) { // a case was closed @@ -142,7 +142,7 @@ public class KeywordSearch { Thread.sleep(2000); server.closeCore(); } catch (Exception e) { - logger.log(Level.WARNING, "Could not close core."); + logger.log(Level.WARNING, "Could not close core."); //NON-NLS } } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java index 359ee87d4f..90e7f197d1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java @@ -291,13 +291,13 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec listOptionsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.listOptionsLabel.text")); // NOI18N - deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N + deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N NON-NLS deleteListButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.deleteListButton.text")); // NOI18N - saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N + saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N NON-NLS saveListButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.saveListButton.text")); // NOI18N - exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N + exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N NON-NLS exportButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.exportButton.text")); // NOI18N exportButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -442,7 +442,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec "KeywordSearchEditListPanel.exportButtonAction.featureName.text"); JFileChooser chooser = new JFileChooser(); - final String EXTENSION = "xml"; + final String EXTENSION = "xml"; //NON-NLS FileNameExtensionFilter filter = new FileNameExtensionFilter( NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel"), EXTENSION); chooser.setFileFilter(filter); @@ -608,7 +608,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec ret = (Object) !word.isLiteral(); break; default: - logger.log(Level.SEVERE, "Invalid table column index: {0}", columnIndex); + logger.log(Level.SEVERE, "Invalid table column index: {0}", columnIndex); //NON-NLS break; } return ret; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java index 1bc9cccc73..7f9ce6ed0c 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java @@ -267,7 +267,7 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen filesIndexedValue.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedFiles())); chunksValLabel.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks())); } catch (KeywordSearchModuleException | NoOpenCoreException ex) { - logger.log(Level.WARNING, "Could not get number of indexed files/chunks"); + logger.log(Level.WARNING, "Could not get number of indexed files/chunks"); //NON-NLS } KeywordSearch.addNumIndexedFilesChangeListener( @@ -283,7 +283,7 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen try { chunksValLabel.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks())); } catch (KeywordSearchModuleException | NoOpenCoreException ex) { - logger.log(Level.WARNING, "Could not get number of indexed chunks"); + logger.log(Level.WARNING, "Could not get number of indexed chunks"); //NON-NLS } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index dbb9c198e5..ffff9219ea 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -123,7 +123,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme */ @Override public void startUp(IngestJobContext context) throws IngestModuleException { - logger.log(Level.INFO, "Initializing instance {0}", instanceNum); + logger.log(Level.INFO, "Initializing instance {0}", instanceNum); //NON-NLS initialized = false; jobId = context.getJobId(); caseHandle = Case.getCurrentCase().getSleuthkitCase(); @@ -143,7 +143,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme throw new IngestModuleException(msg); } } catch (KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex); + logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex); //NON-NLS //this means Solr is not properly initialized String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg"); String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg); @@ -185,7 +185,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme for (SCRIPT s : KeywordSearchSettings.getStringExtractScripts()) { sbScripts.append(s.name()).append(" "); } - logger.log(Level.INFO, "Using string extract scripts: {0}", sbScripts.toString()); + logger.log(Level.INFO, "Using string extract scripts: {0}", sbScripts.toString()); //NON-NLS textExtractors = new ArrayList<>(); //order matters, more specific extractors first @@ -200,7 +200,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme public ProcessResult process(AbstractFile abstractFile) { if (initialized == false) //error initializing indexing/Solr { - logger.log(Level.WARNING, "Skipping processing, module not initialized, file: {0}", abstractFile.getName()); + logger.log(Level.WARNING, "Skipping processing, module not initialized, file: {0}", abstractFile.getName()); //NON-NLS putIngestStatus(abstractFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING); return ProcessResult.OK; } @@ -209,7 +209,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme dataSourceId = caseHandle.getFileDataSource(abstractFile); } catch (TskCoreException ex) { - logger.log(Level.SEVERE, "Error getting image id of file processed by keyword search: " + abstractFile.getName(), ex); + logger.log(Level.SEVERE, "Error getting image id of file processed by keyword search: " + abstractFile.getName(), ex); //NON-NLS } if (abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR)) { @@ -242,14 +242,14 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme */ @Override public void shutDown(boolean ingestJobCancelled) { - logger.log(Level.INFO, "Instance {0}", instanceNum); + logger.log(Level.INFO, "Instance {0}", instanceNum); //NON-NLS if (initialized == false) { return; } if (ingestJobCancelled) { - logger.log(Level.INFO, "Ingest job cancelled"); + logger.log(Level.INFO, "Ingest job cancelled"); //NON-NLS stop(); return; } @@ -267,10 +267,10 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme try { final int numIndexedFiles = KeywordSearch.getServer().queryNumIndexedFiles(); final int numIndexedChunks = KeywordSearch.getServer().queryNumIndexedChunks(); - logger.log(Level.INFO, "Indexed files count: {0}", numIndexedFiles); - logger.log(Level.INFO, "Indexed file chunks count: {0}", numIndexedChunks); + logger.log(Level.INFO, "Indexed files count: {0}", numIndexedFiles); //NON-NLS + logger.log(Level.INFO, "Indexed file chunks count: {0}", numIndexedChunks); //NON-NLS } catch (NoOpenCoreException | KeywordSearchModuleException ex) { - logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files/chunks: ", ex); + logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files/chunks: ", ex); //NON-NLS } } @@ -278,7 +278,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme * Handle stop event (ingest interrupted) Cleanup resources, threads, timers */ private void stop() { - logger.log(Level.INFO, "stop()"); + logger.log(Level.INFO, "stop()"); //NON-NLS SearchRunner.getInstance().stopJob(jobId); @@ -341,15 +341,15 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme } StringBuilder msg = new StringBuilder(); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append(""); - msg.append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl")).append("").append(text_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead")).append("").append(strings_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl")).append("").append(metadata_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.idxErrLbl")).append("").append(error_index).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errTxtLbl")).append("").append(error_text).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errIoLbl")).append("").append(error_io).append("
"); + msg.append(""); //NON-NLS + msg.append(""); //NON-NLS + msg.append(""); //NON-NLS + msg.append(""); //NON-NLS + msg.append(""); //NON-NLS + msg.append(""); //NON-NLS + msg.append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl")).append("").append(text_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead")).append("").append(strings_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl")).append("").append(metadata_ingested).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.idxErrLbl")).append("").append(error_index).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errTxtLbl")).append("").append(error_text).append("
").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errIoLbl")).append("").append(error_io).append("
"); //NON-NLS String indexStats = msg.toString(); - logger.log(Level.INFO, "Keyword Indexing Completed: {0}", indexStats); + logger.log(Level.INFO, "Keyword Indexing Completed: {0}", indexStats); //NON-NLS services.postMessage(IngestMessage.createMessage(MessageType.INFO, KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl"), indexStats)); if (error_index > 0) { MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle"), @@ -391,7 +391,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme } if (fileExtract == null) { - logger.log(Level.INFO, "No text extractor found for file id:{0}, name: {1}, detected format: {2}", new Object[]{aFile.getId(), aFile.getName(), detectedFormat}); + logger.log(Level.INFO, "No text extractor found for file id:{0}, name: {1}, detected format: {2}", new Object[]{aFile.getId(), aFile.getName(), detectedFormat}); //NON-NLS return false; } @@ -414,12 +414,12 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme putIngestStatus(aFile.getId(), IngestStatus.STRINGS_INGESTED); return true; } else { - logger.log(Level.WARNING, "Failed to extract strings and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()}); + logger.log(Level.WARNING, "Failed to extract strings and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()}); //NON-NLS putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT); return false; } } catch (IngesterException ex) { - logger.log(Level.WARNING, "Failed to extract strings and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").", ex); + logger.log(Level.WARNING, "Failed to extract strings and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").", ex); //NON-NLS putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING); return false; } @@ -469,7 +469,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme putIngestStatus(aFile.getId(), IngestStatus.METADATA_INGESTED); } catch (IngesterException ex) { putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING); - logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex); + logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex); //NON-NLS } return; } @@ -481,13 +481,13 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme is = new ReadContentInputStream(aFile); detectedFormat = tikaFormatDetector.detect(is, aFile.getName()); } catch (Exception e) { - logger.log(Level.WARNING, "Could not detect format using tika for file: " + aFile, e); + logger.log(Level.WARNING, "Could not detect format using tika for file: " + aFile, e); //NON-NLS } finally { if (is != null) { try { is.close(); } catch (IOException ex) { - logger.log(Level.WARNING, "Could not close stream after detecting format using tika for file: " + logger.log(Level.WARNING, "Could not close stream after detecting format using tika for file: " //NON-NLS + aFile, ex); } } @@ -505,7 +505,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme putIngestStatus(aFile.getId(), IngestStatus.METADATA_INGESTED); } catch (IngesterException ex) { putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING); - logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex); + logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex); //NON-NLS } return; } @@ -516,7 +516,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme try { //logger.log(Level.INFO, "indexing: " + aFile.getName()); if (!extractTextAndIndex(aFile, detectedFormat)) { - logger.log(Level.WARNING, "Failed to extract text and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()}); + logger.log(Level.WARNING, "Failed to extract text and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()}); //NON-NLS putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT); } else { putIngestStatus(aFile.getId(), IngestStatus.TEXT_INGESTED); @@ -524,11 +524,11 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme } } catch (IngesterException e) { - logger.log(Level.INFO, "Could not extract text with Tika, " + aFile.getId() + ", " + logger.log(Level.INFO, "Could not extract text with Tika, " + aFile.getId() + ", " //NON-NLS + aFile.getName(), e); putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING); } catch (Exception e) { - logger.log(Level.WARNING, "Error extracting text with Tika, " + aFile.getId() + ", " + logger.log(Level.WARNING, "Error extracting text with Tika, " + aFile.getId() + ", " //NON-NLS + aFile.getName(), e); putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java index d57f1d0e66..24b5973577 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java @@ -86,14 +86,14 @@ public final class KeywordSearchJobSettingsPanel extends IngestModuleIngestJobSe private void displayLanguages() { List