Merge branch 'release-4.5.1' of github.com:sleuthkit/autopsy into release-4.5.1

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.form

@@ -99,11 +99,9 @@
       <SubComponents>
         <Component class="javax.swing.JTable" name="casesTable">
           <Properties>
-            <Property name="autoCreateRowSorter" type="boolean" value="true"/>
             <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
               <Connection code="caseTableModel" type="code"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestCasePanel.java

@@ -150,7 +150,7 @@ public final class AutoIngestCasePanel extends JPanel {
         theColumn.setWidth(STATUS_COL_PREFERRED_WIDTH);
 
         casesTable.removeColumn(casesTable.getColumn(OUTPUT_FOLDER_HEADER));
-
+        casesTable.setRowSorter(new AutoIngestRowSorter<>(caseTableModel));
         /*
          * Listen for row selection changes and set button state for the current
          * selection.
@@ -408,9 +408,7 @@ public final class AutoIngestCasePanel extends JPanel {
             }
         });
 
-        casesTable.setAutoCreateRowSorter(true);
         casesTable.setModel(caseTableModel);
-        casesTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         casesTable.setRowHeight(20);
         casesTable.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
         casesTable.addMouseListener(new java.awt.event.MouseAdapter() {

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestControlPanel.form

@@ -169,7 +169,6 @@
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestControlPanel.pendingTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20" postCode="pendingTable.setSelectionModel(new DefaultListSelectionModel() {&#xa;    private static final long serialVersionUID = 1L;&#xa;    @Override&#xa;    public void setSelectionInterval(int index0, int index1) {&#xa;        if (index0 == pendingTable.getSelectedRow()) {&#xa;            pendingTable.clearSelection();&#xa;        } else {&#xa;            super.setSelectionInterval(index0, index1);&#xa;        }&#xa;    }&#xa;});"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>
@@ -193,7 +192,6 @@
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestControlPanel.runningTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20" postCode="runningTable.setSelectionModel(new DefaultListSelectionModel() {&#xa;    private static final long serialVersionUID = 1L;&#xa;    @Override&#xa;    public void setSelectionInterval(int index0, int index1) {&#xa;        if (index0 == runningTable.getSelectedRow()) {&#xa;            runningTable.clearSelection();&#xa;        } else {&#xa;            super.setSelectionInterval(index0, index1);&#xa;        }&#xa;    }&#xa;});"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>
@@ -217,7 +215,6 @@
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestControlPanel.completedTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20" postCode="completedTable.setSelectionModel(new DefaultListSelectionModel() {&#xa;    private static final long serialVersionUID = 1L;&#xa;    @Override&#xa;    public void setSelectionInterval(int index0, int index1) {&#xa;        if (index0 == completedTable.getSelectedRow()) {&#xa;            completedTable.clearSelection();&#xa;        } else {&#xa;            super.setSelectionInterval(index0, index1);&#xa;        }&#xa;    }&#xa;});"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestControlPanel.java

@@ -39,7 +39,6 @@ import javax.swing.DefaultListSelectionModel;
 import java.awt.Color;
 import java.beans.PropertyChangeEvent;
 import java.io.File;
-import java.util.Collections;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -138,6 +137,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
     private static final int GENERIC_COL_MAX_WIDTH = 2000;
     private static final int PENDING_TABLE_COL_PREFERRED_WIDTH = 280;
     private static final int RUNNING_TABLE_COL_PREFERRED_WIDTH = 175;
+    private static final int PRIORITY_COLUMN_PREFERRED_WIDTH = 60;
+    private static final int PRIORITY_COLUMN_MAX_WIDTH = 150;
     private static final int ACTIVITY_TIME_COL_MIN_WIDTH = 250;
     private static final int ACTIVITY_TIME_COL_MAX_WIDTH = 450;
     private static final int TIME_COL_MIN_WIDTH = 30;
@@ -177,6 +178,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
      * ordinal or a column header string.
      */
     @Messages({
+        "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Priority=Prioritized",
         "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Case=Case",
         "AutoIngestControlPanel.JobsTableModel.ColumnHeader.ImageFolder=Data Source",
         "AutoIngestControlPanel.JobsTableModel.ColumnHeader.HostName=Host Name",
@@ -203,8 +205,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         STATUS(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Status")),
         CASE_DIRECTORY_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.CaseFolder")),
         IS_LOCAL_JOB(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.LocalJob")),
-        MANIFEST_FILE_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.ManifestFilePath"));
+        MANIFEST_FILE_PATH(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.ManifestFilePath")),
-
+        PRIORITY(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.JobsTableModel.ColumnHeader.Priority"));
         private final String header;
 
         private JobsTableModelColumns(String header) {
@@ -227,7 +229,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
             STAGE_TIME.getColumnHeader(),
             CASE_DIRECTORY_PATH.getColumnHeader(),
             IS_LOCAL_JOB.getColumnHeader(),
-            MANIFEST_FILE_PATH.getColumnHeader()};
+            MANIFEST_FILE_PATH.getColumnHeader(),
+            PRIORITY.getColumnHeader()};
     }
 
     /**
@@ -259,32 +262,11 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
 
         manager = AutoIngestManager.getInstance();
 
-        pendingTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
+        pendingTableModel = new AutoIngestTableModel(JobsTableModelColumns.headers, 0);
-            private static final long serialVersionUID = 1L;
 
-            @Override
+        runningTableModel = new AutoIngestTableModel(JobsTableModelColumns.headers, 0);
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
 
-        runningTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
+        completedTableModel = new AutoIngestTableModel(JobsTableModelColumns.headers, 0);
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
-
-        completedTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
 
         initComponents(); // Generated code.
         setServicesStatusMessage();
@@ -292,7 +274,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         initRunningJobsTable();
         initCompletedJobsTable();
         initButtons();
-
+        completedTable.getRowSorter().toggleSortOrder(JobsTableModelColumns.COMPLETED_TIME.ordinal());
         /*
          * Must set this flag, otherwise pop up menus don't close properly.
          */
@@ -412,10 +394,16 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         column.setPreferredWidth(TIME_COL_PREFERRED_WIDTH);
         column.setWidth(TIME_COL_PREFERRED_WIDTH);
 
+        column = pendingTable.getColumn(JobsTableModelColumns.PRIORITY.getColumnHeader());
+        column.setCellRenderer(new PrioritizedIconCellRenderer());
+        column.setMaxWidth(PRIORITY_COLUMN_MAX_WIDTH);
+        column.setPreferredWidth(PRIORITY_COLUMN_PREFERRED_WIDTH);
+        column.setWidth(PRIORITY_COLUMN_PREFERRED_WIDTH);
+
         /**
-         * Prevent sorting when a column header is clicked.
+         * Allow sorting when a column header is clicked.
          */
-        pendingTable.setAutoCreateRowSorter(false);
+        pendingTable.setRowSorter(new AutoIngestRowSorter<>(pendingTableModel));
 
         /*
          * Create a row selection listener to enable/disable the prioritize
@@ -454,7 +442,7 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.CASE_DIRECTORY_PATH.getColumnHeader()));
         runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.IS_LOCAL_JOB.getColumnHeader()));
         runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.MANIFEST_FILE_PATH.getColumnHeader()));
-
+        runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.PRIORITY.getColumnHeader()));
         /*
          * Set up a column to display the cases associated with the jobs.
          */
@@ -524,9 +512,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
     }
 
     private void updateRunningTableButtonsBasedOnSelectedRow() {
-        int row = runningTable.getSelectedRow();
+        int row = runningTable.convertRowIndexToModel(runningTable.getSelectedRow());
         if (row >= 0 && row < runningTable.getRowCount()) {
-            if ((boolean) runningTableModel.getValueAt(row, JobsTableModelColumns.IS_LOCAL_JOB.ordinal())) {
+            if ((boolean) runningTable.getModel().getValueAt(row, JobsTableModelColumns.IS_LOCAL_JOB.ordinal())) {
                 enableRunningTableButtons(true);
                 return;
             }
@@ -544,13 +532,13 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
          * does not remove the columns from the model, just from this table.
          */
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.STARTED_TIME.getColumnHeader()));
+        completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.HOST_NAME.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.STAGE.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.STAGE_TIME.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.IS_LOCAL_JOB.getColumnHeader()));
-        completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.HOST_NAME.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.CASE_DIRECTORY_PATH.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.MANIFEST_FILE_PATH.getColumnHeader()));
-
+        completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.PRIORITY.getColumnHeader()));
         /*
          * Set up a column to display the cases associated with the jobs.
          */
