# IGNITE-32: Fixes for GUI.

apache · Jan 26, 2015 · 87592ec · 87592ec
1 parent a950089
commit 87592ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
@@ -110,9 +110,9 @@ private static List<String> classNames(Class<?>... clss) {
         List<String> objects = classNames(Boolean.class, Byte.class, Short.class, Integer.class,
             Long.class, Float.class, Double.class, BigDecimal.class);
 
+        NOT_NULL_NUM_CONVERSIONS.addAll(primitives);
         NOT_NULL_NUM_CONVERSIONS.addAll(objects);
 
-        NULL_NUM_CONVERSIONS.addAll(primitives);
         NULL_NUM_CONVERSIONS.addAll(objects);
 
         for (Class<?> cls : JAVA_TYPES)

diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
@@ -206,23 +206,15 @@ private void fill() {
                 return null;
             }
 
-            private CheckBoxTreeItem<String> addCheckBoxTreeItem(CheckBoxTreeItem<String> parent, String text) {
-                CheckBoxTreeItem<String> item = new CheckBoxTreeItem<>(text);
-
-                item.setSelected(true);
-                item.setExpanded(true);
-
-                parent.getChildren().add(item);
-
-                return item;
-            }
-
             /** {@inheritDoc} */
             @Override protected void succeeded() {
                 super.succeeded();
 
                 pojosTbl.setItems(pojos);
 
+                if (!pojos.isEmpty())
+                    pojosTbl.getSelectionModel().select(pojos.get(0));
+
                 unlockUI(connLayerPnl, connPnl, nextBtn);
 
                 titleLb.setText("Generate XML And POJOs");
@@ -1061,12 +1053,16 @@ private JavaTypeCell() {
             if (!empty) {
                 setText(item);
 
-                PojoField pojo = (PojoField)getTableRow().getItem();
+                TableRow row = getTableRow();
 
-                if (pojo != null) {
-                    comboBox.setItems(pojo.conversions());
+                if (row != null) {
+                    PojoField pojo = (PojoField)row.getItem();
 
-                    comboBox.getSelectionModel().select(pojo.javaTypeName());
+                    if (pojo != null) {
+                        comboBox.setItems(pojo.conversions());
+
+                        comboBox.getSelectionModel().select(pojo.javaTypeName());
+                    }
                 }
             }
         }