Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 229d170c0 -> 85a47bc8b
IGNITE-2039 minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b521614 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b521614 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b521614 Branch: refs/heads/ignite-843-rc2 Commit: 5b521614b52f1b4ab1010525d0ffb660550ec761 Parents: 17c4423 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Dec 2 17:30:12 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Dec 2 17:30:12 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/helpers/generator/generator-java.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5b521614/modules/control-center-web/src/main/js/helpers/generator/generator-java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js index b22f35d..a592b3f 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js @@ -1976,9 +1976,6 @@ $generatorJava.cluster = function (cluster, pkg, javaClass, clientNearCfg) { $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clientNearCfg) { var res = $generatorCommon.builder(); - res.importClass('org.apache.ignite.Ignite'); - res.importClass('org.apache.ignite.Ignition'); - res.line('/**'); res.line(' * ' + $generatorCommon.mainComment()); res.line(' */'); @@ -1994,7 +1991,9 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien res.startBlock('public static void main(String[] args) throws Exception {'); if (clientNearCfg) { - res.line('Ignite ignite = Ignition.start(' + cfg + ');'); + res.line(res.importClass('org.apache.ignite.Ignite') + ' ignite = ' + + res.importClass('org.apache.ignite.Ignition') + ' Ignition.start(' + cfg + ');'); + res.needEmptyLine = true; if ($commonUtils.isDefinedAndNotEmpty(cluster.caches)) { @@ -2005,8 +2004,12 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien res.needEmptyLine = true; } } - else - res.line('Ignition.start(' + cfg + ');'); + else { + if (factoryCls) + res.importClass(factoryCls); + + res.line(res.importClass('org.apache.ignite.Ignition') + ' Ignition.start(' + cfg + ');'); + } res.endBlock('}');
