Bug fix in report selection

This commit is contained in:
Eugene Livis 2019-09-03 14:27:51 -04:00
parent 9b39e9c603
commit 85280d47cf

View File

@ -116,6 +116,8 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
swap(modules, indexOfHTMLReportModule, 0); swap(modules, indexOfHTMLReportModule, 0);
// set module configurations // set module configurations
selectedIndex = 0;
int indx = 0;
for (ReportModule module : modules) { for (ReportModule module : modules) {
ReportModuleSettings settings = null; ReportModuleSettings settings = null;
if (moduleConfigs != null) { if (moduleConfigs != null) {
@ -124,6 +126,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
if (config != null) { if (config != null) {
// there is an existing configuration for this module // there is an existing configuration for this module
settings = config.getModuleSettings(); settings = config.getModuleSettings();
// check if this module is enabled
if (config.isEnabled()) {
// make sure this module is the selected module in the UI panel
selectedIndex = indx;
}
} }
} }
if (settings == null) { if (settings == null) {
@ -132,12 +140,12 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
} }
// set module configuration // set module configuration
module.setConfiguration(settings); module.setConfiguration(settings);
indx++;
} }
modulesJList.getSelectionModel().addListSelectionListener(this); modulesJList.getSelectionModel().addListSelectionListener(this);
modulesJList.setCellRenderer(new ModuleCellRenderer()); modulesJList.setCellRenderer(new ModuleCellRenderer());
modulesJList.setListData(modules.toArray(new ReportModule[modules.size()])); modulesJList.setListData(modules.toArray(new ReportModule[modules.size()]));
selectedIndex = 0;
modulesJList.setSelectedIndex(selectedIndex); modulesJList.setSelectedIndex(selectedIndex);
} }