# IGNITE-32 WIP: Minor changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b65ff00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b65ff00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b65ff00 Branch: refs/heads/ignite-32 Commit: 9b65ff00a0000fab56e53c8540a27eb21c232807 Parents: 0aba083 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jan 16 06:58:25 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jan 16 06:58:25 2015 +0700 ---------------------------------------------------------------------- .../ignite/schema/pojo/PojoCodeGenerator.java | 19 ++++++++++++ .../org/apache/ignite/schema/ui/MessageBox.java | 5 ++- .../apache/ignite/schema/ui/SchemaLoadApp.java | 32 ++++++++------------ 3 files changed, 36 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b65ff00/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 4ddd4b1..414cb0d 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 @@ -88,6 +88,25 @@ public class PojoCodeGenerator { File pkgFolder, boolean constructor) throws IOException { Collection<String> src = new ArrayList<>(256); + add0(src, "/*"); + add0(src, " * Licensed to the Apache Software Foundation (ASF) under one or more"); + add0(src, " * contributor license agreements. See the NOTICE file distributed with"); + add0(src, " * this work for additional information regarding copyright ownership."); + add0(src, " * The ASF licenses this file to You under the Apache License, Version 2.0"); + add0(src, " * (the \"License\"); you may not use this file except in compliance with"); + add0(src, " * the License. You may obtain a copy of the License at"); + add0(src, " *"); + add0(src, " * http://www.apache.org/licenses/LICENSE-2.0";); + add0(src, " *"); + add0(src, " * Unless required by applicable law or agreed to in writing, software"); + add0(src, " * distributed under the License is distributed on an \"AS IS\" BASIS,"); + add0(src, " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied."); + add0(src, " * See the License for the specific language governing permissions and"); + add0(src, " * limitations under the License."); + add0(src, " */"); + + add0(src, ""); + add0(src, "package " + pkg + ";"); add0(src, ""); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b65ff00/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 c07287e..bdba017 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 @@ -120,7 +120,10 @@ public class MessageBox extends ModalDialog { } })); - setScene(scene(vBox(10, hBox(10, true, imageView(iconFile, 48), text(msg, 350)), btns))); + HBox box = hBox(10, true, imageView(iconFile, 48), text(msg, 350)); + box.setAlignment(Pos.CENTER_LEFT); + + setScene(scene(borderPane(null, box, btns, null, null))); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b65ff00/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 0df408f..e7ffc1a 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 @@ -259,7 +259,7 @@ public class SchemaLoadApp extends Application { prevBtn.setDisable(false); nextBtn.setText("Generate"); - tooltip(nextBtn, "Generate POJO and XML files"); + tooltip(nextBtn, "Generate XML and POJO files"); } /** {@inheritDoc} */ @@ -422,15 +422,13 @@ public class SchemaLoadApp extends Application { * @return Header pane with title label. */ private Pane createHeaderPane() { - HBox hb = hBox(0, true); - titleLb = new Label(""); titleLb.setId("banner"); - hb.getChildren().add(titleLb); - hb.setId("banner"); + BorderPane bp = borderPane(null, hBox(10, true, titleLb), null, null, hBox(0, true, imageView("ignite", 48))); + bp.setId("banner"); - return hb; + return bp; } /** @@ -478,7 +476,7 @@ public class SchemaLoadApp extends Application { prevBtn.setDisable(true); nextBtn.setText("Next"); - tooltip(nextBtn, "Go to \"POJO and XML generation\" page"); + tooltip(nextBtn, "Go to \"XML and POJO generation\" page"); } /** @@ -755,7 +753,7 @@ public class SchemaLoadApp extends Application { genPnl.add(splitPane(tree, borderPane(null, tbl, null, null, vBox(10, upBtn, downBtn)), 0.6), 3); - GridPaneEx keyValPnl = paneEx(0, 0, 0, 0); + final GridPaneEx keyValPnl = paneEx(0, 0, 0, 0); keyValPnl.addColumn(); keyValPnl.addColumn(100, 100, Double.MAX_VALUE, Priority.ALWAYS); keyValPnl.addColumn(); @@ -763,12 +761,10 @@ public class SchemaLoadApp extends Application { keyValPnl.addColumn(); keyClsTf = keyValPnl.addLabeled("Key class:", textField("Key class name")); - keyClsTf.setDisable(true); valClsTf = keyValPnl.addLabeled("Value class:", textField("Value class name")); - valClsTf.setDisable(true); - final Button applyBtn = keyValPnl.add(button("Apply", "Change key and value class names", new EventHandler<ActionEvent>() { + keyValPnl.add(button("Apply", "Change key and value class names", new EventHandler<ActionEvent>() { @Override public void handle(ActionEvent evt) { if (checkInput(keyClsTf, true, "Key class name must not be empty!") || checkInput(valClsTf, true, "Value class name must not be empty!")) @@ -789,6 +785,7 @@ public class SchemaLoadApp extends Application { for (PojoDescriptor pojo : pojos) if (pojo != curPojo) { String pojoKeyCls = pojo.keyClassName(); + String pojoValCls = pojo.valueClassName(); if (keyCls.equals(pojoKeyCls) || keyCls.equals(pojoValCls)) { @@ -812,7 +809,8 @@ public class SchemaLoadApp extends Application { curPojo.valueClassName(valCls); } })); - applyBtn.setDisable(true); + + keyValPnl.setDisable(true); genPnl.add(keyValPnl, 3); @@ -943,12 +941,10 @@ public class SchemaLoadApp extends Application { tbl.getSelectionModel().select(0); keyClsTf.setText(curPojo.keyClassName()); - keyClsTf.setDisable(false); - valClsTf.setText(curPojo.valueClassName()); - valClsTf.setDisable(false); - applyBtn.setDisable(false); + keyValPnl.setDisable(false); + renBtn.setDisable(false); revertBtn.setDisable(false); } @@ -959,10 +955,8 @@ public class SchemaLoadApp extends Application { keyClsTf.setText(""); valClsTf.setText(""); - keyClsTf.setDisable(true); - valClsTf.setDisable(true); + keyValPnl.setDisable(true); - applyBtn.setDisable(true); renBtn.setDisable(true); revertBtn.setDisable(true); upBtn.setDisable(true);
