You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/01/12 08:11:43 UTC
incubator-ignite git commit: # IGNITE-32 WIP: Minor UI tweaks.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-32 499f4159d -> 61080bdef
# 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/61080bde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61080bde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61080bde
Branch: refs/heads/ignite-32
Commit: 61080bdef284cad375688a2e7c5a55316e437295
Parents: 499f415
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Jan 12 14:12:07 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jan 12 14:12:07 2015 +0700
----------------------------------------------------------------------
.../main/java/org/apache/ignite/schema/ui/Controls.java | 11 +++++++++--
.../java/org/apache/ignite/schema/ui/SchemaLoadApp.java | 10 +++++++---
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61080bde/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 4d51bdf..2201ee7 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
@@ -272,12 +272,19 @@ public class Controls {
*
* @param colName Column name to display.
* @param propName Property name column is bound to.
+ * @param tip Column tooltip text.
* @param minWidth The minimum width column is permitted to be resized to.
* @param maxWidth The maximum width column is permitted to be resized to.
* @return New {@code TableColumn} instance.
*/
- public static <S, T> TableColumn<S, T> tableColumn(String colName, String propName, int minWidth, int maxWidth) {
- TableColumn<S, T> col = new TableColumn<>(colName);
+ public static <S, T> TableColumn<S, T> tableColumn(String colName, String propName, String tip,
+ int minWidth, int maxWidth) {
+ TableColumn<S, T> col = new TableColumn<>();
+
+ Label tipLb = new Label(colName);
+ tipLb.setTooltip(new Tooltip(tip));
+
+ col.setGraphic(tipLb);
if (minWidth > 0)
col.setMinWidth(minWidth);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61080bde/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 fd4efcc..54c9238 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
@@ -617,7 +617,8 @@ public class SchemaLoadApp extends Application {
genPnl.addRow(100, 100, Double.MAX_VALUE, Priority.ALWAYS);
genPnl.addRows(6);
- TableColumn<Field, Boolean> keyCol = tableColumn("Key", "key", 70, 70);
+ TableColumn<Field, Boolean> keyCol = tableColumn("Key", "key",
+ "If checked then this field will be part of key object", 70, 70);
keyCol.setCellFactory(new Callback<TableColumn<Field, Boolean>, TableCell<Field, Boolean>>() {
/** {@inheritDoc} */
@@ -632,14 +633,16 @@ public class SchemaLoadApp extends Application {
keyCol.setEditable(true);
- TableColumn<Field, String> dbNameCol = tableColumn("DB Name", "dbName", 0, 0);
+ TableColumn<Field, String> dbNameCol = tableColumn("DB Name", "dbName", "Name of field in database" , 100, 0);
- TableColumn<Field, String> javaNameCol = tableColumn("Ignite Name", "javaName", 0, 0);
+ TableColumn<Field, String> javaNameCol = tableColumn("Ignite Name", "javaName",
+ "Name of field in POJO class", 100, 0);
javaNameCol.setCellFactory(TextFieldTableCell.<Field>forTableColumn());
javaNameCol.setEditable(true);
final TableView<Field> tbl = new TableView<>();
+ tbl.setMinHeight(50);
tbl.setPlaceholder(text("Select table to see table columns", 0));
tbl.getColumns().addAll(keyCol, dbNameCol, javaNameCol);
tbl.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
@@ -694,6 +697,7 @@ public class SchemaLoadApp extends Application {
tree = new TreeView<>(rootItem);
+ tree.setMinHeight(50);
tree.setShowRoot(false);
tree.setCellFactory(CheckBoxTreeCell.<String>forTreeView());
tree.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<TreeItem<String>>() {