Repository: incubator-ignite Updated Branches: refs/heads/ignite-32 42881f68c -> a22a81e91
# IGNITE-32 WIP: Minor UI tweaks. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a22a81e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a22a81e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a22a81e9 Branch: refs/heads/ignite-32 Commit: a22a81e91a9170e6ae06f044e0c3827195233b0d Parents: 42881f6 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Jan 12 15:47:01 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Jan 12 15:47:01 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java | 4 ++-- .../src/main/java/org/apache/ignite/schema/ui/Controls.java | 6 ++++-- .../main/java/org/apache/ignite/schema/ui/NamingDialog.java | 7 ++++--- .../main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a22a81e9/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java index 0f0e4aa..b1eac78 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java @@ -222,9 +222,9 @@ public class PojoCodeGenerator { add2(src, "return \"" + type + " [\" + "); for (GridCacheQueryTypeDescriptor desc : descs) - add3(src, String.format("\" %1$s=\" + %1$s + ", desc.getJavaName())); + add3(src, String.format("\" %1$s=\" + %1$s +", desc.getJavaName())); - add2(src, "\"]\";"); + add3(src, "\"]\";"); add1(src, "}"); add0(src, "}"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a22a81e9/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java index 2201ee7..2131a8d 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java @@ -174,12 +174,14 @@ public class Controls { /** * Create pane with buttons. * + * @param alignment Alignment of buttons. * @param btns Buttons that will be added to pane. * @return New {@code HBox} instance with buttons. */ - public static Pane buttonsPane(Button... btns) { + public static Pane buttonsPane(Pos alignment, Button... btns) { HBox hb = hBox(10, true, btns); - hb.setAlignment(Pos.BOTTOM_RIGHT); + + hb.setAlignment(alignment); return hb; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a22a81e9/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java index f9d6f36..898ef19 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java @@ -3,6 +3,7 @@ package org.apache.ignite.schema.ui; import javafx.event.*; +import javafx.geometry.*; import javafx.scene.control.*; import javafx.scene.layout.*; import javafx.stage.*; @@ -81,7 +82,7 @@ public class NamingDialog extends Stage { } }); - pane.add(buttonsPane( + Pane btns = buttonsPane(Pos.BOTTOM_CENTER, button("OK", new EventHandler<ActionEvent>() { @Override public void handle(ActionEvent evt) { if (regexCh.isSelected()) { @@ -111,9 +112,9 @@ public class NamingDialog extends Stage { @Override public void handle(ActionEvent evt) { close(); } - })), 2); + })); - setScene(scene(pane)); + setScene(scene(borderPane(null, pane, btns, null, null))); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a22a81e9/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 a1f7ada..55a5eb3 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 @@ -486,7 +486,7 @@ public class SchemaLoadApp extends Application { } }); - return buttonsPane(prevBtn, nextBtn); + return buttonsPane(Pos.BOTTOM_RIGHT, prevBtn, nextBtn); } /** @@ -633,9 +633,9 @@ public class SchemaLoadApp extends Application { keyCol.setEditable(true); - TableColumn<Field, String> dbNameCol = tableColumn("DB Name", "dbName", "Field name in database" , 100, 0); + TableColumn<Field, String> dbNameCol = tableColumn("DB Name", "dbName", "Field name in database", 100, 0); - TableColumn<Field, String> dbTypeNameCol = tableColumn("DB Type", "dbTypeName", "Field type in database" , 100, 0); + TableColumn<Field, String> dbTypeNameCol = tableColumn("DB Type", "dbTypeName", "Field type in database", 100, 0); TableColumn<Field, String> javaNameCol = tableColumn("Ignite Name", "javaName", "Field name in POJO class", 100, 0);
