diff --git a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/IngestProfileSelectionPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/IngestProfileSelectionPanel.java index 0113651ca0..a9b7d8f3f7 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/IngestProfileSelectionPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/IngestProfileSelectionPanel.java @@ -28,6 +28,7 @@ import java.util.List; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; +import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog; import org.sleuthkit.autopsy.ingest.IngestOptionsPanel; import org.sleuthkit.autopsy.ingest.IngestProfileMap; @@ -39,9 +40,13 @@ import org.sleuthkit.autopsy.ingest.IngestProfileMap.IngestProfile; */ final class IngestProfileSelectionPanel extends JPanel implements ItemListener { - private static final String CUSTOM_SETTINGS_DISPLAY_NAME = "Custom Settings"; - private static final String CUSTOM_SETTINGS_DESCRIPTION = "configure individual module settings in next step of wizard"; //WJS-TODO these should be @Message - private final RunIngestModuleWizardPanel1 wizardPanel; + @Messages({"IngestProfileSelectionPanel.customSettings.name=Custom Settings", + "IngestProfileSelectionPanel.name=Ingest Profile Selection", + "IngestProfileSelectionPanel.customSettings.description=configure individual module settings in next step of wizard"}) + + private static final String CUSTOM_SETTINGS_DISPLAY_NAME = Bundle.IngestProfileSelectionPanel_customSettings_name(); + private static final String CUSTOM_SETTINGS_DESCRIPTION = Bundle.IngestProfileSelectionPanel_customSettings_description(); + private final RunIngestModulesWizardPanel1 wizardPanel; private String selectedProfile; private List profiles = Collections.emptyList(); @@ -51,13 +56,13 @@ final class IngestProfileSelectionPanel extends JPanel implements ItemListener { * @param panel - the WizardPanel which contains this panel * @param lastSelectedProfile - the profile that will be selected initially */ - IngestProfileSelectionPanel(RunIngestModuleWizardPanel1 panel, String lastSelectedProfile) { + IngestProfileSelectionPanel(RunIngestModulesWizardPanel1 panel, String lastSelectedProfile) { initComponents(); //WJS-TODO figure out how to get width of writable area, if text length greater than width. Trim text to width minus 3 chars in length and then add ... to the end wizardPanel = panel; selectedProfile = lastSelectedProfile; populateListOfCheckboxes(); - this.setName("Ingest Profile Selection"); //WJS-TODO @Messages this + this.setName(Bundle.IngestProfileSelectionPanel_name()); } /** @@ -92,15 +97,6 @@ final class IngestProfileSelectionPanel extends JPanel implements ItemListener { */ private void addRadioButton(String profileDisplayName, String profileContextName, String profileDesc) { String displayText = profileDisplayName + " - " + profileDesc; - int width = profileListScrollPane.getWidth(); - if (width > 3) { - if (displayText.length() > width) { - String ellipses = "..."; - displayText = displayText.substring(0, width - ellipses.length()) + ellipses; - } - } else { - System.out.println("NOT KNOWN BEFORE DRAWN USE DIFFERENT WAY TO GET WIDTH"); //WJS-TODO remove this when working - } JRadioButton myRadio = new JRadioButton(displayText); //NON-NLS myRadio.setName(profileContextName); myRadio.setToolTipText(profileDesc); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesAction.java b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesAction.java index d0ac6180d7..d325e649e7 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesAction.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesAction.java @@ -87,7 +87,7 @@ public final class RunIngestModulesAction extends AbstractAction { */ @Override public void actionPerformed(ActionEvent e) { - WizardDescriptor wiz = new WizardDescriptor(new RunIngestModuleWizardIterator()); + WizardDescriptor wiz = new WizardDescriptor(new RunIngestModulesWizardIterator()); // {0} will be replaced by WizardDescriptor.Panel.getComponent().getName() wiz.setTitleFormat(new MessageFormat("{0}")); wiz.setTitle(Bundle.RunIngestModulesAction_name()); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardIterator.java b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardIterator.java similarity index 94% rename from Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardIterator.java rename to Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardIterator.java index ca36bdb322..fc54b3f133 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardIterator.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardIterator.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.ingest.IngestProfileMap; * Iterator class for creating a wizard for run ingest modules. * */ -final class RunIngestModuleWizardIterator implements WizardDescriptor.Iterator { +final class RunIngestModulesWizardIterator implements WizardDescriptor.Iterator { private int index; @@ -49,10 +49,10 @@ final class RunIngestModuleWizardIterator implements WizardDescriptor.Iterator(); TreeMap profileMap = new IngestProfileMap().getIngestProfileMap(); if (!profileMap.isEmpty()) { - panels.add(new RunIngestModuleWizardPanel1()); + panels.add(new RunIngestModulesWizardPanel1()); } - panels.add(new RunIngestModuleWizardPanel2()); + panels.add(new RunIngestModulesWizardPanel2()); String[] steps = new String[panels.size()]; for (int i = 0; i < panels.size(); i++) { Component c = panels.get(i).getComponent(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardPanel1.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardPanel1.java rename to Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardPanel1.java index 841e75dd41..0b0ed9386d 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardPanel1.java @@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; * selection panel and is only created when profiles exist. * */ -class RunIngestModuleWizardPanel1 extends EarlyFinishWizardDescriptorPanel { +class RunIngestModulesWizardPanel1 extends EarlyFinishWizardDescriptorPanel { private final Set listeners = new HashSet(1); private final static String PROP_LASTPROFILE_NAME = "RIMW_LASTPROFILE_NAME"; //NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardPanel2.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardPanel2.java rename to Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardPanel2.java index 91f34d4bea..5d80ef1848 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModuleWizardPanel2.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/RunIngestModulesWizardPanel2.java @@ -24,7 +24,7 @@ import org.openide.util.HelpCtx; import org.sleuthkit.autopsy.ingest.IngestJobSettings; import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel; -class RunIngestModuleWizardPanel2 extends EarlyFinishWizardDescriptorPanel { +class RunIngestModulesWizardPanel2 extends EarlyFinishWizardDescriptorPanel { /** * The visual ingestJobSettingsPanel that displays this panel. If you need