fixed UI

src/com/rthoni/intellij/codefromds/ui/dialogs/GenerateDialog.java

@@ -163,12 +163,6 @@ public class GenerateDialog extends DialogWrapper {
             }
         });
 
-        _listStoredProcedure.addListSelectionListener(e -> {
-            if (!e.getValueIsAdjusting()) {
-                updateSpSelection();
-            }
-        });
-
         setupTextField(_textModels, null, true, "Models");
         setupTextField(_textDataSource, null, false, "Data Source");
         setupTextField(_textDataSourceTemplate, null, false, "Data Source Template");
@@ -217,19 +211,19 @@ public class GenerateDialog extends DialogWrapper {
             }
         });
 
-        _listStoredProcedure.setCellRenderer(new ColoredListCellRenderer() {
-            @Override
-            protected void customizeCellRenderer(@NotNull JList jList, Object o, int i, boolean b, boolean b1) {
-                StoredProcedureSelection spSelection = _options.getSelection().getStoredProcedures().get(i);
-                if (spSelection.isSelected()) {
-                    setBackground(JBColor.GREEN);
-                }
-                else {
-                    setBackground(JBColor.RED);
-                }
-                append(spSelection.getStoredProcedure().getText());
-            }
-        });
+//        _listStoredProcedure.setCellRenderer(new ColoredListCellRenderer() {
+//            @Override
+//            protected void customizeCellRenderer(@NotNull JList jList, Object o, int i, boolean b, boolean b1) {
+//                StoredProcedureSelection spSelection = _options.getSelection().getStoredProcedures().get(i);
+//                if (spSelection.isSelected()) {
+//                    setBackground(JBColor.GREEN);
+//                }
+//                else {
+//                    setBackground(JBColor.RED);
+//                }
+//                append(spSelection.getStoredProcedure().getText());
+//            }
+//        });
 
         if (dataSources.size() > 0) {
             _listDatasources.setSelectedIndices(new int[]{0});
@@ -273,7 +267,11 @@ public class GenerateDialog extends DialogWrapper {
 
     private void showSource(DataSourceSelection source)
     {
+        for (ListSelectionListener e : _listStoredProcedure.getListSelectionListeners()) {
+            _listStoredProcedure.removeListSelectionListener(e);
+        }
         if (source != null) {
+
             List<String> tables = source.getTables().stream().map(t -> t.getTable().getName()).collect(Collectors.toList());
             _listTables.setListData(tables.toArray(new String[tables.size()]));
             if (tables.size() > 0) {
@@ -284,6 +282,16 @@ public class GenerateDialog extends DialogWrapper {
             }
             List<String> sps = source.getStoredProcedures().stream().map(t -> t.getStoredProcedure().getText()).collect(Collectors.toList());
             _listStoredProcedure.setListData(sps.toArray(new String[sps.size()]));
+            int[] indices = getSpSelectedIndices(source);
+            _listStoredProcedure.setSelectedIndices(indices);
+
+
+            _listStoredProcedure.addListSelectionListener(e -> {
+                if (!e.getValueIsAdjusting()) {
+                    _listStoredProcedure.updateUI();
+                    updateSpSelection();
+                }
+            });
         }
         else {
             _listTables.setListData(new String[]{});
@@ -292,7 +300,19 @@ public class GenerateDialog extends DialogWrapper {
         }
     }
 
-    private int[] getSelectedIndices(final TableSelection table)
+    private int[] getSpSelectedIndices(final DataSourceSelection dataSource)
+    {
+        List<StoredProcedureSelection> columns = dataSource.getStoredProcedures();
+        List<Integer> indices = new Vector<>();
+        for (int i = 0; i < columns.size(); ++i) {
+            if (columns.get(i).isSelected()) {
+                indices.add(i);
+            }
+        }
+        return indices.stream().mapToInt(Integer::intValue).toArray();
+    }
+
+    private int[] getColumnsSelectedIndices(final TableSelection table)
     {
         List<ColumnSelection> columns = table.getColumns();
         List<Integer> indices = new Vector<>();
@@ -327,7 +347,7 @@ public class GenerateDialog extends DialogWrapper {
         }
         if (table != null) {
             _listColumns.setListData(table.getColumns().stream().map(c -> c.getColumn().getName()).toArray(String[]::new));
-            int[] indices = getSelectedIndices(table);
+            int[] indices = getColumnsSelectedIndices(table);
             _listColumns.setSelectedIndices(indices);
             _listColumns.addListSelectionListener(e -> {
                 if (!e.getValueIsAdjusting()) {