diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties index 9238a9f40a..bc7c8f2783 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties @@ -71,3 +71,9 @@ IngestJobConfigurationPanel.descriptionLabel.text= IngestProgressSnapshotDialog.title.text=Ingest Task Progress Snapshots IngestProgressSnapshotPanel.refreshButton.text=Refresh IngestProgressSnapshotPanel.closeButton.text=Close +IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.threadID=Thread ID +IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.dataSource=Data Source +IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.ingestModule=Ingest Module +IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.file=File +IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.startTime=Start Time +IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.elapsedTime=Elapsed Time (H\:M\:S) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index a452481e63..be24910cdd 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -63,8 +63,8 @@ class IngestMessagePanel extends JPanel implements TableModelListener { private MessageTableModel tableModel; private MessageTableRenderer renderer; private IngestMessageMainPanel mainPanel; - private static Font visitedFont = new Font("Arial", Font.PLAIN, 12); - private static Font notVisitedFont = new Font("Arial", Font.BOLD, 12); + private static Font visitedFont = new Font("Arial", Font.PLAIN, 12); //NON-NLS + private static Font notVisitedFont = new Font("Arial", Font.BOLD, 12); //NON-NLS private static Color ERROR_COLOR = new Color(255, 90, 90); private volatile int lastRowSelected = -1; private volatile long totalMessages = 0; @@ -132,7 +132,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener { jScrollPane1.setPreferredSize(new java.awt.Dimension(32767, 32767)); messageTable.setBackground(new java.awt.Color(221, 221, 235)); - messageTable.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N + messageTable.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N NON-NLS messageTable.setModel(tableModel); messageTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF); messageTable.setAutoscrolls(false); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java index 8e331598cb..55061fbe65 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java @@ -67,21 +67,21 @@ final class IngestModuleFactoryLoader { } // Kick out the sample module factories. - moduleFactoriesByClass.remove("org.sleuthkit.autopsy.examples.SampleIngestModuleFactory"); - moduleFactoriesByClass.remove("org.sleuthkit.autopsy.examples.SampleExecutableIngestModuleFactory"); + moduleFactoriesByClass.remove("org.sleuthkit.autopsy.examples.SampleIngestModuleFactory"); //NON-NLS + moduleFactoriesByClass.remove("org.sleuthkit.autopsy.examples.SampleExecutableIngestModuleFactory"); //NON-NLS // Do the core ingest module ordering hack described above. ArrayList coreModuleOrdering = new ArrayList() { { - add("org.sleuthkit.autopsy.recentactivity.RecentActivityExtracterModuleFactory"); - add("org.sleuthkit.autopsy.ewfverify.EwfVerifierModuleFactory"); - add("org.sleuthkit.autopsy.hashdatabase.HashLookupModuleFactory"); - add("org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory"); - add("org.sleuthkit.autopsy.modules.sevenzip.ArchiveFileExtractorModuleFactory"); - add("org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory"); - add("org.sleuthkit.autopsy.keywordsearch.KeywordSearchModuleFactory"); - add("org.sleuthkit.autopsy.thunderbirdparser.EmailParserModuleFactory"); - add("org.sleuthkit.autopsy.modules.fileextmismatch.FileExtMismatchDetectorModuleFactory"); + add("org.sleuthkit.autopsy.recentactivity.RecentActivityExtracterModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.ewfverify.EwfVerifierModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.hashdatabase.HashLookupModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.modules.sevenzip.ArchiveFileExtractorModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.keywordsearch.KeywordSearchModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.thunderbirdparser.EmailParserModuleFactory"); //NON-NLS + add("org.sleuthkit.autopsy.modules.fileextmismatch.FileExtMismatchDetectorModuleFactory"); //NON-NLS } }; List orderedModuleFactories = new ArrayList<>(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java index adea6c681f..0ea37f4679 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java @@ -26,6 +26,7 @@ import javax.swing.JDialog; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; import org.apache.commons.lang3.time.DurationFormatUtils; +import org.openide.util.NbBundle; import org.sleuthkit.datamodel.AbstractFile; public class IngestProgressSnapshotPanel extends javax.swing.JPanel { @@ -79,7 +80,18 @@ public class IngestProgressSnapshotPanel extends javax.swing.JPanel { private class SnapshotsTableModel extends AbstractTableModel { - private final String[] columnNames = {"Thread ID", "Data Source", "Ingest Module", "File", "Start Time", "Elapsed Time (H:M:S)"}; + private final String[] columnNames = {NbBundle.getMessage(this.getClass(), + "IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.threadID"), + NbBundle.getMessage(this.getClass(), + "IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.dataSource"), + NbBundle.getMessage(this.getClass(), + "IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.ingestModule"), + NbBundle.getMessage(this.getClass(), + "IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.file"), + NbBundle.getMessage(this.getClass(), + "IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.startTime"), + NbBundle.getMessage(this.getClass(), + "IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.elapsedTime")}; private List snapshots; private SnapshotsTableModel() {