# IGNITE-411 Fixes for Java 8.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f5944cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f5944cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f5944cc Branch: refs/heads/ignite-45 Commit: 6f5944cca3da334691f84a5a8f40e7194d551beb Parents: d8c0766 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Mar 13 08:08:45 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Mar 13 08:08:45 2015 +0700 ---------------------------------------------------------------------- .../ignite/schema/ui/SchemaImportApp.java | 25 ++++++-------------- 1 file changed, 7 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f5944cc/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java ---------------------------------------------------------------------- diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java index 6d14d31..365ea07 100644 --- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java +++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java @@ -1498,6 +1498,7 @@ public class SchemaImportApp extends Application { super.updateItem(item, empty); setGraphic(null); + setText(null); if (!empty) { setText(item); @@ -1509,7 +1510,6 @@ public class SchemaImportApp extends Application { if (pojo != null) { comboBox.setItems(pojo.conversions()); - comboBox.getSelectionModel().select(pojo.javaTypeName()); } } @@ -1530,30 +1530,24 @@ public class SchemaImportApp extends Application { }; } - /** Previous POJO bound to cell. */ - private PojoDescriptor prevPojo; - /** {@inheritDoc} */ @Override public void updateItem(Boolean item, boolean empty) { super.updateItem(item, empty); + setGraphic(null); + if (!empty) { TableRow row = getTableRow(); if (row != null) { final PojoDescriptor pojo = (PojoDescriptor)row.getItem(); - if (pojo != prevPojo) { - prevPojo = pojo; - + if (pojo != null) { boolean isTbl = pojo.parent() != null; CheckBox ch = new CheckBox(); - ch.setAllowIndeterminate(false); - ch.indeterminateProperty().bindBidirectional(pojo.indeterminate()); - ch.selectedProperty().bindBidirectional(pojo.useProperty()); Label lb = new Label(isTbl ? pojo.table() : pojo.schema()); @@ -1582,28 +1576,23 @@ public class SchemaImportApp extends Application { }; } - /** Previous POJO field bound to cell. */ - private PojoField prevField; - /** {@inheritDoc} */ @Override public void updateItem(Boolean item, boolean empty) { super.updateItem(item, empty); + setGraphic(null); + if (!empty) { TableRow row = getTableRow(); if (row != null) { final PojoField field = (PojoField)row.getItem(); - if (field != prevField) { - prevField = field; - + if (field != null) { setAlignment(Pos.CENTER); CheckBox ch = new CheckBox(); - ch.setDisable(!field.nullable()); - ch.selectedProperty().bindBidirectional(field.useProperty()); setGraphic(ch);
