More merging

This commit is contained in:
Eugene Livis 2016-08-16 09:51:16 -04:00
parent cfac86f94a
commit 41f4c64eea
3 changed files with 3 additions and 3 deletions

View File

@ -39,7 +39,7 @@ public final class AutoIngestUserPreferences {
}; };
private static final Preferences preferences = NbPreferences.forModule(AutoIngestUserPreferences.class); private static final Preferences preferences = NbPreferences.forModule(AutoIngestUserPreferences.class);
private static final String MODE = "Mode"; // NON-NLS private static final String MODE = "AutopsyMode"; // NON-NLS
private static final String AUTO_MODE_IMAGES_FOLDER = "AutoModeImageFolder"; // NON-NLS private static final String AUTO_MODE_IMAGES_FOLDER = "AutoModeImageFolder"; // NON-NLS
private static final String AUTO_MODE_RESULTS_FOLDER = "AutoModeResultsFolder"; // NON-NLS private static final String AUTO_MODE_RESULTS_FOLDER = "AutoModeResultsFolder"; // NON-NLS
private static final String SHARED_CONFIG_FOLDER = "SharedSettingsFolder"; // NON-NLS private static final String SHARED_CONFIG_FOLDER = "SharedSettingsFolder"; // NON-NLS

View File

@ -32,7 +32,7 @@ OptionsPanel.validationErrMsg.invalidDatabasePort=Invalid database port number
OptionsPanel.validationErrMsg.invalidMessageServicePort=Invalid message service port number OptionsPanel.validationErrMsg.invalidMessageServicePort=Invalid message service port number
OptionsPanel.validationErrMsg.invalidIndexingServerPort=Invalid Solr server port number OptionsPanel.validationErrMsg.invalidIndexingServerPort=Invalid Solr server port number
OptionsPanel.ErrorSettingDefaultFolder=Error creating default folder OptionsPanel.ErrorSettingDefaultFolder=Error creating default folder
OpenOptionsPanelAction.name=Options OpenOptionsPanelAction.name=Auto Ingest Options
OptionsPanel.KeywordSearchNull=Cannot find Keyword Search service OptionsPanel.KeywordSearchNull=Cannot find Keyword Search service
OptionsPanel.InvalidPortNumber=Invalid port number. OptionsPanel.InvalidPortNumber=Invalid port number.
OptionsPanel.AdvancedOptionsPanel.Title=Advanced Settings OptionsPanel.AdvancedOptionsPanel.Title=Advanced Settings

View File

@ -35,7 +35,7 @@ import org.openide.util.ImageUtilities;
*/ */
public class OptionsDialog extends JDialog { public class OptionsDialog extends JDialog {
private static final String TITLE = "Options"; private static final String TITLE = "Auto Ingest Options";
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**