save/load options; removed old options

TODO

@@ -2,4 +2,4 @@ proc stock
 many to many
 table inheritance
 generate custom types (sp return)
-UI for sp selection
+UI for sp dataSource

src/com/rthoni/intellij/codefromds/DataAccess/DataSourcesDataAccess.java

@@ -102,7 +102,7 @@ public class DataSourcesDataAccess {
             else if (dasObject instanceof DbRoutine) {
                 DbRoutine sp = (DbRoutine) dasObject;
                 StoredProcedureDbo spDbo = new StoredProcedureDbo();
-                spDbo.setSelected(true);
+                spDbo.setSelected(false);
                 spDbo.setName(sp.getName());
                 spDbo.setFullName(sp.getText());
                 dataSourceDbo.addStoredProcedure(spDbo);

src/com/rthoni/intellij/codefromds/business/Generator.java

@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
-import java.util.function.Consumer;
 
 /**
  * Created by robin on 11/15/16.
@@ -48,7 +47,7 @@ public abstract class Generator {
             throw new Exception("Data source " + src + " not found");
         }
 
-        GenerateOptions options = new GenerateOptions(dataSource);
+        GenerateOptions options = new GenerateOptions(DataSourcesBusiness.getDataSourceDbo(src), configPath);
         options.setConfigAbsolutePath(configPath);
         options.fromJson(obj);
         return options;
@@ -126,39 +125,24 @@ public abstract class Generator {
 //        return list1.equals(list2);
 //    }
 
-    public static DataSourceDbo convertOptions(GenerateOptions options, TypesCastOptions types)
+    public static void convertOptions(GenerateOptions options, TypesCastOptions types)
     {
-        String dataSourceName = options.getSelection().getSource().getName();
-        DataSourceDbo dataSourceDbo = DataSourcesBusiness.getDataSourceDbo(dataSourceName);
 
-        for (TableDataSourceDbo table : dataSourceDbo.getTables())
+        for (TableDataSourceDbo table : options.getDataSource().getTables())
         {
-            TableSelection tableSelection = options.getSelection().getTables().stream()
-                    .filter(t -> t.getTable().getName().equals(table.getName()))
-                    .findFirst().orElse(null);
             for (ColumnDataSourceDbo column : table.getColumns())
             {
-                ColumnSelection columnSelection = tableSelection.getColumns().stream()
-                        .filter(c -> c.getColumn().getName().equals(column.getName()))
-                        .findFirst().orElse(null);
-                convertSqlType(column.getSqlType(), types, dataSourceDbo);
-                column.setSelected(columnSelection.isSelected());
+                convertSqlType(column.getSqlType(), types, options.getDataSource());
             }
         }
 
-        for (StoredProcedureDbo spDbo : dataSourceDbo.getStoredProcedures())
+        for (StoredProcedureDbo spDbo : options.getDataSource().getStoredProcedures())
         {
-            StoredProcedureSelection sp = options.getSelection().getStoredProcedures().stream()
-                    .filter(s -> s.getStoredProcedure().getText().equals(spDbo.getFullName()))
-                    .findFirst().orElse(null);
-            convertSqlType(spDbo.getSqlType(), types, dataSourceDbo);
-            spDbo.setSelected(sp.isSelected());
+            convertSqlType(spDbo.getSqlType(), types, options.getDataSource());
             for (StoredProcedureArgDbo arg : spDbo.getArguments()) {
-                convertSqlType(arg.getSqlType(), types, dataSourceDbo);
+                convertSqlType(arg.getSqlType(), types, options.getDataSource());
             }
         }
-
-        return dataSourceDbo;
     }
 
     public static TypesCastOptions loadTypesCast(String file) throws IOException
@@ -280,13 +264,13 @@ public abstract class Generator {
 
         TypesCastOptions types = loadTypesCast(typesCastAbsolutePath);
 
-        DataSourceDbo dbo = convertOptions(options, types);
+        convertOptions(options, types);
 
-        generateFile(dataSourceTemplateAbsolutePath, dataSourceAbsolutePath, dbo, null, types);
-        for (TableDataSourceDbo table : dbo.getTables()) {
+        generateFile(dataSourceTemplateAbsolutePath, dataSourceAbsolutePath, options.getDataSource(), null, types);
+        for (TableDataSourceDbo table : options.getDataSource().getTables()) {
             if (table.hasAny()) {
                 String filename = modelsAbsolutePath + File.separator + table.getName() + "." + options.getFilesExtension();
-                generateFile(modelsTemplateAbsolutePath, filename, dbo, table, types);
+                generateFile(modelsTemplateAbsolutePath, filename, options.getDataSource(), table, types);
             }
         }
     }

src/com/rthoni/intellij/codefromds/dbo/options/ColumnSelection.java

@@ -1,52 +0,0 @@
-package com.rthoni.intellij.codefromds.dbo.options;
-
-import com.intellij.database.model.DasColumn;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-
-/**
- * Created by robin on 11/15/16.
- */
-public class ColumnSelection {
-
-    private DasColumn _column;
-
-    private boolean _selected;
-
-    public ColumnSelection(DasColumn column) {
-        _column = column;
-        _selected = true;
-    }
-
-    public HashMap<String, Object> toMap()
-    {
-        HashMap<String, Object> map = new HashMap<>();
-
-        map.put("column", _column == null ? null : _column.getName());
-        map.put("selected", _selected);
-
-        return map;
-    }
-
-    public void fromJson(JSONObject json)
-    {
-        _selected = json.getBoolean("selected");
-    }
-
-    public DasColumn getColumn() {
-        return _column;
-    }
-
-    public void setColumn(DasColumn column) {
-        _column = column;
-    }
-
-    public boolean isSelected() {
-        return _selected;
-    }
-
-    public void setSelected(boolean selected) {
-        _selected = selected;
-    }
-}

src/com/rthoni/intellij/codefromds/dbo/options/DataSourceSelection.java

@@ -1,98 +0,0 @@
-package com.rthoni.intellij.codefromds.dbo.options;
-
-import com.intellij.database.psi.DbDataSource;
-import com.intellij.database.util.DasUtil;
-import com.rthoni.intellij.codefromds.business.Helper;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Vector;
-import java.util.stream.Collectors;
-
-/**
- * Created by robin on 11/15/16.
- */
-public class DataSourceSelection {
-
-    private DbDataSource _source;
-
-    private List<TableSelection> _tables;
-
-    private List<StoredProcedureSelection> _storedProcedures;
-
-    public DataSourceSelection(DbDataSource source) {
-        _source = source;
-        _tables = DasUtil.getTables(source).toList().stream().map(TableSelection::new).collect(Collectors.toList());
-        _storedProcedures = Helper.getRoutines(source).stream().map(StoredProcedureSelection::new).collect(Collectors.toList());
-    }
-
-    public HashMap<String, Object> toMap()
-    {
-        HashMap<String, Object> map = new HashMap<>();
-
-        map.put("source", _source == null ? null : _source.getName());
-
-        List<Object> tables = new Vector<>();
-        for (TableSelection table : _tables) {
-            tables.add(table.toMap());
-        }
-        map.put("tables", tables);
-
-        List<Object> sps = new Vector<>();
-        for (StoredProcedureSelection sp : _storedProcedures) {
-            sps.add(sp.toMap());
-        }
-        map.put("storedProcedures", sps);
-
-        return map;
-    }
-
-    public void fromJson(JSONObject json)
-    {
-        JSONArray array = json.getJSONArray("tables");
-        for (TableSelection table : _tables) {
-            JSONObject obj = Helper.findInJson(array, "table", table.getTable().getName());
-            if (obj != null) {
-                table.fromJson(obj);
-            } else {
-                for (ColumnSelection column : table.getColumns()) {
-                    column.setSelected(false);
-                }
-            }
-        }
-
-        array = json.getJSONArray("storedProcedures");
-        for (StoredProcedureSelection sp : _storedProcedures) {
-            JSONObject obj = Helper.findInJson(array, "name", sp.getStoredProcedure().getText());
-            if (obj != null) {
-                sp.fromJson(obj);
-            }
-        }
-    }
-
-    public DbDataSource getSource() {
-        return _source;
-    }
-
-    public void setSource(DbDataSource source) {
-        _source = source;
-    }
-
-    public List<TableSelection> getTables() {
-        return _tables;
-    }
-
-    public void setTables(List<TableSelection> tables) {
-        _tables = tables;
-    }
-
-    public List<StoredProcedureSelection> getStoredProcedures() {
-        return _storedProcedures;
-    }
-
-    public void setStoredProcedures(List<StoredProcedureSelection> storedProcedures) {
-        _storedProcedures = storedProcedures;
-    }
-}

src/com/rthoni/intellij/codefromds/dbo/options/GenerateOptions.java

@@ -1,7 +1,13 @@
 package com.rthoni.intellij.codefromds.dbo.options;
 
 import com.intellij.database.psi.DbDataSource;
+import com.rthoni.intellij.codefromds.business.DataSourcesBusiness;
 import com.rthoni.intellij.codefromds.business.Helper;
+import com.rthoni.intellij.codefromds.dbo.template.ColumnDataSourceDbo;
+import com.rthoni.intellij.codefromds.dbo.template.DataSourceDbo;
+import com.rthoni.intellij.codefromds.dbo.template.StoredProcedureDbo;
+import com.rthoni.intellij.codefromds.dbo.template.TableDataSourceDbo;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.File;
@@ -12,7 +18,7 @@ import java.util.HashMap;
  */
 public class GenerateOptions {
 
-    private DataSourceSelection _selection;
+    private DataSourceDbo _dataSource;
 
     private String _dataSourceRelativePath;
 
@@ -28,15 +34,15 @@ public class GenerateOptions {
 
     private String _castFileRelativePath;
 
-    public GenerateOptions(DbDataSource source) {
+    public GenerateOptions(DataSourceDbo dataSource, String configAbsolutePath) {
         _filesExtension = "cs";
         _dataSourceRelativePath = "DataAccess/Database." + _filesExtension;
         _modelsRelativePath = "Models";
         _dataSourceTemplateRelativePath = "code-from-ds" + File.separator + "DataSource.twig";
         _modelsTemplateRelativePath = "code-from-ds" + File.separator + "Models.twig";
-        _configAbsolutePath = source.getProject().getBasePath() + File.separator + "code-from-ds" + File.separator + "code-from-ds.json";
+        _configAbsolutePath = configAbsolutePath;
         _castFileRelativePath = "code-from-ds" + File.separator + "types-cast.json";
-        _selection = new DataSourceSelection(source);
+        _dataSource = dataSource;
     }
 
     public HashMap<String, Object> toMap()
@@ -49,7 +55,35 @@ public class GenerateOptions {
         map.put("modelsTemplateRelativePath", _modelsTemplateRelativePath);
         map.put("filesExtension", _filesExtension);
         map.put("castFileRelativePath", _castFileRelativePath);
-        map.put("selection", _selection == null ? null : new JSONObject(_selection.toMap()));
+        JSONObject selectionObj = new JSONObject();
+        selectionObj.put("source", _dataSource.getName());
+        JSONArray tablesObj = new JSONArray();
+        selectionObj.put("tables", tablesObj);
+        for (TableDataSourceDbo table : _dataSource.getTables()) {
+            JSONObject tableObj = new JSONObject();
+            tablesObj.put(tableObj);
+            tableObj.put("table", table.getName());
+
+            JSONArray columnsObj = new JSONArray();
+            tableObj.put("columns", columnsObj);
+            for (ColumnDataSourceDbo column : table.getColumns()) {
+                JSONObject columnObj = new JSONObject();
+                columnsObj.put(columnObj);
+                columnObj.put("column", column.getName());
+                columnObj.put("selected", column.isSelected());
+            }
+        }
+
+        JSONArray spsObj = new JSONArray();
+        selectionObj.put("storedProcedures", spsObj);
+        for (StoredProcedureDbo sp : _dataSource.getStoredProcedures()) {
+            JSONObject spObj = new JSONObject();
+            spsObj.put(spObj);
+            spObj.put("storedProcedure", sp.getFullName());
+            spObj.put("selected", sp.isSelected());
+        }
+
+        map.put("selection", selectionObj);
 
         return map;
     }
@@ -62,15 +96,49 @@ public class GenerateOptions {
         _modelsTemplateRelativePath = Helper.getJsonString(json, "modelsTemplateRelativePath");
         _filesExtension = Helper.getJsonString(json, "filesExtension");
         _castFileRelativePath = Helper.getJsonString(json, "castFileRelativePath");
-        _selection.fromJson(json.getJSONObject("selection"));
-    }
-
-    public DataSourceSelection getSelection() {
-        return _selection;
-    }
-
-    public void setSelection(DataSourceSelection selection) {
-        _selection = selection;
+        JSONObject selectionObj = json.optJSONObject("selection");
+        if (selectionObj != null) {
+            JSONArray tablesObj = selectionObj.optJSONArray("tables");
+            if (tablesObj != null) {
+                for (int i = 0; i < tablesObj.length(); ++i) {
+                    JSONObject tableObj = tablesObj.optJSONObject(i);
+                    if (tableObj != null) {
+                        TableDataSourceDbo table = _dataSource.findTable(tableObj.getString("table"));
+                        if (table != null) {
+                            JSONArray columnsObj = tableObj.optJSONArray("columns");
+                            if (columnsObj != null) {
+                                for (int j = 0; j < columnsObj.length(); ++j) {
+                                    JSONObject columnObj = columnsObj.optJSONObject(j);
+                                    if (columnObj != null) {
+                                        ColumnDataSourceDbo column = table.findColumn(columnObj.getString("column"));
+                                        if (column != null) {
+                                            column.setSelected(columnObj.getBoolean("selected"));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            JSONArray spsObj = selectionObj.optJSONArray("storedProcedures");
+            if (spsObj != null) {
+                for (int i = 0; i < spsObj.length(); ++i) {
+                    JSONObject spObj = spsObj.optJSONObject(i);
+                    if (spObj != null) {
+                        StoredProcedureDbo sp = _dataSource.findStoredProcedure(spObj.getString("storedProcedure"));
+                        if (sp != null) {
+                            sp.setSelected(spObj.getBoolean("selected"));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public DataSourceDbo getDataSource() {
+        return _dataSource;
     }
 
     public String getModelsRelativePath() {

src/com/rthoni/intellij/codefromds/dbo/options/StoredProcedureSelection.java

@@ -1,52 +0,0 @@
-package com.rthoni.intellij.codefromds.dbo.options;
-
-import com.intellij.database.psi.DbRoutine;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-
-/**
- * Created by robin on 4/14/17.
- */
-public class StoredProcedureSelection {
-
-    private DbRoutine _storedProcedure;
-
-    private boolean _isSelected;
-
-    public StoredProcedureSelection(DbRoutine storedProcedure) {
-        _storedProcedure = storedProcedure;
-        _isSelected = true;
-    }
-
-    public DbRoutine getStoredProcedure() {
-        return _storedProcedure;
-    }
-
-    public void setStoredProcedure(DbRoutine storedProcedure) {
-        _storedProcedure = storedProcedure;
-    }
-
-    public boolean isSelected() {
-        return _isSelected;
-    }
-
-    public void setSelected(boolean selected) {
-        _isSelected = selected;
-    }
-
-    public HashMap<String, Object> toMap()
-    {
-        HashMap<String, Object> map = new HashMap<>();
-
-        map.put("name", _storedProcedure == null ? null : _storedProcedure.getText());
-        map.put("selected", _isSelected);
-
-        return map;
-    }
-
-    public void fromJson(JSONObject json)
-    {
-        _isSelected = json.getBoolean("selected");
-    }
-}

src/com/rthoni/intellij/codefromds/dbo/options/TableSelection.java

@@ -1,81 +0,0 @@
-package com.rthoni.intellij.codefromds.dbo.options;
-
-import com.intellij.database.model.DasTable;
-import com.intellij.database.util.DasUtil;
-import com.rthoni.intellij.codefromds.business.Helper;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Vector;
-import java.util.stream.Collectors;
-
-/**
- * Created by robin on 11/15/16.
- */
-public class TableSelection {
-
-    private DasTable _table;
-
-    private List<ColumnSelection> _columns;
-
-    public TableSelection(DasTable table)
-    {
-        _table = table;
-        _columns = DasUtil.getColumns(table).toList().stream().map(ColumnSelection::new).collect(Collectors.toList());
-    }
-
-    public HashMap<String, Object> toMap()
-    {
-        HashMap<String, Object> map = new HashMap<>();
-
-        map.put("table", _table == null ? null : _table.getName());
-        List<Object> tables = new Vector<>();
-        for (ColumnSelection col : _columns) {
-            tables.add(col.toMap());
-        }
-        map.put("columns", tables);
-
-        return map;
-    }
-
-    public void fromJson(JSONObject json)
-    {
-        JSONArray array = json.getJSONArray("columns");
-        for (ColumnSelection column : _columns) {
-            JSONObject obj = Helper.findInJson(array, "column", column.getColumn().getName());
-            if (obj != null) {
-                column.fromJson(obj);
-            } else {
-                column.setSelected(false);
-            }
-        }
-    }
-
-    public DasTable getTable() {
-        return _table;
-    }
-
-    public void setTable(DasTable table) {
-        _table = table;
-    }
-
-    public List<ColumnSelection> getColumns() {
-        return _columns;
-    }
-
-    public void setColumns(List<ColumnSelection> columns) {
-        _columns = columns;
-    }
-
-    public boolean hasNone()
-    {
-        return _columns != null && _columns.stream().filter(ColumnSelection::isSelected).count() == 0;
-    }
-
-    public boolean hasAll()
-    {
-        return _columns != null && _columns.stream().filter(ColumnSelection::isSelected).count() == _columns.size();
-    }
-}

src/com/rthoni/intellij/codefromds/dbo/template/DataSourceDbo.java

@@ -47,4 +47,14 @@ public class DataSourceDbo {
         }
         return null;
     }
+
+    public StoredProcedureDbo findStoredProcedure(String name)
+    {
+        for (StoredProcedureDbo sp : _storedProcedures) {
+            if (sp.getFullName().equals(name)) {
+                return sp;
+            }
+        }
+        return null;
+    }
 }

src/com/rthoni/intellij/codefromds/dbo/template/TableDataSourceDbo.java

@@ -56,6 +56,16 @@ public class TableDataSourceDbo {
         return false;
     }
 
+    public boolean hasAll()
+    {
+        for (ColumnDataSourceDbo column : _columns) {
+            if (!column.isSelected()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public List<ForeignKeyDbo> getSourceForeignKeys() {
         return _sourceForeignKeys;
     }

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

@@ -10,8 +10,13 @@ import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBList;
+import com.rthoni.intellij.codefromds.business.DataSourcesBusiness;
 import com.rthoni.intellij.codefromds.business.Helper;
 import com.rthoni.intellij.codefromds.dbo.options.*;
+import com.rthoni.intellij.codefromds.dbo.template.ColumnDataSourceDbo;
+import com.rthoni.intellij.codefromds.dbo.template.DataSourceDbo;
+import com.rthoni.intellij.codefromds.dbo.template.StoredProcedureDbo;
+import com.rthoni.intellij.codefromds.dbo.template.TableDataSourceDbo;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -68,7 +73,7 @@ public class GenerateDialog extends DialogWrapper {
     public void setOptions(GenerateOptions options) {
         _options = options;
         if (_options != null) {
-            showSource(_options.getSelection());
+            showSource(_options.getDataSource());
             _textModels.setText(Helper.getAbsolutePath(_project, _options.getModelsRelativePath()));
             _textDataSource.setText(Helper.getAbsolutePath(_project, _options.getDataSourceRelativePath()));
             _textDataSourceTemplate.setText(Helper.getAbsolutePath(_project, _options.getDataSourceTemplateRelativePath()));
@@ -147,7 +152,8 @@ public class GenerateDialog extends DialogWrapper {
                     setOptions(null);
                 }
                 else {
-                    setOptions(new GenerateOptions(dataSources.get(index)));
+                    setOptions(new GenerateOptions(DataSourcesBusiness.getDataSourcesDbo().get(index),
+                            "code-from-ds" + File.separator + "code-from-ds.json"));
                 }
             }
         });
@@ -158,7 +164,7 @@ public class GenerateDialog extends DialogWrapper {
                     showTable(null);
                 }
                 else {
-                    showTable(_options.getSelection().getTables().get(index));
+                    showTable(_options.getDataSource().getTables().get(index));
                 }
             }
         });
@@ -197,24 +203,24 @@ public class GenerateDialog extends DialogWrapper {
         _listTables.setCellRenderer(new ColoredListCellRenderer() {
             @Override
             protected void customizeCellRenderer(@NotNull JList jList, Object o, int i, boolean b, boolean b1) {
-                TableSelection tableSelection = _options.getSelection().getTables().get(i);
+                TableDataSourceDbo tableSelection = _options.getDataSource().getTables().get(i);
                 if (tableSelection.hasAll()) {
                     setBackground(JBColor.GREEN);
                 }
-                else if (tableSelection.hasNone()) {
+                else if (!tableSelection.hasAny()) {
                     setBackground(JBColor.RED);
                 }
                 else {
                     setBackground(JBColor.ORANGE);
                 }
-                append(tableSelection.getTable().getName());
+                append(tableSelection.getName());
             }
         });
 
 //        _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);
+//                StoredProcedureSelection spSelection = _options.getDataSource().getStoredProcedures().get(i);
 //                if (spSelection.isSelected()) {
 //                    setBackground(JBColor.GREEN);
 //                }
@@ -261,18 +267,19 @@ public class GenerateDialog extends DialogWrapper {
         for (ActionListener l : field.getButton().getActionListeners()) {
             field.getButton().removeActionListener(l);
         }
-        field.addBrowseFolderListener("Choose " + title + " " + (dirsOnly ? "Folder" : "File"), "Choose " + (dirsOnly ? "Folder" : "File"), project,
+        field.addBrowseFolderListener("Choose " + title + " " + (dirsOnly ? "Folder" : "File"),
+                "Choose " + (dirsOnly ? "Folder" : "File"), project,
                 dirsOnly ? FileChooserDescriptorFactory.createSingleFolderDescriptor() : FileChooserDescriptorFactory.createSingleFileDescriptor());
     }
 
-    private void showSource(DataSourceSelection source)
+    private void showSource(DataSourceDbo 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());
+            List<String> tables = source.getTables().stream().map(t -> t.getName()).collect(Collectors.toList());
             _listTables.setListData(tables.toArray(new String[tables.size()]));
             if (tables.size() > 0) {
                 showTable(source.getTables().get(0));
@@ -280,7 +287,7 @@ public class GenerateDialog extends DialogWrapper {
             else {
                 showTable(null);
             }
-            List<String> sps = source.getStoredProcedures().stream().map(t -> t.getStoredProcedure().getText()).collect(Collectors.toList());
+            List<String> sps = source.getStoredProcedures().stream().map(t -> t.getFullName()).collect(Collectors.toList());
             _listStoredProcedure.setListData(sps.toArray(new String[sps.size()]));
             int[] indices = getSpSelectedIndices(source);
             _listStoredProcedure.setSelectedIndices(indices);
@@ -300,9 +307,9 @@ public class GenerateDialog extends DialogWrapper {
         }
     }
 
-    private int[] getSpSelectedIndices(final DataSourceSelection dataSource)
+    private int[] getSpSelectedIndices(final DataSourceDbo dataSource)
     {
-        List<StoredProcedureSelection> columns = dataSource.getStoredProcedures();
+        List<StoredProcedureDbo> columns = dataSource.getStoredProcedures();
         List<Integer> indices = new Vector<>();
         for (int i = 0; i < columns.size(); ++i) {
             if (columns.get(i).isSelected()) {
@@ -312,9 +319,9 @@ public class GenerateDialog extends DialogWrapper {
         return indices.stream().mapToInt(Integer::intValue).toArray();
     }
 
-    private int[] getColumnsSelectedIndices(final TableSelection table)
+    private int[] getColumnsSelectedIndices(final TableDataSourceDbo table)
     {
-        List<ColumnSelection> columns = table.getColumns();
+        List<ColumnDataSourceDbo> columns = table.getColumns();
         List<Integer> indices = new Vector<>();
         for (int i = 0; i < columns.size(); ++i) {
             if (columns.get(i).isSelected()) {
@@ -324,9 +331,9 @@ public class GenerateDialog extends DialogWrapper {
         return indices.stream().mapToInt(Integer::intValue).toArray();
     }
 
-    private void updateColumnSelection(final TableSelection table)
+    private void updateColumnSelection(final TableDataSourceDbo table)
     {
-        List<ColumnSelection> columns = table.getColumns();
+        List<ColumnDataSourceDbo> columns = table.getColumns();
         for (int i = 0; i < columns.size(); ++i) {
             columns.get(i).setSelected(_listColumns.isSelectedIndex(i));
         }
@@ -334,19 +341,19 @@ public class GenerateDialog extends DialogWrapper {
 
     private void updateSpSelection()
     {
-        List<StoredProcedureSelection> sps = _options.getSelection().getStoredProcedures();
+        List<StoredProcedureDbo> sps = _options.getDataSource().getStoredProcedures();
         for (int i = 0; i < sps.size(); ++i) {
             sps.get(i).setSelected(_listStoredProcedure.isSelectedIndex(i));
         }
     }
 
-    private void showTable(TableSelection table)
+    private void showTable(TableDataSourceDbo table)
     {
         for (ListSelectionListener e : _listColumns.getListSelectionListeners()) {
             _listColumns.removeListSelectionListener(e);
         }
         if (table != null) {
-            _listColumns.setListData(table.getColumns().stream().map(c -> c.getColumn().getName()).toArray(String[]::new));
+            _listColumns.setListData(table.getColumns().stream().map(c -> c.getName()).toArray(String[]::new));
             int[] indices = getColumnsSelectedIndices(table);
             _listColumns.setSelectedIndices(indices);
             _listColumns.addListSelectionListener(e -> {