Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 62f6bdc83 -> b945d574e
IGNITE-843 Fixed java imports logic. Do not throw error, instead return full name. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b945d574 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b945d574 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b945d574 Branch: refs/heads/ignite-843 Commit: b945d574e191a6b712ad972e305c7338441cc286 Parents: 62f6bdc Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Aug 4 01:10:27 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Aug 4 01:10:27 2015 +0700 ---------------------------------------------------------------------- modules/control-center-web/src/main/js/routes/generator/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b945d574/modules/control-center-web/src/main/js/routes/generator/common.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/common.js b/modules/control-center-web/src/main/js/routes/generator/common.js index 0d2bc82..85b9331 100644 --- a/modules/control-center-web/src/main/js/routes/generator/common.js +++ b/modules/control-center-web/src/main/js/routes/generator/common.js @@ -127,7 +127,7 @@ exports.builder = function () { if (this.imports[shortName]) { if (this.imports[shortName] != fullClassName) - throw "Class name conflict: " + this.imports[shortName] + ' and ' + fullClassName; + return fullClassName; // Short class names conflict. Return full name. } else this.imports[shortName] = fullClassName;
