You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/09 09:54:10 UTC

[1/2] ignite git commit: IGNITE-843 Added declaration of array variable.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 539f819c3 -> 31abbeb15


IGNITE-843 Added declaration of array variable.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/744ec644
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/744ec644
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/744ec644

Branch: refs/heads/ignite-843-rc2
Commit: 744ec6443167d4b858de066a461ffb274bfad6ab
Parents: da50f0c
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Dec 9 15:54:07 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Dec 9 15:54:07 2015 +0700

----------------------------------------------------------------------
 .../main/js/helpers/generator/generator-java.js | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/744ec644/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 39f9c9e..f5714b4 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
@@ -119,6 +119,27 @@ $generatorJava.declareVariableCustom = function (res, varName, varFullType, varE
 };
 
 /**
+ * Add array variable declaration.
+ *
+ * @param res Resulting output with generated code.
+ * @param varName Variable name.
+ * @param varFullType Variable full class name to be added to imports.
+ * @param length Array length.
+ */
+$generatorJava.declareVariableArray = function (res, varName, varFullType, length) {
+    var varType = res.importClass(varFullType);
+
+    var varNew = !res.vars[varName];
+
+    if (varNew)
+        res.vars[varName] = true;
+
+    res.line((varNew ? (varType + '[] ') : '') + varName + ' = new ' + varType + '[' + length + '];');
+
+    res.needEmptyLine = true;
+};
+
+/**
  * Clear list of declared variables.
  *
  * @param res


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31abbeb1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31abbeb1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31abbeb1

Branch: refs/heads/ignite-843-rc2
Commit: 31abbeb153061b0db8fe139206801acf680a838d
Parents: 744ec64 539f819
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Dec 9 15:54:54 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Dec 9 15:54:54 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/app/data/os.json                |   4 +
 .../app/directives/loading/loading.directive.js |  27 ++
 .../main/js/app/directives/loading/loading.jade |  18 ++
 .../ui-ace-docker/ui-ace-docker.controller.js   |  43 +++
 .../ui-ace-docker/ui-ace-docker.directive.js    |  37 +++
 .../directives/ui-ace-docker/ui-ace-docker.jade |  35 +++
 .../ui-ace-java/ui-ace-java.controller.js       |  58 ++++
 .../ui-ace-java/ui-ace-java.directive.js        |  33 +++
 .../app/directives/ui-ace-java/ui-ace-java.jade |  28 ++
 .../ui-ace-pojos/ui-ace-pojos.controller.js     |  89 ++++++
 .../ui-ace-pojos/ui-ace-pojos.directive.js      |  37 +++
 .../directives/ui-ace-pojos/ui-ace-pojos.jade   |  33 +++
 .../ui-ace-pom/ui-ace-pom.controller.js         |  40 +++
 .../ui-ace-pom/ui-ace-pom.directive.js          |  32 ++
 .../app/directives/ui-ace-pom/ui-ace-pom.jade   |  17 ++
 .../ui-ace-xml/ui-ace-xml.controller.js         |  38 +++
 .../ui-ace-xml/ui-ace-xml.directive.js          |  33 +++
 .../app/directives/ui-ace-xml/ui-ace-xml.jade   |  17 ++
 .../js/app/filters/hasPojo/hasPojo.filter.js    |  26 ++
 .../control-center-web/src/main/js/app/index.js |  37 ++-
 .../app/modules/states/configuration/index.js   |  16 +-
 .../configuration/summary/summary.controller.js | 133 +++++++++
 .../configuration/summary/summary.resource.js   |  41 +++
 .../main/js/app/services/UiAceOnLoad/service.js |  36 +++
 .../control-center-web/src/main/js/config.js    |   1 +
 .../main/js/controllers/summary-controller.js   | 293 -------------------
 .../src/main/js/gulpfile.js/tasks/copy.js       |   4 +-
 .../main/js/helpers/generator/generator-xml.js  |   2 +-
 .../control-center-web/src/main/js/package.json |   1 +
 .../js/views/configuration/summary-tabs.jade    |   2 +-
 .../main/js/views/configuration/summary.jade    | 134 +++------
 31 files changed, 953 insertions(+), 392 deletions(-)
----------------------------------------------------------------------