save/load options

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

code-from-ds.iml

@@ -9,5 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="json-20160810" level="project" />
   </component>
 </module>

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

@@ -0,0 +1,47 @@
+package com.rthoni.intellij.codefromds.business;
+
+import com.intellij.database.psi.DbDataSource;
+import com.rthoni.intellij.codefromds.dbo.GenerateOptions;
+import org.json.JSONObject;
+
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+
+/**
+ * Created by robin on 11/15/16.
+ */
+public abstract class Generator {
+
+    public static void saveOptions(GenerateOptions options) throws Exception {
+        HashMap<String, Object> map = options.toMap();
+        JSONObject obj = new JSONObject(map);
+        FileOutputStream file = new FileOutputStream(options.getConfigPath());
+        file.write(obj.toString(4).getBytes());
+        file.close();
+    }
+
+    public static GenerateOptions loadOptions(String configPath) throws Exception {
+        String data = Files.readAllLines(Paths.get(configPath), StandardCharsets.UTF_8).stream().reduce("", (s1, s2) -> s1 + s2);
+
+        JSONObject obj = new JSONObject(data);
+        String src = obj.getJSONObject("selection").getString("source");
+
+        DbDataSource dataSource = Helper.findDataSource(src);
+        if (dataSource == null) {
+            throw new Exception("Data source " + src + " not found");
+        }
+
+        GenerateOptions options = new GenerateOptions(dataSource);
+        options.setConfigPath(configPath);
+        options.fromJson(obj);
+        return options;
+    }
+
+    public static void generate(GenerateOptions options)
+    {
+
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.rthoni.intellij.codefromds.business;
+
+import com.intellij.database.psi.DbDataSource;
+import com.intellij.database.psi.DbPsiFacade;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.rthoni.intellij.codefromds.dbo.TableSelection;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Created by robin on 11/15/16.
+ */
+public abstract class Helper {
+
+    public static List<DbDataSource> getDataSources()
+    {
+        ProjectManager pm = ProjectManager.getInstance();
+        Project[] projects = pm.getOpenProjects();
+        return Arrays.stream(projects).map(project -> DbPsiFacade.getInstance(project).getDataSources())
+                .flatMap(Collection::stream).collect(Collectors.toList());
+    }
+
+    public static DbDataSource findDataSource(String name)
+    {
+        Optional<DbDataSource> opt = getDataSources().stream().filter(d -> d.getName().equals(name)).findFirst();
+        if (opt.isPresent()) {
+            return opt.get();
+        }
+        return null;
+    }
+
+    public static JSONObject findTableInJson(JSONArray tables, String name)
+    {
+        for (int i = 0; i < tables.length(); ++i) {
+            if (tables.getJSONObject(i).getString("table").equals(name)) {
+                return tables.getJSONObject(i);
+            }
+        }
+        return null;
+    }
+
+    public static JSONObject findColumnInJson(JSONArray tables, String name)
+    {
+        for (int i = 0; i < tables.length(); ++i) {
+            if (tables.getJSONObject(i).getString("column").equals(name)) {
+                return tables.getJSONObject(i);
+            }
+        }
+        return null;
+    }
+}

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

@@ -1,6 +1,9 @@
 package com.rthoni.intellij.codefromds.dbo;
 
 import com.intellij.database.model.DasColumn;
+import org.json.JSONObject;
+
+import java.util.HashMap;
 
 /**
  * Created by robin on 11/15/16.
@@ -20,6 +23,21 @@ public class ColumnSelection {
 
     private boolean _selected;
 
+    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;
     }

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

@@ -3,7 +3,11 @@ 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 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;
@@ -13,9 +17,6 @@ import java.util.stream.Collectors;
  */
 public class DataSourceSelection {
 
-    public DataSourceSelection() {
-    }
-
     public DataSourceSelection(DbDataSource source) {
         _source = source;
         final List<? extends DasTable> tables = DasUtil.getTables(source).toList();
@@ -32,6 +33,35 @@ public class DataSourceSelection {
 
     private List<TableSelection> _tables;
 
+    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);
+
+        return map;
+    }
+
+    public void fromJson(JSONObject json)
+    {
+        JSONArray array = json.getJSONArray("tables");
+        for (TableSelection table : _tables) {
+            JSONObject obj = Helper.findTableInJson(array, table.getTable().getName());
+            if (obj != null) {
+                table.fromJson(obj);
+            } else {
+                for (ColumnSelection column : table.getColumns()) {
+                    column.setSelected(false);
+                }
+            }
+        }
+    }
+
     public DbDataSource getSource() {
         return _source;
     }

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

@@ -3,8 +3,10 @@ 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 org.json.JSONObject;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
 import java.util.stream.Collectors;
@@ -14,9 +16,6 @@ import java.util.stream.Collectors;
  */
 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";
@@ -50,6 +49,26 @@ public class GenerateOptions {
 
     private String _configPath;
 
+    public HashMap<String, Object> toMap()
+    {
+        HashMap<String, Object> map = new HashMap<>();
+
+        map.put("modelsPath", _modelsPath);
+        map.put("dataSourceTemplatePath", _dataSourceTemplatePath);
+        map.put("modelsTemplatePath", _modelsTemplatePath);
+        map.put("selection", _selection == null ? null : new JSONObject(_selection.toMap()));
+
+        return map;
+    }
+
+    public void fromJson(JSONObject json)
+    {
+        _modelsPath = json.getString("modelsPath");
+        _dataSourceTemplatePath = json.getString("dataSourceTemplatePath");
+        _modelsTemplatePath = json.getString("modelsTemplatePath");
+        _selection.fromJson(json.getJSONObject("selection"));
+    }
+
     public DataSourceSelection getSelection() {
         return _selection;
     }

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

@@ -1,8 +1,13 @@
 package com.rthoni.intellij.codefromds.dbo;
 
 import com.intellij.database.model.DasTable;
+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;
 
 /**
  * Created by robin on 11/15/16.
@@ -13,6 +18,33 @@ public class TableSelection {
 
     private List<ColumnSelection> _columns;
 
+    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.findColumnInJson(array, column.getColumn().getName());
+            if (obj != null) {
+                column.fromJson(obj);
+            } else {
+                column.setSelected(false);
+            }
+        }
+    }
+
     public DasTable getTable() {
         return _table;
     }

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

@@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.rthoni.intellij.codefromds.business.Generator;
 import com.rthoni.intellij.codefromds.dbo.GenerateOptions;
 import com.rthoni.intellij.codefromds.ui.dialogs.GenerateDialog;
 
@@ -21,13 +22,27 @@ public class GenerateAction extends AnAction {
     @Override
     public void actionPerformed(AnActionEvent e) {
         GenerateDialog dlg = new GenerateDialog(null);
+        if (!e.getPlace().equals("MainMenu")) {
+            final VirtualFile file = CommonDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
+            if (file != null) {
+                try {
+                    GenerateOptions options = Generator.loadOptions(file.getPath());
+                    dlg.setOptions(options);
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
         dlg.show();
         int res = dlg.getExitCode();
         if (res == DialogWrapper.OK_EXIT_CODE) {
             GenerateOptions options = dlg.getOptions();
-            dlg = new GenerateDialog(null);
-            dlg.setOptions(options);
-            dlg.show();
+            try {
+                Generator.saveOptions(options);
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+            Generator.generate(options);
         }
     }
 

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

@@ -15,6 +15,7 @@ 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.Helper;
 import com.rthoni.intellij.codefromds.dbo.ColumnSelection;
 import com.rthoni.intellij.codefromds.dbo.DataSourceSelection;
 import com.rthoni.intellij.codefromds.dbo.GenerateOptions;
@@ -32,6 +33,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -53,7 +55,7 @@ public class GenerateDialog extends DialogWrapper {
     public GenerateDialog(@Nullable Project project) {
         super(project);
         setTitle("Code FROM data source");
-        showSource(null);
+        setOptions(null);
         init();
     }
 
@@ -65,11 +67,6 @@ public class GenerateDialog extends DialogWrapper {
         _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());
@@ -77,10 +74,6 @@ public class GenerateDialog extends DialogWrapper {
         }
         else {
             showSource(null);
-            setupTextField(_textModels, null);
-            setupTextField(_textDataSOurceTemplate, null);
-            setupTextField(_textModelsTemplate, null);
-            setupTextField(_textConfigPath, null);
             _textModels.setText("");
             _textDataSOurceTemplate.setText("");
             _textModelsTemplate.setText("");
@@ -93,11 +86,24 @@ public class GenerateDialog extends DialogWrapper {
     protected ValidationInfo doValidate() {
         ValidationInfo info = null;
         File modelDir = _options == null ? null : new File(_options.getModelsPath());
+        File dataSourceTemplatePath = _options == null ? null : new File(_options.getDataSourceTemplatePath());
+        File modelsTemplatePath = _options == null ? null : new File(_options.getModelsTemplatePath());
+        File configPath = _options == null ? null : new File(_options.getConfigPath());
+        File configDir = _options == null ? null : new File(configPath.getParent());
         if (_options == null) {
             info = new ValidationInfo("No Data Source Selected", _listDatasources);
         }
         else if (!modelDir.exists() || !modelDir.isDirectory()) {
-            info = new ValidationInfo("Bad Model Folder", _textModels.getTextField());
+            info = new ValidationInfo("Models folder does not exists", _textModels.getTextField());
+        }
+        else if (!dataSourceTemplatePath.exists() || !dataSourceTemplatePath.isFile()) {
+            info = new ValidationInfo("Data source template file does not exists", _textDataSOurceTemplate.getTextField());
+        }
+        else if (!modelsTemplatePath.exists() || !modelsTemplatePath.isFile()) {
+            info = new ValidationInfo("Models template file does not exists", _textModelsTemplate.getTextField());
+        }
+        else if (!configDir.exists() || !configDir.isDirectory()) {
+            info = new ValidationInfo("Configuration file parent folder does not exists", _textConfigPath.getTextField());
         }
 
         return info;
@@ -106,10 +112,8 @@ public class GenerateDialog extends DialogWrapper {
     @Nullable
     @Override
     protected JComponent createCenterPanel() {
-        ProjectManager pm = ProjectManager.getInstance();
-        Project[] projects = pm.getOpenProjects();
 
-        List<DbDataSource> dataSources = Arrays.stream(projects).map(project -> DbPsiFacade.getInstance(project).getDataSources()).flatMap(Collection::stream).collect(Collectors.toList());
+        List<DbDataSource> dataSources = Helper.getDataSources();
 
         _listDatasources.setListData(dataSources.stream().map(DasObject::getName).toArray(String[]::new));
         _listDatasources.addListSelectionListener(e -> {
@@ -134,26 +138,16 @@ public class GenerateDialog extends DialogWrapper {
                 }
             }
         });
-        _textModels.getTextField().getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(DocumentEvent e) {
-                changed();
-            }
-
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                changed();
-            }
 
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-                changed();
-            }
+        setupTextField(_textModels, null, true);
+        setupTextField(_textDataSOurceTemplate, null, false);
+        setupTextField(_textModelsTemplate, null, false);
+        setupTextField(_textConfigPath, null, false);
 
-            public void changed() {
-                _options.setModelsPath(_textModels.getText());
-            }
-        });
+        setupTextFieldListener(_textModels.getTextField(), s -> _options.setModelsPath(s));
+        setupTextFieldListener(_textDataSOurceTemplate.getTextField(), s -> _options.setDataSourceTemplatePath(s));
+        setupTextFieldListener(_textModelsTemplate.getTextField(), s -> _options.setModelsTemplatePath(s));
+        setupTextFieldListener(_textConfigPath.getTextField(), s -> _options.setConfigPath(s));
 
         _listTables.setCellRenderer(new ColoredListCellRenderer() {
             @Override
@@ -179,13 +173,37 @@ public class GenerateDialog extends DialogWrapper {
         return _panel;
     }
 
-    private void setupTextField(TextFieldWithBrowseButton field, Project project)
+    private void setupTextFieldListener(JTextField field, Consumer<String> consumer)
+    {
+        field.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void removeUpdate(DocumentEvent e) {
+                changed();
+            }
+
+            @Override
+            public void changedUpdate(DocumentEvent e) {
+                changed();
+            }
+
+            public void changed() {
+                consumer.accept(field.getText());
+            }
+        });
+    }
+
+    private void setupTextField(TextFieldWithBrowseButton field, Project project, boolean dirsOnly)
     {
         for (ActionListener l : field.getButton().getActionListeners()) {
             field.getButton().removeActionListener(l);
         }
-        field.addBrowseFolderListener("Choose Models Destination Folder", "Choose folder",
-                project, FileChooserDescriptorFactory.createSingleFolderDescriptor());
+        field.addBrowseFolderListener("Choose Models Destination Folder", "Choose folder", project,
+                dirsOnly ? FileChooserDescriptorFactory.createSingleFolderDescriptor() : FileChooserDescriptorFactory.createSingleFileDescriptor());
     }
 
     private void showSource(DataSourceSelection source)