refactor dialog and created constructor for dbo

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

@@ -6,6 +6,16 @@ import com.intellij.database.model.DasColumn;
  * Created by robin on 11/15/16.
  */
 public class ColumnSelection {
+
+    public ColumnSelection() {
+
+    }
+
+    public ColumnSelection(DasColumn column) {
+        _column = column;
+        _selected = true;
+    }
+
     private DasColumn _column;
 
     private boolean _selected;

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

@@ -1,13 +1,33 @@
 package com.rthoni.intellij.codefromds.dbo;
 
+import com.intellij.database.model.DasTable;
 import com.intellij.database.psi.DbDataSource;
+import com.intellij.database.util.DasUtil;
 
 import java.util.List;
+import java.util.Vector;
+import java.util.stream.Collectors;
 
 /**
  * Created by robin on 11/15/16.
  */
 public class DataSourceSelection {
+
+    public DataSourceSelection() {
+    }
+
+    public DataSourceSelection(DbDataSource source) {
+        _source = source;
+        final List<? extends DasTable> tables = DasUtil.getTables(source).toList();
+        _tables = new Vector<>();
+        for (DasTable table : tables) {
+            TableSelection tableSelection = new TableSelection();
+            tableSelection.setTable(table);
+            tableSelection.setColumns(DasUtil.getColumns(table).toList().stream().map(ColumnSelection::new).collect(Collectors.toList()));
+            _tables.add(tableSelection);
+        }
+    }
+
     private DbDataSource _source;
 
     private List<TableSelection> _tables;

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

@@ -1,9 +1,45 @@
 package com.rthoni.intellij.codefromds.dbo;
 
+import com.intellij.database.model.DasTable;
+import com.intellij.database.psi.DbDataSource;
+import com.intellij.database.util.DasUtil;
+
+import java.io.File;
+import java.util.List;
+import java.util.Vector;
+import java.util.stream.Collectors;
+
 /**
  * Created by robin on 11/15/16.
  */
 public class GenerateOptions {
+
+    public GenerateOptions() {
+    }
+
+    public GenerateOptions(DbDataSource source) {
+        _modelsPath = source.getProject().getBasePath() + File.separator + "Models";
+        _dataSourceTemplatePath = source.getProject().getBasePath() + File.separator + "Templates" + File.separator + "DataSource.twig";
+        _modelsTemplatePath = source.getProject().getBasePath() + File.separator + "Templates" + File.separator + "Models.twig";
+        _configPath = source.getProject().getBasePath() + File.separator + "code-from-ds.json";
+        _selection = new DataSourceSelection(source);
+        _selection.setSource(source);
+        final List<? extends DasTable> tables = DasUtil.getTables(source).toList();
+        List<TableSelection> tableSelections = new Vector<>();
+        for (DasTable table : tables) {
+            TableSelection tableSelection = new TableSelection();
+            tableSelection.setTable(table);
+            tableSelection.setColumns(DasUtil.getColumns(table).toList().stream().map(c -> {
+                ColumnSelection selection = new ColumnSelection();
+                selection.setColumn(c);
+                selection.setSelected(true);
+                return selection;
+            }).collect(Collectors.toList()));
+            tableSelections.add(tableSelection);
+        }
+        _selection.setTables(tableSelections);
+    }
+
     private DataSourceSelection _selection;
 
     private String _modelsPath;

src/com/rthoni/intellij/codefromds/ui/actions/GenerateAction.java

@@ -25,7 +25,9 @@ public class GenerateAction extends AnAction {
         int res = dlg.getExitCode();
         if (res == DialogWrapper.OK_EXIT_CODE) {
             GenerateOptions options = dlg.getOptions();
-            options.getSelection();
+            dlg = new GenerateDialog(null);
+            dlg.setOptions(options);
+            dlg.show();
         }
     }
 

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

@@ -61,6 +61,33 @@ public class GenerateDialog extends DialogWrapper {
         return _options;
     }
 
+    public void setOptions(GenerateOptions options) {
+        _options = options;
+        if (_options != null) {
+            showSource(_options.getSelection());
+            Project project = _options.getSelection().getSource().getProject();
+            setupTextField(_textModels, project);
+            setupTextField(_textDataSOurceTemplate, project);
+            setupTextField(_textModelsTemplate, project);
+            setupTextField(_textConfigPath, project);
+            _textModels.setText(_options.getModelsPath());
+            _textDataSOurceTemplate.setText(_options.getDataSourceTemplatePath());
+            _textModelsTemplate.setText(_options.getModelsTemplatePath());
+            _textConfigPath.setText(_options.getConfigPath());
+        }
+        else {
+            showSource(null);
+            setupTextField(_textModels, null);
+            setupTextField(_textDataSOurceTemplate, null);
+            setupTextField(_textModelsTemplate, null);
+            setupTextField(_textConfigPath, null);
+            _textModels.setText("");
+            _textDataSOurceTemplate.setText("");
+            _textModelsTemplate.setText("");
+            _textConfigPath.setText("");
+        }
+    }
+
     @Nullable
     @Override
     protected ValidationInfo doValidate() {
@@ -89,10 +116,10 @@ public class GenerateDialog extends DialogWrapper {
             if (!e.getValueIsAdjusting()) {
                 int index = _listDatasources.getSelectedIndex();
                 if (index == -1) {
-                    showSource(null);
+                    setOptions(null);
                 }
                 else {
-                    showSource(dataSources.get(index));
+                    setOptions(new GenerateOptions(dataSources.get(index)));
                 }
             }
         });
@@ -128,6 +155,23 @@ 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);
+                if (tableSelection.hasAll()) {
+                    setBackground(JBColor.GREEN);
+                }
+                else if (tableSelection.hasNone()) {
+                    setBackground(JBColor.RED);
+                }
+                else {
+                    setBackground(JBColor.ORANGE);
+                }
+                append(tableSelection.getTable().getName());
+            }
+        });
+
         if (dataSources.size() > 0) {
             _listDatasources.setSelectedIndices(new int[]{0});
         }
