# IGNITE-411 Minor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ccf6562 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ccf6562 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ccf6562 Branch: refs/heads/ignite-45 Commit: 3ccf65621308a749499925228864a94ecba0cd92 Parents: 7096ca9 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Mar 13 17:13:52 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Mar 13 17:13:52 2015 +0700 ---------------------------------------------------------------------- bin/ignite-schema-import.sh | 9 +++++++++ .../main/java/org/apache/ignite/schema/ui/MessageBox.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ccf6562/bin/ignite-schema-import.sh ---------------------------------------------------------------------- diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh index b4a062c..f145f02 100644 --- a/bin/ignite-schema-import.sh +++ b/bin/ignite-schema-import.sh @@ -29,6 +29,13 @@ if [ "${IGNITE_HOME}" = "" ]; fi # +# Set SCRIPTS_HOME - base path to scripts. +# +SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin" + +source "${SCRIPTS_HOME}"/include/functions.sh + +# # Discover path to Java executable and check it's version. # checkJava @@ -41,6 +48,8 @@ setIgniteHome # # Set CLASS PATH. # +. "${SCRIPTS_HOME}"/include/setenv.sh +. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release. CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import/*" # Mac OS specific support to display correct name in the dock. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ccf6562/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java ---------------------------------------------------------------------- diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java index ac26b4b..0cb1e41 100644 --- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java +++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java @@ -124,7 +124,7 @@ public class MessageBox extends ModalDialog { contentPnl.add(ta); // Workaround for vertical scrollbar. - if (msg.split("\r\n|\r|\n").length < 3) + if (msg.split("\r\n|\r|\n").length < 4) showingProperty().addListener(new ChangeListener<Boolean>() { @Override public void changed(ObservableValue<? extends Boolean> val, Boolean oldVal, Boolean newVal) { if (newVal) {
