refactor

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

@@ -32,14 +32,15 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
+ *
  * Created by robin on 11/14/16.
  */
 public class GenerateDialog extends DialogWrapper {
 
     private JPanel _panel;
-    private JBList _listDatasources;
-    private JBList _listTables;
-    private JBList _listColumns;
+    private JBList<String> _listDatasources;
+    private JBList<String> _listTables;
+    private JBList<String> _listColumns;
     private TextFieldWithBrowseButton _textModels;
     private TextFieldWithBrowseButton _textDataSource;
     private TextFieldWithBrowseButton _textDataSourceTemplate;
@@ -52,7 +53,7 @@ public class GenerateDialog extends DialogWrapper {
     private JLabel _lblModelsTemplatePath;
     private TextFieldWithBrowseButton _textCastFile;
     private JLabel _lblCastFile;
-    private JBList _listStoredProcedure;
+    private JBList<String> _listStoredProcedure;
 
     private GenerateOptions _options;
 
@@ -61,7 +62,7 @@ public class GenerateDialog extends DialogWrapper {
     public GenerateDialog(Project project) {
         super(project);
         _project = project;
-        setTitle("Code FROM data source");
+        setTitle("Code FROM Data Source");
         setOptions(null);
         init();
     }
@@ -97,20 +98,20 @@ public class GenerateDialog extends DialogWrapper {
     @Nullable
     @Override
     protected ValidationInfo doValidate() {
-        ValidationInfo info = null;
-        File modelDir = _options == null ? null : new File(Helper.getAbsolutePath(_project, _options.getModelsRelativePath()));
-        File dataSourcePath = _options == null ? null : new File(Helper.getAbsolutePath(_project, _options.getDataSourceRelativePath()));
-        File dataSourceDir = _options == null ? null : new File(dataSourcePath.getParent());
-        File dataSourceTemplatePath = _options == null ? null : new File(Helper.getAbsolutePath(_project, _options.getDataSourceTemplateRelativePath()));
-        File modelsTemplatePath = _options == null ? null : new File(Helper.getAbsolutePath(_project, _options.getModelsTemplateRelativePath()));
-        File configPath = _options == null ? null : new File(_options.getConfigAbsolutePath());
-        File configDir = _options == null ? null : new File(configPath.getParent());
-        String extension = _options == null ? null : _options.getFilesExtension();
-        File castFilePath = _options == null ? null : new File(Helper.getAbsolutePath(_project, _options.getCastFileRelativePath()));
         if (_options == null) {
-            info = new ValidationInfo("No Data Source Selected", _listDatasources);
+            return new ValidationInfo("No Data Source Selected", _listDatasources);
         }
-        else if (!modelDir.exists() || !modelDir.isDirectory()) {
+        ValidationInfo info = null;
+        File modelDir = new File(Helper.getAbsolutePath(_project, _options.getModelsRelativePath()));
+        File dataSourcePath = new File(Helper.getAbsolutePath(_project, _options.getDataSourceRelativePath()));
+        File dataSourceDir = new File(dataSourcePath.getParent());
+        File dataSourceTemplatePath = new File(Helper.getAbsolutePath(_project, _options.getDataSourceTemplateRelativePath()));
+        File modelsTemplatePath = new File(Helper.getAbsolutePath(_project, _options.getModelsTemplateRelativePath()));
+        File configPath = new File(_options.getConfigAbsolutePath());
+        File configDir = new File(configPath.getParent());
+        String extension = _options.getFilesExtension();
+        File castFilePath = new File(Helper.getAbsolutePath(_project, _options.getCastFileRelativePath()));
+        if (!modelDir.exists() || !modelDir.isDirectory()) {
             info = new ValidationInfo("Models folder does not exists", _textModels.getTextField());
         }
         else if (!dataSourceDir.exists() || !dataSourceDir.isDirectory()) {
@@ -169,12 +170,12 @@ public class GenerateDialog extends DialogWrapper {
             }
         });
 
-        setupTextField(_textModels, null, true, "Models");
-        setupTextField(_textDataSource, null, false, "Data Source");
-        setupTextField(_textDataSourceTemplate, null, false, "Data Source Template");
-        setupTextField(_textModelsTemplate, null, false, "Models Template");
-        setupTextField(_textConfigPath, null, false, "Configuration");
-        setupTextField(_textCastFile, null, false, "Types Cast");
+        setupTextField(_textModels, true, "Models");
+        setupTextField(_textDataSource, false, "Data Source");
+        setupTextField(_textDataSourceTemplate, false, "Data Source Template");
+        setupTextField(_textModelsTemplate, false, "Models Template");
+        setupTextField(_textConfigPath, false, "Configuration");
+        setupTextField(_textCastFile, false, "Types Cast");
 
         setupTextFieldListener(_textModels.getTextField(), s -> {
             _options.setModelsRelativePath(Helper.getRelativePath(_project, s));
@@ -200,9 +201,9 @@ public class GenerateDialog extends DialogWrapper {
             _lblCastFile.setText("$ProjectRoot/" + _options.getCastFileRelativePath());
         });
 
-        _listTables.setCellRenderer(new ColoredListCellRenderer() {
+        _listTables.setCellRenderer(new ColoredListCellRenderer<String>() {
             @Override
-            protected void customizeCellRenderer(@NotNull JList jList, Object o, int i, boolean b, boolean b1) {
+            protected void customizeCellRenderer(@NotNull JList jList, String o, int i, boolean b, boolean b1) {
                 TableDataSourceDbo tableSelection = _options.getDataSource().getTables().get(i);
                 if (tableSelection.hasAll()) {
                     setBackground(JBColor.GREEN);
@@ -256,19 +257,19 @@ public class GenerateDialog extends DialogWrapper {
                 changed();
             }
 
-            public void changed() {
+            void changed() {
                 consumer.accept(field.getText());
             }
         });
     }
 
-    private void setupTextField(TextFieldWithBrowseButton field, Project project, boolean dirsOnly, String title)
+    private void setupTextField(TextFieldWithBrowseButton field, boolean dirsOnly, String title)
     {
         for (ActionListener l : field.getButton().getActionListeners()) {
             field.getButton().removeActionListener(l);
         }
         field.addBrowseFolderListener("Choose " + title + " " + (dirsOnly ? "Folder" : "File"),
-                "Choose " + (dirsOnly ? "Folder" : "File"), project,
+                "Choose " + (dirsOnly ? "Folder" : "File"), null,
                 dirsOnly ? FileChooserDescriptorFactory.createSingleFolderDescriptor() : FileChooserDescriptorFactory.createSingleFileDescriptor());
     }
 
@@ -279,7 +280,7 @@ public class GenerateDialog extends DialogWrapper {
         }
         if (source != null) {
 
-            List<String> tables = source.getTables().stream().map(t -> t.getName()).collect(Collectors.toList());
+            List<String> tables = source.getTables().stream().map(TableDataSourceDbo::getName).collect(Collectors.toList());
             _listTables.setListData(tables.toArray(new String[tables.size()]));
             if (tables.size() > 0) {
                 showTable(source.getTables().get(0));
@@ -287,7 +288,7 @@ public class GenerateDialog extends DialogWrapper {
             else {
                 showTable(null);
             }
-            List<String> sps = source.getStoredProcedures().stream().map(t -> t.getFullName()).collect(Collectors.toList());
+            List<String> sps = source.getStoredProcedures().stream().map(StoredProcedureDbo::getFullName).collect(Collectors.toList());
             _listStoredProcedure.setListData(sps.toArray(new String[sps.size()]));
             int[] indices = getSpSelectedIndices(source);
             _listStoredProcedure.setSelectedIndices(indices);
@@ -352,7 +353,7 @@ public class GenerateDialog extends DialogWrapper {
             _listColumns.removeListSelectionListener(e);
         }
         if (table != null) {
-            _listColumns.setListData(table.getColumns().stream().map(c -> c.getName()).toArray(String[]::new));
+            _listColumns.setListData(table.getColumns().stream().map(ColumnDataSourceDbo::getName).toArray(String[]::new));
             int[] indices = getColumnsSelectedIndices(table);
             _listColumns.setSelectedIndices(indices);
             _listColumns.addListSelectionListener(e -> {