2199 resolve conflicts from merge and fix formatting on modified files

Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2015 Basis Technology Corp.
+ * Copyright 2011-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -216,7 +216,6 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
         }
     }
 
-    
     @Override
     public void processThisPanelBeforeSkipped() {
         if (!(ModuleSettings.getConfigSetting(IngestProfileSelectionWizardPanel.getLastProfilePropertiesFile(), AddImageWizardIterator.getPropLastprofileName()) == null)

Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,12 +22,11 @@ import java.awt.Component;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.TreeMap;
 import javax.swing.JComponent;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.ingest.IngestProfileMap;
+import org.sleuthkit.autopsy.ingest.IngestProfiles;
 import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.IngestProfileSelectionWizardPanel;
 import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.ShortcutWizardDescriptorPanel;
 
@@ -59,11 +58,10 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
 
             AddImageWizardChooseDataSourcePanel dsPanel = new AddImageWizardChooseDataSourcePanel(progressPanel);
             AddImageWizardIngestConfigPanel ingestConfigPanel = new AddImageWizardIngestConfigPanel(dsPanel, action, progressPanel);
-            IngestProfileSelectionWizardPanel profileSelectionPanel = new IngestProfileSelectionWizardPanel(AddImageWizardIngestConfigPanel.class.getCanonicalName(), getPropLastprofileName());
             panels.add(dsPanel);
-            TreeMap<String, IngestProfileMap.IngestProfile> profileMap = new IngestProfileMap().getIngestProfileMap();
+            List<IngestProfiles.IngestProfile> profiles = IngestProfiles.getIngestProfiles();
-            if (!profileMap.isEmpty()) {
+            if (!profiles.isEmpty()) {
-                panels.add(profileSelectionPanel);
+                panels.add(new IngestProfileSelectionWizardPanel(AddImageWizardIngestConfigPanel.class.getCanonicalName(), getPropLastprofileName()));
             }
             panels.add(ingestConfigPanel);
             panels.add(progressPanel);
@@ -102,8 +100,8 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
     }
 
     /**
-     * Gets the name of the property which stores the name of the last profile used by 
+     * Gets the name of the property which stores the name of the last profile
-     * the Add Image Wizard.
+     * used by the Add Image Wizard.
      *
      * @return the PROP_LASTPROFILE_NAME
      */
@@ -118,7 +116,6 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
         return PROP_LASTPROFILE_NAME;
     }
 
-    
     /**
      * Gets the current panel.
      *
@@ -178,7 +175,7 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
         boolean panelEnablesSkipping = current().panelEnablesSkipping();
         boolean skipNextPanel = current().skipNextPanel();
         index++;
-        if (panelEnablesSkipping && skipNextPanel){
+        if (panelEnablesSkipping && skipNextPanel) {
             current().processThisPanelBeforeSkipped();
             nextPanel();
         }

Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/IngestProfileSelectionWizardPanel.java

@@ -33,8 +33,6 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings;
  */
 public class IngestProfileSelectionWizardPanel extends ShortcutWizardDescriptorPanel {
 
-
-
     private final Set<ChangeListener> listeners = new HashSet<>(1);
     private final static String LAST_PROFILE_PROPERTIES_FILE = "IngestProfileSelectionPanel"; //NON-NLS
     /**
@@ -66,6 +64,7 @@ public class IngestProfileSelectionWizardPanel extends ShortcutWizardDescriptorP
     public static String getLastProfilePropertiesFile() {
         return LAST_PROFILE_PROPERTIES_FILE;
     }
+
     // Get the visual component for the panel. In this template, the component
     // is kept separate. This can be more efficient: if the wizard is created
     // but never displayed, or not all panels are displayed, it is better to
@@ -141,7 +140,7 @@ public class IngestProfileSelectionWizardPanel extends ShortcutWizardDescriptorP
     }
 
     @Override
-     public boolean panelEnablesSkipping(){
+    public boolean panelEnablesSkipping() {
         return true;
     }
 }

Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardIterator.java

@@ -46,16 +46,9 @@ final class RunIngestModulesWizardIterator implements WizardDescriptor.Iterator<
     private List<ShortcutWizardDescriptorPanel> getPanels() {
         if (panels == null) {
             panels = new ArrayList<>();
-<<<<<<< HEAD
-            IngestProfileSelectionWizardPanel profilePanel = new IngestProfileSelectionWizardPanel(RunIngestModulesAction.getDefaultContext(), PROP_LASTPROFILE_NAME);
-            TreeMap<String, IngestProfileMap.IngestProfile> profileMap = new IngestProfileMap().getIngestProfileMap();
-            if (!profileMap.isEmpty()) {
-                panels.add(profilePanel);
-=======
             List<IngestProfiles.IngestProfile> profiles = IngestProfiles.getIngestProfiles();
             if (!profiles.isEmpty()) {
-                panels.add( new IngestProfileSelectionWizardPanel(RunIngestModulesAction.getDefaultContext(), PROP_LASTPROFILE_NAME));
+                panels.add(new IngestProfileSelectionWizardPanel(RunIngestModulesAction.getDefaultContext(), PROP_LASTPROFILE_NAME));
->>>>>>> c4c7cbb9f8c52b7aa09e9e4f83ecbfe599dd2254
             }
 
             panels.add(new IngestModulesConfigWizardPanel());
@@ -89,8 +82,8 @@ final class RunIngestModulesWizardIterator implements WizardDescriptor.Iterator<
 
     @Override
     public boolean hasNext() {
-        return (index < getPanels().size() - 1 && 
+        return (index < getPanels().size() - 1
-                !(current().panelEnablesSkipping() && current().skipNextPanel()));
+                && !(current().panelEnablesSkipping() && current().skipNextPanel()));
     }
 
     @Override

Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/ShortcutWizardDescriptorPanel.java

@@ -21,30 +21,19 @@ package org.sleuthkit.autopsy.ingest.runIngestModuleWizard;
 import org.openide.WizardDescriptor;
 
 /**
- * An abstract class providing a methods which can be checked by 
+ * An abstract class providing a methods which can be checked by the iterator
- * the iterator containing panels of this type. So that Wizards containing these
+ * containing panels of this type. So that Wizards containing these panels can
- * panels can skip panels, but still call necessary methods of those panels.
+ * skip panels, but still call necessary methods of those panels.
  */
 public abstract class ShortcutWizardDescriptorPanel implements WizardDescriptor.Panel<WizardDescriptor> {
 
     /**
-     * Whether or not this panel under the correct conditions can enable the skipping of the panel after it.
+     * Whether or not this panel under the correct conditions can enable the
-     * @return true or false
+     * skipping of the panel after it.
-     */
-    public boolean panelEnablesSkipping(){
-         /*
-         * This method should be overriden by any panel that might want to 
-         * enable the iterator to skip the panel that comes after it.
-         */
-        return false;
-    }
-    
-    /**
-     * Whether or not the panel immediately following this one should be skipped .
      *
      * @return true or false
      */
-    public boolean skipNextPanel(){
+    public boolean panelEnablesSkipping() {
         /*
          * This method should be overriden by any panel that might want to
          * enable the iterator to skip the panel that comes after it.
@@ -53,12 +42,27 @@ public abstract class ShortcutWizardDescriptorPanel implements WizardDescriptor.
     }
 
     /**
-     * Provides a method which will allow code to be executed in a panel you plan to skip
+     * Whether or not the panel immediately following this one should be skipped
+     * .
+     *
+     * @return true or false
      */
-    public void processThisPanelBeforeSkipped(){
+    public boolean skipNextPanel() {
         /*
-         * If you need to perform some actions of this panel before it is skipped 
+         * This method should be overriden by any panel that might want to
-         * override this method to have it call the necessary code.
+         * enable the iterator to skip the panel that comes after it.
+         */
+        return false;
+    }
+
+    /**
+     * Provides a method which will allow code to be executed in a panel you
+     * plan to skip
+     */
+    public void processThisPanelBeforeSkipped() {
+        /*
+         * If you need to perform some actions of this panel before it is
+         * skipped override this method to have it call the necessary code.
          */
     }
 }