From e32bc5990ba45044bbee7aaac56f0731474b3886 Mon Sep 17 00:00:00 2001
From: raman-bt <raman@basis.com>
Date: Wed, 23 Oct 2013 08:44:21 -0400
Subject: [PATCH] Addressed review comments from Brian.

---
 .../AddImageWizardChooseDataSourceVisual.java | 24 +++++++++----------
 .../AddImageWizardIngestConfigPanel.java      |  2 +-
 .../autopsy/casemodule/ImageDSProcessor.java  |  2 +-
 .../DataSourceProcessor.java                  |  6 -----
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
index 92bb0d08ba..2bcea63a06 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
@@ -100,28 +100,26 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
         typeComboBox.setSelectedIndex(0);
         typePanel.setLayout(new BorderLayout());
         
-        updateCurrentPanel(GetCurrentDSProcessor().getPanel());
+        updateCurrentPanel(getCurrentDSProcessor().getPanel());
     }
 
     private void discoverDataSourceProcessors() {
       
         for (DataSourceProcessor dsProcessor: Lookup.getDefault().lookupAll(DataSourceProcessor.class)) {
+           
             if (!datasourceProcessorsMap.containsKey(dsProcessor.getType()) ) {
-                if (!datasourceProcessorsMap.containsKey(dsProcessor.getType()) ) {
-                    
-                    dsProcessor.reset();
-                    datasourceProcessorsMap.put(dsProcessor.getType(), dsProcessor);
-                }
-                else {
-                    logger.log(Level.SEVERE, "discoverDataSourceProcessors(): A DataSourceProcessor already exists for type = " + dsProcessor.getType() );
-                }      
-            }  
+                dsProcessor.reset();
+                datasourceProcessorsMap.put(dsProcessor.getType(), dsProcessor);
+            }
+            else {
+                logger.log(Level.SEVERE, "discoverDataSourceProcessors(): A DataSourceProcessor already exists for type = " + dsProcessor.getType() );
+            }      
         }
      } 
 
      private void dspSelectionChanged() {
          // update the current panel to selection
-         currentPanel = GetCurrentDSProcessor().getPanel();
+         currentPanel = getCurrentDSProcessor().getPanel();
          updateCurrentPanel(currentPanel);
     }
      
@@ -155,7 +153,7 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
      * Returns the currently selected DS Processor
      * @return DataSourceProcessor the DataSourceProcessor corresponding to the data source type selected in the combobox
      */
-    public DataSourceProcessor GetCurrentDSProcessor() {
+    public DataSourceProcessor getCurrentDSProcessor() {
         // get the type of the currently selected panel and then look up 
         // the correspodning DS Handler in the map
         String dsType = (String) typeComboBox.getSelectedItem();
@@ -296,7 +294,7 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
      */
     public void updateUI(DocumentEvent e) {
         // Enable the Next button if the current DSP panel is valid
-        String err = GetCurrentDSProcessor().validatePanel();
+        String err = getCurrentDSProcessor().validatePanel();
         if (null == err)
             this.wizPanel.enableNextButton(true);
         else
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
index 91e265e805..4392cc8498 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
@@ -244,7 +244,7 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
         cleanupTask.enable();
        
          // get the selected DSProcessor
-        dsProcessor =  dataSourcePanel.getComponent().GetCurrentDSProcessor();
+        dsProcessor =  dataSourcePanel.getComponent().getCurrentDSProcessor();
         
         DSPCallback cbObj = new DSPCallback () {
             @Override
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
index 773b6e0d84..cb9f768ecc 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
@@ -178,7 +178,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
    * @param String timeZone 
    * @param noFat whether to parse FAT orphans
    **/ 
-  public void SetDataSourceOptions(String imgPath, String tz, boolean noFat) {
+  public void setDataSourceOptions(String imgPath, String tz, boolean noFat) {
       
     this.imagePath = imgPath;
     this.timeZone  = tz;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java
index 4abce176b7..581cd87b61 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java
@@ -25,12 +25,6 @@ import org.sleuthkit.datamodel.Content;
 /*
  * Defines an interface used by the Add DataSource wizard to discover different
  * Data SourceProcessors. 
- * A data source for Autopsy may be:
- *   - Disk Image (Encase, Raw....)
- *   - Local Disk
- *   - Logical file(s)
- *   - Phone Image
- *   - A CellXML file with content extracted from phone.
  * 
  * Each data source may have its unique attributes and may need to be processed 
  * differently.