ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # IGNITE-32: Fixes for GUI.
Date Mon, 26 Jan 2015 03:27:37 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-32 a9500891c -> 87592ecc1


# IGNITE-32: Fixes for GUI.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/87592ecc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/87592ecc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/87592ecc

Branch: refs/heads/ignite-32
Commit: 87592ecc1d2df63198fbd620c159b0f0cddeb567
Parents: a950089
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Jan 26 10:27:36 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Jan 26 10:27:36 2015 +0700

----------------------------------------------------------------------
 .../apache/ignite/schema/model/PojoField.java   |  2 +-
 .../apache/ignite/schema/ui/SchemaLoadApp.java  | 26 +++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87592ecc/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
----------------------------------------------------------------------
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
index 346b1c9..e623286 100644
--- 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 @@ public class PojoField {
         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)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87592ecc/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
----------------------------------------------------------------------
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
index 12a07c8..aa13375 100644
--- 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 @@ public class SchemaLoadApp extends Application {
                 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 @@ public class SchemaLoadApp extends Application {
             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());
+                    }
                 }
             }
         }


Mime
View raw message