@@ -603,9 +591,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         column.setWidth(STATUS_COL_PREFERRED_WIDTH);
 
         /*
-         * Prevent sorting when a column header is clicked.
+         * Allow sorting when a column header is clicked.
          */
-        completedTable.setAutoCreateRowSorter(false);
+        completedTable.setRowSorter(new AutoIngestRowSorter<>(completedTableModel));
 
         /*
          * Create a row selection listener to enable/disable the delete case and
@@ -982,7 +970,6 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
             List<AutoIngestJob> completedJobs = new ArrayList<>();
             manager.getJobs(pendingJobs, runningJobs, completedJobs);
             // Sort the completed jobs list by completed date
-            Collections.sort(completedJobs, new AutoIngestJob.CompletedDateDescendingComparator());
             EventQueue.invokeLater(new RefreshComponentsTask(pendingJobs, runningJobs, completedJobs));
         }
     }
@@ -1030,9 +1017,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
              */
 
             if (null != pendingJobs) {
-                Path currentRow = getSelectedEntry(pendingTable, pendingTableModel);
+                Path currentRow = getSelectedEntry(pendingTable);
-                refreshTable(pendingJobs, pendingTableModel, null);
+                refreshTable(pendingJobs, (DefaultTableModel) pendingTable.getModel(), null);
-                setSelectedEntry(pendingTable, pendingTableModel, currentRow);
+                setSelectedEntry(pendingTable, currentRow);
             }
 
             if (null != runningJobs) {
@@ -1041,15 +1028,15 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
                 } else {
                     updateRunningTableButtonsBasedOnSelectedRow();
                 }
-                Path currentRow = getSelectedEntry(runningTable, runningTableModel);
+                Path currentRow = getSelectedEntry(runningTable);
-                refreshTable(runningJobs, runningTableModel, null);
+                refreshTable(runningJobs, (DefaultTableModel) runningTable.getModel(), null);
-                setSelectedEntry(runningTable, runningTableModel, currentRow);
+                setSelectedEntry(runningTable, currentRow);
             }
 
             if (null != completedJobs) {
-                Path currentRow = getSelectedEntry(completedTable, completedTableModel);
+                Path currentRow = getSelectedEntry(completedTable);
-                refreshTable(completedJobs, completedTableModel, null);
+                refreshTable(completedJobs, (DefaultTableModel) completedTable.getModel(), null);
-                setSelectedEntry(completedTable, completedTableModel, currentRow);
+                setSelectedEntry(completedTable, currentRow);
             }
         }
 
@@ -1087,12 +1074,12 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
          *
          * @return a path representing the current selection
          */
