# IGNITE-32 WIP: UI - minor changes after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d902a9bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d902a9bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d902a9bb Branch: refs/heads/ignite-32 Commit: d902a9bb8284df9f02a220c5cee22423becd3438 Parents: 59c5f6e Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Dec 30 08:06:22 2014 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Dec 30 08:06:22 2014 +0700 ---------------------------------------------------------------------- .../schema-load/src/main/java/media/style.css | 24 ++++++++++++++ .../ignite/schema/db/DbMetadataParser.java | 12 +++---- .../org/apache/ignite/schema/ui/Controls.java | 35 +++++++++++++++++++- .../org/apache/ignite/schema/ui/MessageBox.java | 10 ++---- .../apache/ignite/schema/ui/SchemaLoadApp.java | 19 +++++++---- 5 files changed, 79 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d902a9bb/modules/schema-load/src/main/java/media/style.css ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/media/style.css b/modules/schema-load/src/main/java/media/style.css new file mode 100644 index 0000000..9eb0dfb --- /dev/null +++ b/modules/schema-load/src/main/java/media/style.css @@ -0,0 +1,24 @@ +.label { + -fx-font-size: 16; +} + +.check-box { + -fx-font-size: 16; +} + +.text-area { + -fx-font-size: 16; + -fx-strikethrough: true; +} + +.text-field { + -fx-font-size: 16; +} + +.tooltip { + -fx-background-radius: 0 0 0 0; +} + +.page-corner { + -fx-shape: " "; +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d902a9bb/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java index 1d0176c..15f05e9 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java @@ -103,12 +103,12 @@ public class DbMetadataParser { * @param catalog Catalog name. * @param schema Schema name. * @param tbl Table name. - * @param separate If {@code true} separate key fields from value fields. + * @param include If {@code true} then include key fields into value fields. * @return New initialized instance of {@code GridCacheQueryTypeMetadata}. * @throws SQLException If parsing failed. */ private static GridCacheQueryTypeMetadata parse(DatabaseMetaData meta, String catalog, String schema, String tbl, - boolean separate) throws SQLException { + boolean include) throws SQLException { GridCacheQueryTypeMetadata res = new GridCacheQueryTypeMetadata(); res.setSchema(schema); @@ -145,7 +145,7 @@ public class DbMetadataParser { if (pkFlds.contains(dbName)) { keyDescs.add(desc); - if (!separate) + if (include) valDescs.add(desc); } else @@ -191,12 +191,12 @@ public class DbMetadataParser { * Parse database metadata. * * @param conn Connection to database. - * @param separate If {@code true} separate key fields from value fields. + * @param include If {@code true} then include key fields into value fields. * @return Map with schemes and tables metadata. * @throws SQLException If parsing failed. */ public static LinkedHashMap<String, LinkedHashMap<String, GridCacheQueryTypeMetadata>> parse(Connection conn, - boolean separate) throws SQLException { + boolean include) throws SQLException { DatabaseMetaData meta = conn.getMetaData(); LinkedHashMap<String, LinkedHashMap<String, GridCacheQueryTypeMetadata>> res = new LinkedHashMap<>(); @@ -212,7 +212,7 @@ public class DbMetadataParser { while (tbls.next()) { String tbl = tbls.getString(3); - items.put(tbl, parse(meta, catalog, schema, tbl, separate)); + items.put(tbl, parse(meta, catalog, schema, tbl, include)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d902a9bb/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 d1a1cd2..e66606b 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 @@ -11,6 +11,7 @@ package org.apache.ignite.schema.ui; import javafx.event.*; import javafx.geometry.*; +import javafx.scene.*; import javafx.scene.control.*; import javafx.scene.image.*; import javafx.scene.layout.*; @@ -38,6 +39,21 @@ public class Controls { } /** + * Create new {@code HBox} with default padding and add controls. + * + * @param spacing Amount of horizontal space between each child. + * @param controls Controls to add. + * @return New {@code HBox} instance. + */ + public static HBox hBox(int spacing, Node... controls) { + HBox hb = hBox(spacing); + + hb.getChildren().addAll(controls); + + return hb; + } + + /** * Create new {@code VBox} with default padding. * * @param spacing Amount of horizontal space between each child. @@ -52,6 +68,21 @@ public class Controls { } /** + * Create new {@code VBox} with default padding and add controls. + * + * @param spacing Amount of horizontal space between each child. + * @param controls Controls to add. + * @return New {@code VBox} instance. + */ + public static VBox vBox(int spacing, Node... controls) { + VBox vb = vBox(spacing); + + vb.getChildren().addAll(controls); + + return vb; + } + + /** * Create button. * * @param text Button text. @@ -70,12 +101,14 @@ public class Controls { * Create checkbox. * * @param text Checkbox text. + * @param tip Tooltip tex. * @param sel Checkbox selected state. * @return New checkbox instance. */ - public static CheckBox checkBox(String text, boolean sel) { + public static CheckBox checkBox(String text, String tip, boolean sel) { CheckBox ch = new CheckBox(text); + ch.setTooltip(new Tooltip(tip)); ch.setSelected(sel); return ch; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d902a9bb/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java index 989f8e3..9a6b7c5 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java @@ -48,10 +48,6 @@ public class MessageBox extends Stage { initOwner(owner); setResizable(false); - VBox vb = vBox(10); - - setScene(new Scene(vb)); - HBox btns = hBox(10); btns.setAlignment(Pos.CENTER); @@ -79,11 +75,9 @@ public class MessageBox extends Stage { } })); - HBox hb = hBox(10); - hb.getChildren().addAll(imageView(iconFile, 48), text(msg, 250)); - - vb.getChildren().addAll(hb, btns); + setScene(new Scene(vBox(10, hBox(10, imageView(iconFile, 48), text(msg, 250)), btns))); } + /** * Show modal dialog. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d902a9bb/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 bff3c85..2122bda 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 @@ -305,8 +305,8 @@ public class SchemaLoadApp extends Application { TableView<String> tbl = new TableView<>(); TableColumn<String, Boolean> keyCol = new TableColumn<>("Key"); - TableColumn<String, String> dbNameCol = new TableColumn<>("Db Name"); - TableColumn<String, String> javaNameCol = new TableColumn<>("Java Name"); + TableColumn<String, String> dbNameCol = new TableColumn<>("DB Name"); + TableColumn<String, String> javaNameCol = new TableColumn<>("Ignite Name"); tbl.getColumns().addAll(keyCol, dbNameCol, javaNameCol); @@ -333,17 +333,24 @@ public class SchemaLoadApp extends Application { } })); - pojoSeparateKeyCh = genPnl.add(checkBox("Separate Key Fields For POJOs", true), 3); + pojoSeparateKeyCh = genPnl.add(checkBox("Include key fields into value POJOs", + "If selected then include key fields into value object", true), 3); - pojoConstructorCh = genPnl.add(checkBox("Generate Constructors For POJOs", false), 3); + pojoConstructorCh = genPnl.add(checkBox("Generate constructors for POJOs", + "If selected then generate empty and full constructors for POJOs", false), 3); - xmlSingleFileCh = genPnl.add(checkBox("Write All Configurations To Single File", true), 3); + xmlSingleFileCh = genPnl.add(checkBox("Write all configurations to a single file", "" + + "If selected then all configuration will be saved into file 'ignite.xml'", true), 3); rootPane.setTop(createHeaderPane()); rootPane.setCenter(connPnl); rootPane.setBottom(createButtonsPane()); - primaryStage.setScene(new Scene(rootPane)); + Scene scene = new Scene(rootPane); + + scene.getStylesheets().add("media/style.css"); + + primaryStage.setScene(scene); int w = 400; primaryStage.setWidth(w);
