fixes

Author: Mighty16

src/com/mighty16/json/resolver/KotlinResolver.java

@@ -82,7 +82,7 @@ public String getModifier(boolean mutable) {
     @Override
     public String getFieldTypeAndValue(FieldModel field) {
         String type = field.optional ? field.type + "?" : field.type;
-        return field.defaultValue != null ? type + " = " + field.defaultValue : type;
+        return (field.defaultValue != null && field.defaultValue.length() > 0) ? type + " = " + field.defaultValue : type;
     }
 
     @Override

src/com/mighty16/json/ui/ModelTableDialog.java

@@ -11,6 +11,7 @@
 import javax.swing.border.EmptyBorder;
 import java.awt.event.*;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 
 public class ModelTableDialog extends JDialog implements ClassesListDelegate.OnClassSelectedListener {
@@ -60,7 +61,7 @@ public ModelTableDialog(List<ClassModel> data, LanguageResolver resolver, ModelT
         classesListDelegate = new ClassesListDelegate(table1, data, classNames, this);
         fieldsTableDelegate = new FieldsTableDelegate(fieldsTable, classNames, resolver);
         fieldsTableDelegate.setClass(data.get(0));
-        claasesListLabel.setBorder(new EmptyBorder(0,0,10,0));
+        claasesListLabel.setBorder(new EmptyBorder(0, 0, 10, 0));
     }
 
     private void init() {
@@ -132,10 +133,16 @@ private void onOK() {
                 if (className != null) {
                     classModel.name = className;
                 }
-                for (FieldModel field : classModel.fields) {
-                    String fieldClassName = classNames.get(field.type);
-                    if (fieldClassName != null) {
-                        field.type = fieldClassName;
+                Iterator<FieldModel> iterator = classModel.fields.iterator();
+                while (iterator.hasNext()) {
+                    FieldModel field = iterator.next();
+                    if (!field.enabled) {
+                        iterator.remove();
+                    } else {
+                        String fieldClassName = classNames.get(field.type);
+                        if (fieldClassName != null) {
+                            field.type = fieldClassName;
+                        }
                     }
                 }
             }