-        Path getSelectedEntry(JTable table, DefaultTableModel tableModel) {
+        Path getSelectedEntry(JTable table) {
             try {
-                int currentlySelectedRow = table.getSelectedRow();
+                int currentlySelectedRow = table.convertRowIndexToModel(table.getSelectedRow());
                 if (currentlySelectedRow >= 0 && currentlySelectedRow < table.getRowCount()) {
-                    return Paths.get(tableModel.getValueAt(currentlySelectedRow, JobsTableModelColumns.CASE.ordinal()).toString(),
+                    return Paths.get(table.getModel().getValueAt(currentlySelectedRow, JobsTableModelColumns.CASE.ordinal()).toString(),
-                            tableModel.getValueAt(currentlySelectedRow, JobsTableModelColumns.DATA_SOURCE.ordinal()).toString());
+                            table.getModel().getValueAt(currentlySelectedRow, JobsTableModelColumns.DATA_SOURCE.ordinal()).toString());
                 }
             } catch (Exception ignored) {
                 return null;
@@ -1108,12 +1095,12 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
          * @param tableModel The tableModel of the table to set
          * @param path       The path of the item to set
          */
-        void setSelectedEntry(JTable table, DefaultTableModel tableModel, Path path) {
+        void setSelectedEntry(JTable table, Path path) {
             if (path != null) {
                 try {
                     for (int row = 0; row < table.getRowCount(); ++row) {
-                        Path temp = Paths.get(tableModel.getValueAt(row, JobsTableModelColumns.CASE.ordinal()).toString(),
+                        Path temp = Paths.get(table.getModel().getValueAt(row, JobsTableModelColumns.CASE.ordinal()).toString(),
-                                tableModel.getValueAt(row, JobsTableModelColumns.DATA_SOURCE.ordinal()).toString());
+                                table.getModel().getValueAt(row, JobsTableModelColumns.DATA_SOURCE.ordinal()).toString());
                         if (temp.compareTo(path) == 0) { // found it
                             table.setRowSelectionInterval(row, row);
                             return;
@@ -1156,7 +1143,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
                     ((Date.from(Instant.now()).getTime()) - (status.getStartDate().getTime())), // ACTIVITY_TIME
                     job.getCaseDirectoryPath(), // CASE_DIRECTORY_PATH
                     job.getProcessingHostName().equals(LOCAL_HOST_NAME), // IS_LOCAL_JOB
-                    job.getManifest().getFilePath()}); // MANIFEST_FILE_PATH
+                    job.getManifest().getFilePath(), // MANIFEST_FILE_PATH
+                    job.getPriority()}); // PRIORITY 
             }
         } catch (Exception ex) {
             SYS_LOGGER.log(Level.SEVERE, "Dashboard error refreshing table", ex);
@@ -1168,9 +1156,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
      */
     private void refreshTables() {
         JobsSnapshot jobsSnapshot = manager.getCurrentJobsSnapshot();
-        refreshTable(jobsSnapshot.getCompletedJobs(), completedTableModel, null);
+        refreshTable(jobsSnapshot.getCompletedJobs(), (DefaultTableModel) completedTable.getModel(), null);
-        refreshTable(jobsSnapshot.getPendingJobs(), pendingTableModel, null);
+        refreshTable(jobsSnapshot.getPendingJobs(), (DefaultTableModel) pendingTable.getModel(), null);
-        refreshTable(jobsSnapshot.getRunningJobs(), runningTableModel, null);
+        refreshTable(jobsSnapshot.getRunningJobs(), (DefaultTableModel) runningTable.getModel(), null);
     }
 
     /**
@@ -1211,7 +1199,6 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
 
         pendingTable.setModel(pendingTableModel);
         pendingTable.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.pendingTable.toolTipText")); // NOI18N
-        pendingTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         pendingTable.setRowHeight(20);
         pendingTable.setSelectionModel(new DefaultListSelectionModel() {
             private static final long serialVersionUID = 1L;
@@ -1229,7 +1216,6 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
 
         runningTable.setModel(runningTableModel);
         runningTable.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.runningTable.toolTipText")); // NOI18N
-        runningTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         runningTable.setRowHeight(20);
         runningTable.setSelectionModel(new DefaultListSelectionModel() {
             private static final long serialVersionUID = 1L;
@@ -1247,7 +1233,6 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
 
         completedTable.setModel(completedTableModel);
         completedTable.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestControlPanel.completedTable.toolTipText")); // NOI18N
-        completedTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         completedTable.setRowHeight(20);
         completedTable.setSelectionModel(new DefaultListSelectionModel() {
             private static final long serialVersionUID = 1L;
@@ -1425,10 +1410,10 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
                                     .addComponent(completedScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 920, javax.swing.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                    .addComponent(bnCancelJob, javax.swing.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
+                                    .addComponent(bnCancelJob, javax.swing.GroupLayout.PREFERRED_SIZE, 117, Short.MAX_VALUE)
-                                    .addComponent(bnShowProgress, javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
+                                    .addComponent(bnShowProgress, javax.swing.GroupLayout.PREFERRED_SIZE, 116, Short.MAX_VALUE)
-                                    .addComponent(bnCancelModule, javax.swing.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
+                                    .addComponent(bnCancelModule, javax.swing.GroupLayout.PREFERRED_SIZE, 117, Short.MAX_VALUE)
-                                    .addComponent(bnDeleteCase, javax.swing.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
+                                    .addComponent(bnDeleteCase, javax.swing.GroupLayout.PREFERRED_SIZE, 117, Short.MAX_VALUE)
                                     .addComponent(bnShowCaseLog, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                     .addComponent(bnReprocessJob, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                             .addGroup(layout.createSequentialGroup()
@@ -1535,11 +1520,11 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         "AutoIngestControlPanel.DeletionFailed=Deletion failed for job"
     })
     private void bnDeleteCaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnDeleteCaseActionPerformed
-        if (completedTableModel.getRowCount() < 0 || completedTable.getSelectedRow() < 0) {
+        if (completedTable.getModel().getRowCount() < 0 || completedTable.getSelectedRow() < 0) {
             return;
         }
 
-        String caseName = (String) completedTable.getValueAt(completedTable.getSelectedRow(), JobsTableModelColumns.CASE.ordinal());
+        String caseName = (String) completedTable.getModel().getValueAt(completedTable.convertRowIndexToModel(completedTable.getSelectedRow()), JobsTableModelColumns.CASE.ordinal());
         Object[] options = {
             org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "ConfirmationDialog.Delete"),
             org.openide.util.NbBundle.getMessage(AutoIngestControlPanel.class, "ConfirmationDialog.DoNotDelete")
@@ -1556,8 +1541,8 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
         if (reply == JOptionPane.YES_OPTION) {
             bnDeleteCase.setEnabled(false);
             bnShowCaseLog.setEnabled(false);
-            if (completedTableModel.getRowCount() > 0 && completedTable.getSelectedRow() >= 0) {
+            if (completedTable.getModel().getRowCount() > 0 && completedTable.getSelectedRow() >= 0) {
-                Path caseDirectoryPath = (Path) completedTableModel.getValueAt(completedTable.getSelectedRow(), JobsTableModelColumns.CASE_DIRECTORY_PATH.ordinal());
+                Path caseDirectoryPath = (Path) completedTable.getModel().getValueAt(completedTable.convertRowIndexToModel(completedTable.getSelectedRow()), JobsTableModelColumns.CASE_DIRECTORY_PATH.ordinal());
                 completedTable.clearSelection();
                 this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                 CaseDeletionResult result = manager.deleteCase(caseName, caseDirectoryPath);
@@ -1703,9 +1688,10 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
      */
     @Messages({"AutoIngestControlPanel.casePrioritization.errorMessage=An error occurred when prioritizing the case. Some or all jobs may not have been prioritized."})
     private void bnPrioritizeCaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnPrioritizeCaseActionPerformed
-        if (pendingTableModel.getRowCount() > 0 && pendingTable.getSelectedRow() >= 0) {
+        if (pendingTable.getModel().getRowCount() > 0 && pendingTable.getSelectedRow() >= 0) {
             this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            String caseName = (pendingTableModel.getValueAt(pendingTable.getSelectedRow(), JobsTableModelColumns.CASE.ordinal())).toString();
+
+            String caseName = (pendingTable.getModel().getValueAt(pendingTable.convertRowIndexToModel(pendingTable.getSelectedRow()), JobsTableModelColumns.CASE.ordinal())).toString();
             try {
                 manager.prioritizeCase(caseName);
             } catch (AutoIngestManager.AutoIngestManagerException ex) {
@@ -1731,9 +1717,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
     })
     private void bnShowCaseLogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnShowCaseLogActionPerformed
         try {
-            int selectedRow = completedTable.getSelectedRow();
+            int selectedRow = completedTable.convertRowIndexToModel(completedTable.getSelectedRow());
             if (selectedRow != -1) {
-                Path caseDirectoryPath = (Path) completedTableModel.getValueAt(selectedRow, JobsTableModelColumns.CASE_DIRECTORY_PATH.ordinal());
+                Path caseDirectoryPath = (Path) completedTable.getModel().getValueAt(selectedRow, JobsTableModelColumns.CASE_DIRECTORY_PATH.ordinal());
                 if (null != caseDirectoryPath) {
                     Path pathToLog = AutoIngestJobLogger.getLogPath(caseDirectoryPath);
                     if (pathToLog.toFile().exists()) {
@@ -1762,9 +1748,9 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
 
     @Messages({"AutoIngestControlPanel.jobPrioritization.errorMessage=An error occurred when prioritizing the job."})
     private void bnPrioritizeJobActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnPrioritizeJobActionPerformed
-        if (pendingTableModel.getRowCount() > 0 && pendingTable.getSelectedRow() >= 0) {
+        if (pendingTable.getModel().getRowCount() > 0 && pendingTable.getSelectedRow() >= 0) {
             this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            Path manifestFilePath = (Path) (pendingTableModel.getValueAt(pendingTable.getSelectedRow(), JobsTableModelColumns.MANIFEST_FILE_PATH.ordinal()));
+            Path manifestFilePath = (Path) (pendingTable.getModel().getValueAt(pendingTable.convertRowIndexToModel(pendingTable.getSelectedRow()), JobsTableModelColumns.MANIFEST_FILE_PATH.ordinal()));
             try {
                 manager.prioritizeJob(manifestFilePath);
             } catch (AutoIngestManager.AutoIngestManagerException ex) {
@@ -1791,11 +1777,11 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
     }//GEN-LAST:event_bnOpenLogDirActionPerformed
 
     private void bnReprocessJobActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnReprocessJobActionPerformed
-        if (completedTableModel.getRowCount() < 0 || completedTable.getSelectedRow() < 0) {
+        if (completedTable.getModel().getRowCount() < 0 || completedTable.getSelectedRow() < 0) {
             return;
         }
         this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        Path manifestPath = (Path) completedTableModel.getValueAt(completedTable.getSelectedRow(), JobsTableModelColumns.MANIFEST_FILE_PATH.ordinal());
+        Path manifestPath = (Path) completedTable.getModel().getValueAt(completedTable.convertRowIndexToModel(completedTable.getSelectedRow()), JobsTableModelColumns.MANIFEST_FILE_PATH.ordinal());
         manager.reprocessJob(manifestPath);
         refreshTables();
         AutoIngestControlPanel.this.setCursor(Cursor.getDefaultCursor());
@@ -1830,4 +1816,33 @@ public final class AutoIngestControlPanel extends JPanel implements Observer {
     private javax.swing.JTextField tbStatusMessage;
     // End of variables declaration//GEN-END:variables
 
+    private class AutoIngestTableModel extends DefaultTableModel {
+
+        private static final long serialVersionUID = 1L;
+
+        private AutoIngestTableModel(String[] headers, int i) {
+            super(headers, i);
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int column) {
+            return false;
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            if (columnIndex == JobsTableModelColumns.PRIORITY.ordinal()) {
+                return Integer.class;
+            } else if (columnIndex == JobsTableModelColumns.CREATED_TIME.ordinal()
+                    || columnIndex == JobsTableModelColumns.COMPLETED_TIME.ordinal()
+                    || columnIndex == JobsTableModelColumns.STARTED_TIME.ordinal()
+                    || columnIndex == JobsTableModelColumns.STAGE_TIME.ordinal()) {
+                return Date.class;
+            } else if (columnIndex == JobsTableModelColumns.STATUS.ordinal()) {
+                return Boolean.class;
+            } else {
+                return super.getColumnClass(columnIndex);
+            }
+        }
+    }
 }

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.form

@@ -103,7 +103,6 @@
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestDashboard.pendingTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20" postCode="pendingTable.setSelectionModel(new DefaultListSelectionModel() {&#xa;    private static final long serialVersionUID = 1L;&#xa;    @Override&#xa;    public void setSelectionInterval(int index0, int index1) {&#xa;        if (index0 == pendingTable.getSelectedRow()) {&#xa;            pendingTable.clearSelection();&#xa;        } else {&#xa;            super.setSelectionInterval(index0, index1);&#xa;        }&#xa;    }&#xa;});"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>
@@ -127,7 +126,6 @@
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestDashboard.runningTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20" postCode="runningTable.setSelectionModel(new DefaultListSelectionModel() {&#xa;    private static final long serialVersionUID = 1L;&#xa;    @Override&#xa;    public void setSelectionInterval(int index0, int index1) {&#xa;        if (index0 == runningTable.getSelectedRow()) {&#xa;            runningTable.clearSelection();&#xa;        } else {&#xa;            super.setSelectionInterval(index0, index1);&#xa;        }&#xa;    }&#xa;});"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>
@@ -151,7 +149,6 @@
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties" key="AutoIngestDashboard.completedTable.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="autoResizeMode" type="int" value="4"/>
             <Property name="rowHeight" type="int" value="20" postCode="completedTable.setSelectionModel(new DefaultListSelectionModel() {&#xa;    private static final long serialVersionUID = 1L;&#xa;    @Override&#xa;    public void setSelectionInterval(int index0, int index1) {&#xa;        if (index0 == completedTable.getSelectedRow()) {&#xa;            completedTable.clearSelection();&#xa;        } else {&#xa;            super.setSelectionInterval(index0, index1);&#xa;        }&#xa;    }&#xa;});"/>
             <Property name="selectionModel" type="javax.swing.ListSelectionModel" editor="org.netbeans.modules.form.editors2.JTableSelectionModelEditor">
               <JTableSelectionModel selectionMode="0"/>

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java

@@ -48,13 +48,15 @@ import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMonitor.JobsSnaps
 /**
  * A dashboard for monitoring an automated ingest cluster.
  */
-public final class AutoIngestDashboard extends JPanel implements Observer {
+final class AutoIngestDashboard extends JPanel implements Observer {
 
     private static final long serialVersionUID = 1L;
     private static final int GENERIC_COL_MIN_WIDTH = 30;
     private static final int GENERIC_COL_MAX_WIDTH = 2000;
     private static final int PENDING_TABLE_COL_PREFERRED_WIDTH = 280;
     private static final int RUNNING_TABLE_COL_PREFERRED_WIDTH = 175;
+    private static final int PRIORITY_COLUMN_PREFERRED_WIDTH = 60;
+    private static final int PRIORITY_COLUMN_MAX_WIDTH = 150;
     private static final int STAGE_TIME_COL_MIN_WIDTH = 250;
     private static final int STAGE_TIME_COL_MAX_WIDTH = 450;
     private static final int TIME_COL_MIN_WIDTH = 30;
@@ -100,32 +102,11 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
      * Constructs a panel for monitoring an automated ingest cluster.
      */
     private AutoIngestDashboard() {
-        pendingTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
+        pendingTableModel = new AutoIngestTableModel(JobsTableModelColumns.headers, 0);
-            private static final long serialVersionUID = 1L;
 
-            @Override
+        runningTableModel = new AutoIngestTableModel(JobsTableModelColumns.headers, 0);
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
 
-        runningTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
+        completedTableModel = new AutoIngestTableModel(JobsTableModelColumns.headers, 0);
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
-
-        completedTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
 
         initComponents();
         setServicesStatusMessage();
@@ -243,10 +224,15 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
         column.setPreferredWidth(TIME_COL_PREFERRED_WIDTH);
         column.setWidth(TIME_COL_PREFERRED_WIDTH);
 
-        /**
+        column = pendingTable.getColumn(JobsTableModelColumns.PRIORITY.getColumnHeader());
-         * Prevent sorting when a column header is clicked.
+        column.setCellRenderer(new PrioritizedIconCellRenderer());
+        column.setMaxWidth(PRIORITY_COLUMN_MAX_WIDTH);
+        column.setPreferredWidth(PRIORITY_COLUMN_PREFERRED_WIDTH);
+        column.setWidth(PRIORITY_COLUMN_PREFERRED_WIDTH);
+        /*
+         * Allow sorting when a column header is clicked.
          */
-        pendingTable.setAutoCreateRowSorter(false);
+        pendingTable.setRowSorter(new AutoIngestRowSorter<>(pendingTableModel));
 
         /*
          * Create a row selection listener to enable/disable the Prioritize
@@ -257,8 +243,8 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
                 return;
             }
             int row = pendingTable.getSelectedRow();
-			
+
-			boolean enablePrioritizeButtons = (row >= 0 && row < pendingTable.getRowCount());
+            boolean enablePrioritizeButtons = (row >= 0 && row < pendingTable.getRowCount());
             this.prioritizeJobButton.setEnabled(enablePrioritizeButtons);
             this.prioritizeCaseButton.setEnabled(enablePrioritizeButtons);
         });
@@ -280,7 +266,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
         runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.CASE_DIRECTORY_PATH.getColumnHeader()));
         runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.MANIFEST_FILE_PATH.getColumnHeader()));
         runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.JOB.getColumnHeader()));
-
+        runningTable.removeColumn(runningTable.getColumn(JobsTableModelColumns.PRIORITY.getColumnHeader()));
         /*
          * Set up a column to display the cases associated with the jobs.
          */
@@ -354,7 +340,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.CASE_DIRECTORY_PATH.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.MANIFEST_FILE_PATH.getColumnHeader()));
         completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.JOB.getColumnHeader()));
-
+        completedTable.removeColumn(completedTable.getColumn(JobsTableModelColumns.PRIORITY.getColumnHeader()));
         /*
          * Set up a column to display the cases associated with the jobs.
          */
@@ -405,11 +391,10 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
         column.setMaxWidth(STATUS_COL_MAX_WIDTH);
         column.setPreferredWidth(STATUS_COL_PREFERRED_WIDTH);
         column.setWidth(STATUS_COL_PREFERRED_WIDTH);
-
         /*
-         * Prevent sorting when a column header is clicked.
+         * Allow sorting when a column header is clicked.
          */
-        completedTable.setAutoCreateRowSorter(false);
+        completedTable.setRowSorter(new AutoIngestRowSorter<>(completedTableModel));
     }
 
     /**
@@ -476,6 +461,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
                     ((Date.from(Instant.now()).getTime()) - (status.getStartDate().getTime())), // STAGE_TIME
                     job.getCaseDirectoryPath(), // CASE_DIRECTORY_PATH
                     job.getManifest().getFilePath(), // MANIFEST_FILE_PATH
+                    job.getPriority(), // PRIORITY 
                     job
                 });
             }
@@ -541,6 +527,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
      * described by either an enum ordinal or a column header string.
      */
     private enum JobsTableModelColumns {
+        @Messages({"AutoIngestDashboard.JobsTableModel.ColumnHeader.Priority=Prioritized"})
 
         CASE(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Case")),
         DATA_SOURCE(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.ImageFolder")),
@@ -553,6 +540,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
         STATUS(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Status")),
         CASE_DIRECTORY_PATH(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.CaseFolder")),
         MANIFEST_FILE_PATH(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.ManifestFilePath")),
+        PRIORITY(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Priority")),
         JOB(NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.JobsTableModel.ColumnHeader.Job"));
 
         private final String header;
@@ -577,6 +565,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
             STAGE_TIME.getColumnHeader(),
             CASE_DIRECTORY_PATH.getColumnHeader(),
             MANIFEST_FILE_PATH.getColumnHeader(),
+            PRIORITY.getColumnHeader(),
             JOB.getColumnHeader()
         };
     };
@@ -667,7 +656,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
 
         pendingTable.setModel(pendingTableModel);
         pendingTable.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.pendingTable.toolTipText")); // NOI18N
-        pendingTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         pendingTable.setRowHeight(20);
         pendingTable.setSelectionModel(new DefaultListSelectionModel() {
             private static final long serialVersionUID = 1L;
@@ -685,7 +673,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
 
         runningTable.setModel(runningTableModel);
         runningTable.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.runningTable.toolTipText")); // NOI18N
-        runningTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         runningTable.setRowHeight(20);
         runningTable.setSelectionModel(new DefaultListSelectionModel() {
             private static final long serialVersionUID = 1L;
@@ -703,7 +690,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
 
         completedTable.setModel(completedTableModel);
         completedTable.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.completedTable.toolTipText")); // NOI18N
-        completedTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);
         completedTable.setRowHeight(20);
         completedTable.setSelectionModel(new DefaultListSelectionModel() {
             private static final long serialVersionUID = 1L;
@@ -890,4 +876,33 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
     private javax.swing.JTextField tbServicesStatusMessage;
     // End of variables declaration//GEN-END:variables
 
+    private class AutoIngestTableModel extends DefaultTableModel {
+
+        private static final long serialVersionUID = 1L;
+
+        private AutoIngestTableModel(String[] headers, int i) {
+            super(headers, i);
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int column) {
+            return false;
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            if (columnIndex == JobsTableModelColumns.PRIORITY.ordinal()) {
+                return Integer.class;
+            } else if (columnIndex == JobsTableModelColumns.CREATED_TIME.ordinal()
+                    || columnIndex == JobsTableModelColumns.COMPLETED_TIME.ordinal()
+                    || columnIndex == JobsTableModelColumns.STARTED_TIME.ordinal()
+                    || columnIndex == JobsTableModelColumns.STAGE_TIME.ordinal()) {
+                return Date.class;
+            } else if (columnIndex == JobsTableModelColumns.STATUS.ordinal()) {
+                return Boolean.class;
+            } else {
+                return super.getColumnClass(columnIndex);
+            }
+        }
+    }
 }

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java

@@ -61,7 +61,6 @@ import java.util.stream.Collectors;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
-import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.Case.CaseType;
@@ -122,7 +121,6 @@ public final class AutoIngestManager extends Observable implements PropertyChang
     private static final int NUM_INPUT_SCAN_SCHEDULING_THREADS = 1;
     private static final String INPUT_SCAN_SCHEDULER_THREAD_NAME = "AIM-input-scan-scheduler-%d";
     private static final String INPUT_SCAN_THREAD_NAME = "AIM-input-scan-%d";
-    private static int DEFAULT_JOB_PRIORITY = 0;
     private static final String AUTO_INGEST_THREAD_NAME = "AIM-job-processing-%d";
     private static final String LOCAL_HOST_NAME = NetworkUtils.getLocalHostName();
     private static final String EVENT_CHANNEL_NAME = "Auto-Ingest-Manager-Events";
@@ -503,6 +501,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
         }
         SYS_LOGGER.log(Level.INFO, "Starting input scan of {0}", rootInputDirectory);
         InputDirScanner scanner = new InputDirScanner();
+
         scanner.scan();
         SYS_LOGGER.log(Level.INFO, "Completed input scan of {0}", rootInputDirectory);
     }
@@ -558,10 +557,12 @@ public final class AutoIngestManager extends Observable implements PropertyChang
             if (!prioritizedJobs.isEmpty()) {
                 ++maxPriority;
                 for (AutoIngestJob job : prioritizedJobs) {
+                    int oldPriority = job.getPriority();
+                      job.setPriority(maxPriority);
                     try {
                         this.updateCoordinationServiceNode(job);
-                        job.setPriority(maxPriority);
                     } catch (CoordinationServiceException | InterruptedException ex) {
+                        job.setPriority(oldPriority);
                         throw new AutoIngestManagerException("Error updating case priority", ex);
                     }
                 }
@@ -612,12 +613,14 @@ public final class AutoIngestManager extends Observable implements PropertyChang
              */
             if (null != prioritizedJob) {
                 ++maxPriority;
+                int oldPriority = prioritizedJob.getPriority();
+                prioritizedJob.setPriority(maxPriority);
                 try {
                     this.updateCoordinationServiceNode(prioritizedJob);
                 } catch (CoordinationServiceException | InterruptedException ex) {
+                    prioritizedJob.setPriority(oldPriority);
                     throw new AutoIngestManagerException("Error updating job priority", ex);
                 }
-                prioritizedJob.setPriority(maxPriority);
             }
 
             Collections.sort(pendingJobs, new AutoIngestJob.PriorityComparator());
@@ -1046,8 +1049,8 @@ public final class AutoIngestManager extends Observable implements PropertyChang
 
                 if (null != manifest) {
                     /*
-                 * Update the mapping of case names to manifest paths that is
+                     * Update the mapping of case names to manifest paths that
-                 * used for case deletion.
+                     * is used for case deletion.
                      */
                     String caseName = manifest.getCaseName();
                     Path manifestPath = manifest.getFilePath();
@@ -1061,8 +1064,8 @@ public final class AutoIngestManager extends Observable implements PropertyChang
                     }
 
                     /*
-                 * Add a job to the pending jobs queue, the completed jobs list,
+                     * Add a job to the pending jobs queue, the completed jobs
-                 * or do crashed job recovery, as required.
+                     * list, or do crashed job recovery, as required.
                      */
                     try {
                         byte[] rawData = coordinationService.getNodeData(CoordinationService.CategoryNode.MANIFESTS, manifestPath.toString());
@@ -1082,7 +1085,7 @@ public final class AutoIngestManager extends Observable implements PropertyChang
                                         break;
                                     case DELETED:
                                         /*
-                                     * Ignore jobs marked as "deleted."
+                                         * Ignore jobs marked as "deleted."
                                          */
                                         break;
                                     default:
@@ -1242,48 +1245,38 @@ public final class AutoIngestManager extends Observable implements PropertyChang
                 if (null != manifestLock) {
                     SYS_LOGGER.log(Level.SEVERE, "Attempting crash recovery for {0}", manifestPath);
                     try {
+                        Path caseDirectoryPath = PathUtils.findCaseDirectory(rootOutputDirectory, manifest.getCaseName());
+                        
                         /*
                          * Create the recovery job.
                          */
                         AutoIngestJob job = new AutoIngestJob(nodeData);
                         int numberOfCrashes = job.getNumberOfCrashes();
-                        ++numberOfCrashes;
+                        if (numberOfCrashes <= AutoIngestUserPreferences.getMaxNumTimesToProcessImage()) {
-                        job.setNumberOfCrashes(numberOfCrashes);
+                            ++numberOfCrashes;
-                        job.setCompletedDate(new Date(0));
+                            job.setNumberOfCrashes(numberOfCrashes);
-                        Path caseDirectoryPath = PathUtils.findCaseDirectory(rootOutputDirectory, manifest.getCaseName());
+                            if (numberOfCrashes <= AutoIngestUserPreferences.getMaxNumTimesToProcessImage()) {
+                                job.setCompletedDate(new Date(0));
+                            } else {
+                                job.setCompletedDate(Date.from(Instant.now()));
+                            }
+                        }
+
                         if (null != caseDirectoryPath) {
                             job.setCaseDirectoryPath(caseDirectoryPath);
                             job.setErrorsOccurred(true);
-                        } else {
-                            job.setErrorsOccurred(false);
-                        }
-
-                        /*
-                         * Update the coordination service node for the job. If
-                         * this fails, leave the recovery to another host.
-                         */
-                        try {
-                            updateCoordinationServiceNode(job);
-                            if (numberOfCrashes <= AutoIngestUserPreferences.getMaxNumTimesToProcessImage()) {
-                                newPendingJobsList.add(job);
-                            } else {
-                                newCompletedJobsList.add(new AutoIngestJob(nodeData));
-                            }
-                        } catch (CoordinationServiceException ex) {
-                            SYS_LOGGER.log(Level.SEVERE, String.format("Error attempting to set node data for %s", manifestPath), ex);
-                            return;
-                        }
-
-                        /*
-                         * Write the alert file and do the logging.
-                         */
-                        if (null != caseDirectoryPath) {
                             try {
-                                AutoIngestAlertFile.create(nodeData.getCaseDirectoryPath());
+                                /*
+                                 * Write the alert file and do the logging.
+                                 */
+                                AutoIngestAlertFile.create(caseDirectoryPath);
                             } catch (AutoIngestAlertFileException ex) {
                                 SYS_LOGGER.log(Level.SEVERE, String.format("Error creating alert file for crashed job for %s", manifestPath), ex);
                             }
+                        } else {
+                            job.setErrorsOccurred(false);
                         }
+                        
                         if (numberOfCrashes <= AutoIngestUserPreferences.getMaxNumTimesToProcessImage()) {
                             job.setProcessingStatus(AutoIngestJob.ProcessingStatus.PENDING);
                             if (null != caseDirectoryPath) {
@@ -1297,13 +1290,32 @@ public final class AutoIngestManager extends Observable implements PropertyChang
                             job.setProcessingStatus(AutoIngestJob.ProcessingStatus.COMPLETED);
                             if (null != caseDirectoryPath) {
                                 try {
-                                    new AutoIngestJobLogger(manifest.getFilePath(), manifest.getDataSourceFileName(), nodeData.getCaseDirectoryPath()).logCrashRecoveryNoRetry();
+                                    new AutoIngestJobLogger(manifest.getFilePath(), manifest.getDataSourceFileName(), caseDirectoryPath).logCrashRecoveryNoRetry();
                                 } catch (AutoIngestJobLoggerException ex) {
                                     SYS_LOGGER.log(Level.SEVERE, String.format("Error creating case auto ingest log entry for crashed job for %s", manifestPath), ex);
                                 }
                             }
                         }
 
+                        /*
+                         * Update the coordination service node for the job. If
+                         * this fails, leave the recovery to another host.
+                         */
+                        try {
+                            updateCoordinationServiceNode(job);
+                        } catch (CoordinationServiceException ex) {
+                            SYS_LOGGER.log(Level.SEVERE, String.format("Error attempting to set node data for %s", manifestPath), ex);
+                            return;
+                        }
+                        
+                        nodeData = new AutoIngestJobNodeData(job);
+                        
+                        if (numberOfCrashes <= AutoIngestUserPreferences.getMaxNumTimesToProcessImage()) {
+                            newPendingJobsList.add(job);
+                        } else {
+                            newCompletedJobsList.add(new AutoIngestJob(nodeData));
+                        }
+
                     } finally {
                         try {
                             manifestLock.release();
@@ -3060,4 +3072,4 @@ public final class AutoIngestManager extends Observable implements PropertyChang
 
     }
 
-}
+}

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestRowSorter.java

@@ -0,0 +1,57 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2017 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.experimental.autoingest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import javax.swing.RowSorter;
+import javax.swing.SortOrder;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableRowSorter;
+
+/**
+ * RowSorter which makes columns whose type is Date to be sorted first in
+ * Descending order then in Ascending order
+ */
+class AutoIngestRowSorter<M extends DefaultTableModel> extends TableRowSorter<M> {
+
+    AutoIngestRowSorter(M tModel) {
+        super(tModel);
+    }
+
+    @Override
+    public void toggleSortOrder(int column) {
+            if (!this.getModel().getColumnClass(column).equals(Date.class) && !this.getModel().getColumnClass(column).equals(Integer.class)) {
+                //currently the only Integer column this sorter is being applied to is the Priority column
+                super.toggleSortOrder(column);  //if it isn't a date or Integer column perform the regular sorting
+        } else {  
+            ArrayList<RowSorter.SortKey> sortKeys = new ArrayList<>(getSortKeys());
+            if (sortKeys.isEmpty() || sortKeys.get(0).getColumn() != column) {  //sort descending
+                sortKeys.add(0, new RowSorter.SortKey(column, SortOrder.DESCENDING));
+            } else if (sortKeys.get(0).getSortOrder() == SortOrder.ASCENDING) {
+                sortKeys.removeIf(key -> key.getColumn() == column);
+                sortKeys.add(0, new RowSorter.SortKey(column, SortOrder.DESCENDING));
+            } else {
+                sortKeys.removeIf(key -> key.getColumn() == column);
+                sortKeys.add(0, new RowSorter.SortKey(column, SortOrder.ASCENDING));
+            }
+            setSortKeys(sortKeys);
+        }
+    }
+}

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/PrioritizedIconCellRenderer.java

@@ -0,0 +1,58 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2017 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.experimental.autoingest;
+
+import java.awt.Component;
+import javax.swing.ImageIcon;
+import javax.swing.JTable;
+import static javax.swing.SwingConstants.CENTER;
+import org.openide.util.ImageUtilities;
+import org.openide.util.NbBundle.Messages;
+
+/**
+ * A JTable cell renderer that represents whether the priority value of a job
+ * has ever been increased, tick if prioritized nothing if not.
+ */
+class PrioritizedIconCellRenderer extends GrayableCellRenderer {
+
+    
+    @Messages({
+        "PrioritizedIconCellRenderer.prioritized.tooltiptext=This job has been prioritized. The most recently prioritized job should be processed next.",
+        "PrioritizedIconCellRenderer.notPrioritized.tooltiptext=This job has not been prioritized."
+    })
+    private static final long serialVersionUID = 1L;
+    static final ImageIcon checkedIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/experimental/images/tick.png", false));
+
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+        setHorizontalAlignment(CENTER);
+        if ((value instanceof Integer)) {
+            if ((int) value == 0) {
+                setIcon(null);
+                setToolTipText(org.openide.util.NbBundle.getMessage(CaseStatusIconCellRenderer.class, "PrioritizedIconCellRenderer.notPrioritized.tooltiptext"));
+            } else {
+                setIcon(checkedIcon);
+                setToolTipText(org.openide.util.NbBundle.getMessage(CaseStatusIconCellRenderer.class, "PrioritizedIconCellRenderer.prioritized.tooltiptext"));
+            }
+        }
+        grayCellIfTableNotEnabled(table, isSelected);
+
+        return this;
+    }
+}