@@ -135,58 +179,30 @@ public class GenerateDialog extends DialogWrapper {
         return _panel;
     }
 
-    private void showSource(DbDataSource source)
+    private void setupTextField(TextFieldWithBrowseButton field, Project project)
     {
-        showTable(null);
-        for (ActionListener l : _textModels.getButton().getActionListeners()) {
-            _textModels.getButton().removeActionListener(l);
+        for (ActionListener l : field.getButton().getActionListeners()) {
+            field.getButton().removeActionListener(l);
         }
-        if (source != null) {
-            _options = new GenerateOptions();
-
-            _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);
-                    if (tableSelection.hasAll()) {
-                        setBackground(JBColor.GREEN);
-                    }
-                    else if (tableSelection.hasNone()) {
-                        setBackground(JBColor.RED);
-                    }
-                    else {
-                        setBackground(JBColor.ORANGE);
-                    }
-                    append(tableSelection.getTable().getName());
-                }
-            });
+        field.addBrowseFolderListener("Choose Models Destination Folder", "Choose folder",
+                project, FileChooserDescriptorFactory.createSingleFolderDescriptor());
+    }
 
-            _textModels.setText(source.getProject().getBasePath() + File.separator + "Models");
-            _textModels.addBrowseFolderListener("Choose Models Destination Folder", "Choose folder",
-                    source.getProject(), FileChooserDescriptorFactory.createSingleFolderDescriptor());
-
-            _options.setSelection(new DataSourceSelection());
-            _options.getSelection().setSource(source);
-            final List<? extends DasTable> tables = DasUtil.getTables(source).toList();
-            List<TableSelection> tableSelections = new Vector<>();
-            for (DasTable table : tables) {
-                TableSelection tableSelection = new TableSelection();
-                tableSelection.setTable(table);
-                tableSelection.setColumns(DasUtil.getColumns(table).toList().stream().map(c -> {
-                    ColumnSelection selection = new ColumnSelection();
-                    selection.setColumn(c);
-                    selection.setSelected(true);
-                    return selection;
-                }).collect(Collectors.toList()));
-                tableSelections.add(tableSelection);
+    private void showSource(DataSourceSelection source)
+    {
+        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) {
+                showTable(source.getTables().get(0));
+            }
+            else {
+                showTable(null);
             }
-            _options.getSelection().setTables(tableSelections);
-
-            _listTables.setListData(tables.stream().map(DasObject::getName).toArray(String[]::new));
         }
         else {
-            _options = null;
             _listTables.setListData(new String[]{});
+            showTable(null);
         }
     }
 
@@ -212,10 +228,10 @@ public class GenerateDialog extends DialogWrapper {
 
     private void showTable(TableSelection table)
     {
+        for (ListSelectionListener e : _listColumns.getListSelectionListeners()) {
+            _listColumns.removeListSelectionListener(e);
+        }
         if (table != null) {
-            for (ListSelectionListener e : _listColumns.getListSelectionListeners()) {
-                _listColumns.removeListSelectionListener(e);
-            }
             _listColumns.setListData(table.getColumns().stream().map(c -> c.getColumn().getName()).toArray(String[]::new));
             int[] indices = getSelectedIndices(table);
             _listColumns.setSelectedIndices(indices);