Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A0CCB18681 for ; Thu, 25 Jun 2015 08:41:43 +0000 (UTC) Received: (qmail 93745 invoked by uid 500); 25 Jun 2015 08:41:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 93716 invoked by uid 500); 25 Jun 2015 08:41:43 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 93707 invoked by uid 99); 25 Jun 2015 08:41:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 08:41:43 +0000 X-ASF-Spam-Status: No, hits=-2001.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 25 Jun 2015 08:39:32 +0000 Received: (qmail 92134 invoked by uid 99); 25 Jun 2015 08:41:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 08:41:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DBF91DFF7C; Thu, 25 Jun 2015 08:41:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 25 Jun 2015 08:41:20 -0000 Message-Id: In-Reply-To: <26fd5ec808b345e79f9424584ba6ee67@git.apache.org> References: <26fd5ec808b345e79f9424584ba6ee67@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-ignite git commit: # IGNITE-843 Bug fix: event list generats incorrectly. (java) X-Virus-Checked: Checked by ClamAV on apache.org # IGNITE-843 Bug fix: event list generats incorrectly. (java) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55330e99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55330e99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55330e99 Branch: refs/heads/ignite-843 Commit: 55330e99144e6aa363729f67f7a3110e34c8278f Parents: fc16dea Author: sevdokimov Authored: Thu Jun 25 11:38:51 2015 +0300 Committer: sevdokimov Committed: Thu Jun 25 11:38:51 2015 +0300 ---------------------------------------------------------------------- modules/webconfig/nodejs/utils/generatorJava.js | 35 +++++++++++++++++++- modules/webconfig/nodejs/utils/generatorXml.js | 3 ++ 2 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55330e99/modules/webconfig/nodejs/utils/generatorJava.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js index 1219218..2ba8e02 100644 --- a/modules/webconfig/nodejs/utils/generatorJava.js +++ b/modules/webconfig/nodejs/utils/generatorJava.js @@ -161,7 +161,40 @@ exports.generateClusterConfiguration = function(cluster) { res.needEmptyLine = true; - addMultiparamProperty(res, cluster, 'cfg', 'includeEventTypes', 'EventType'); + if (cluster.includeEventTypes && cluster.includeEventTypes.length > 0) { + res.emptyLineIfNeeded(); + + if (cluster.includeEventTypes.length == 1) { + res.line('cfg.setIncludeEventTypes(EventType.' + cluster.includeEventTypes[0] + ');'); + } + else { + res.append('int[] events = new int[EventType.' + cluster.includeEventTypes[0] + '.length'); + + for (i = 1; i < cluster.includeEventTypes.length; i++) { + res.line(); + + res.append(' + EventType.' + cluster.includeEventTypes[i] + '.length'); + } + + res.line('];'); + res.line(); + res.line('int k = 0;'); + + for (i = 0; i < cluster.includeEventTypes.length; i++) { + res.line(); + + var e = cluster.includeEventTypes[i]; + + res.line('System.arraycopy(EventType.' + e + ', 0, events, k, EventType.' + e + '.length);'); + res.line('k += EventType.' + e + '.length;'); + } + + res.line(); + res.line('cfg.setIncludeEventTypes(events);'); + } + + res.needEmptyLine = true; + } res.needEmptyLine = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55330e99/modules/webconfig/nodejs/utils/generatorXml.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js index db92c5c..6655998 100644 --- a/modules/webconfig/nodejs/utils/generatorXml.js +++ b/modules/webconfig/nodejs/utils/generatorXml.js @@ -156,7 +156,10 @@ exports.generateClusterConfiguration = function(cluster) { } if (cluster.includeEventTypes && cluster.includeEventTypes.length > 0) { + res.emptyLineIfNeeded(); + res.startBlock(''); + if (cluster.includeEventTypes.length == 1) { res.line('') }