From 757e1ffa9790d6d65fe98c874e1b52892ef1aa6c Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Wed, 27 Nov 2013 11:26:30 -0500 Subject: [PATCH] Fixed use of generics to remove compiler warnings. --- .../autopsy/corecomponents/DataResultViewerTable.java | 2 ++ .../autopsy/directorytree/TagAndCommentDialog.form | 1 + .../autopsy/directorytree/TagAndCommentDialog.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java | 2 +- Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java | 6 +++--- Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 5b59f12812..45c87e0752 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -174,6 +174,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer { * @param parent Node with at least one child to get properties from * @return Properties, */ + @SuppressWarnings("rawtypes") private Node.Property[] getAllChildPropertyHeaders(Node parent) { Node firstChild = parent.getChildren().getNodeAt(0); @@ -432,6 +433,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer { * @param table the object table * @return max the maximum width of the column */ + @SuppressWarnings("rawtypes") private int getMaxColumnWidth(int index, FontMetrics metrics, int margin, int padding, List header, Object[][] table) { // set the tree (the node / names column) width String headerName = header.get(index - 1).getDisplayName(); diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.form b/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.form index 1bacfb8942..42a115bfb4 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.form @@ -109,6 +109,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.java index 4d00770205..d2529241c5 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/TagAndCommentDialog.java @@ -242,7 +242,7 @@ public class TagAndCommentDialog extends JDialog { private javax.swing.JTextField commentText; private javax.swing.JButton newTagButton; private javax.swing.JButton okButton; - private javax.swing.JComboBox tagCombo; + private javax.swing.JComboBox tagCombo; private javax.swing.JLabel tagLabel; // End of variables declaration//GEN-END:variables } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java index 70a0c402ec..dd1d2d8de4 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -307,7 +307,7 @@ public class IngestManager { * @param pipelineContext ingest context used to ingest parent of the file * to be scheduled */ - void scheduleFile(AbstractFile file, PipelineContext pipelineContext) { + void scheduleFile(AbstractFile file, PipelineContext pipelineContext) { scheduler.getFileScheduler().schedule(file, pipelineContext); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java index 505bbdca75..1f66fb92dd 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java @@ -320,7 +320,7 @@ class IngestScheduler { * * @param task tasks similar to this one should be removed */ - private void removeDupTasks(ScheduledTask task) { + private void removeDupTasks(ScheduledTask task) { final Content inputContent = task.getContent(); //remove from root queue @@ -365,8 +365,8 @@ class IngestScheduler { * @param originalContext original content schedule context that was used * to schedule the parent origin content, with the modules, settings, etc. */ - synchronized void schedule(AbstractFile file, PipelineContext originalContext) { - ScheduledTask originalTask = originalContext.getScheduledTask(); + synchronized void schedule(AbstractFile file, PipelineContext originalContext) { + ScheduledTask originalTask = originalContext.getScheduledTask(); //skip if task contains no modules if (originalTask.getModules().isEmpty()) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java index ac4fea94e4..e367cc3709 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java @@ -136,7 +136,7 @@ public class IngestServices { * @param file file to be scheduled * @param pipelineContext the ingest context for the file ingest pipeline */ - public void scheduleFile(AbstractFile file, PipelineContext pipelineContext) { + public void scheduleFile(AbstractFile file, PipelineContext pipelineContext) { logger.log(Level.INFO, "Scheduling file: " + file.getName()); manager.scheduleFile(file, pipelineContext); }