added scroll for lists; fixed types cast loading

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

@@ -14,7 +14,6 @@ import com.rthoni.intellij.codefromds.dbo.template.ColumnDataSourceDbo;
 import com.rthoni.intellij.codefromds.dbo.template.DataSourceDbo;
 import com.rthoni.intellij.codefromds.dbo.template.ForeignKeyDbo;
 import com.rthoni.intellij.codefromds.dbo.template.TableDataSourceDbo;
-import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
@@ -22,9 +21,6 @@ import org.jtwig.JtwigTemplate;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
@@ -83,15 +79,9 @@ public abstract class Generator {
 
         return dbo;
     }
-
-    public static ColumnDataSourceDbo convertColumn(ColumnSelection columnSelection, TypesCastOptions options)
+    
+    public static String convertSqlType(DataType type, TypesCastOptions options)
     {
-        ColumnDataSourceDbo dbo = new ColumnDataSourceDbo();
-        dbo.setName(columnSelection.getColumn().getName());
-        dbo.setPrimary(DasUtil.isPrimary(columnSelection.getColumn()));
-        dbo.setSelected(columnSelection.isSelected());
-
-        DataType type = columnSelection.getColumn().getDataType();
         boolean isArray = type.typeName.endsWith("[]");
         String sqlTypeName = isArray ? type.typeName.substring(0, type.typeName.length() - 2) : type.typeName;
         String typeName = type.typeName;
@@ -109,7 +99,16 @@ public abstract class Generator {
         if (isArray) {
             typeName = options.getArrayTemplate().replace("%t", typeName);
         }
-        dbo.setType(typeName);
+        return typeName;
+    }
+
+    public static ColumnDataSourceDbo convertColumn(ColumnSelection columnSelection, TypesCastOptions options)
+    {
+        ColumnDataSourceDbo dbo = new ColumnDataSourceDbo();
+        dbo.setName(columnSelection.getColumn().getName());
+        dbo.setPrimary(DasUtil.isPrimary(columnSelection.getColumn()));
+        dbo.setSelected(columnSelection.isSelected());
+        dbo.setType(convertSqlType(columnSelection.getColumn().getDataType(), options));
 
         return dbo;
     }
@@ -156,14 +155,14 @@ public abstract class Generator {
             HashMap<String, String> typeMap = new HashMap<>();
             String type = objTypes.optString(key);
             JSONObject typeObject = objTypes.optJSONObject(key);
-            if (type != null) {
-                typeMap.put("*", type);
-            }
-            else if (typeObject != null) {
+            if (typeObject != null) {
                 for (String subtype : typeObject.keySet()) {
                     typeMap.put(subtype, typeObject.getString(subtype));
                 }
             }
+            else if (type != null) {
+                typeMap.put("*", type);
+            }
             map.put(key, typeMap);
         }
         dbo.setTypes(map);

src/com/rthoni/intellij/codefromds/ui/forms/GenerateForm.form

@@ -149,17 +149,22 @@
         <properties/>
         <border type="none" title="Select Data Source"/>
         <children>
-          <component id="ad455" class="com.intellij.ui.components.JBList" binding="_listDatasources">
+          <scrollpane id="ddb50">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties>
-              <model/>
-              <selectionMode value="0"/>
-            </properties>
-          </component>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="ad455" class="com.intellij.ui.components.JBList" binding="_listDatasources">
+                <constraints/>
+                <properties>
+                  <model/>
+                  <selectionMode value="0"/>
+                </properties>
+              </component>
+            </children>
+          </scrollpane>
         </children>
       </grid>
       <grid id="ae3e9" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -170,16 +175,21 @@
         <properties/>
         <border type="none" title="Select Table"/>
         <children>
-          <component id="81c7e" class="com.intellij.ui.components.JBList" binding="_listTables">
+          <scrollpane id="86ae7">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties>
-              <selectionMode value="0"/>
-            </properties>
-          </component>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="81c7e" class="com.intellij.ui.components.JBList" binding="_listTables">
+                <constraints/>
+                <properties>
+                  <selectionMode value="0"/>
+                </properties>
+              </component>
+            </children>
+          </scrollpane>
         </children>
       </grid>
       <grid id="cab88" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -190,14 +200,19 @@
         <properties/>
         <border type="none" title="Select Columns To Map"/>
         <children>
-          <component id="15ba0" class="com.intellij.ui.components.JBList" binding="_listColumns">
+          <scrollpane id="57c71">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-          </component>
+            <border type="none"/>
+            <children>
+              <component id="15ba0" class="com.intellij.ui.components.JBList" binding="_listColumns">
+                <constraints/>
+                <properties/>
+              </component>
+            </children>
+          </scrollpane>
         </children>
       </grid>
     </children>