Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 fa7b0c9cb -> 5200031d2
IGNITE-1867 Fixed pojo. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5200031d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5200031d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5200031d Branch: refs/heads/ignite-843-rc1 Commit: 5200031d2c1d23333e927955ad7486fa0485a121 Parents: fa7b0c9 Author: Andrey <[email protected]> Authored: Wed Nov 11 17:07:34 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Nov 11 17:07:34 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/summary-controller.js | 17 ++++++++--------- .../main/js/helpers/generator/generator-java.js | 20 ++++++++++---------- .../main/js/helpers/generator/generator-xml.js | 2 +- .../main/js/views/configuration/summary.jade | 1 - 4 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5200031d/modules/control-center-web/src/main/js/controllers/summary-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js index 4fa27f5..9bfe3d7 100644 --- a/modules/control-center-web/src/main/js/controllers/summary-controller.js +++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js @@ -45,7 +45,7 @@ consoleModule.controller('summaryController', [ $scope.pojoClasses = function() { var classes = []; - _.forEach($generatorJava.metadatas, function(meta) { + _.forEach($scope.selectedItem.metadatas, function(meta) { classes.push(meta.keyType); classes.push(meta.valueType); }); @@ -96,7 +96,7 @@ consoleModule.controller('summaryController', [ }; function selectPojoClass(config) { - _.forEach($generatorJava.metadatas, function(meta) { + _.forEach($scope.selectedItem.metadatas, function(meta) { if (meta.keyType == config.pojoClass) return config.pojoClassBody = meta.keyClass; @@ -113,12 +113,11 @@ consoleModule.controller('summaryController', [ $scope.updatePojos = function() { if ($common.isDefined($scope.selectedItem)) { - var curServCls = $scope.configServer.pojoClass; - var curCliCls = $scope.configClient.pojoClass; - var metadatas = $generatorJava.pojos($scope.selectedItem.caches, $scope.configServer.useConstructor, $scope.configServer.includeKeyFields); - function restoreSelected(selected, config, tabs) { + $scope.selectedItem.metadatas = metadatas; + + function restoreSelected(selected, config, tabs, metadatas) { if (!$common.isDefined(selected) || _.findIndex(metadatas, function (meta) { return meta.keyType == selected || meta.valueType == selected; }) < 0) { @@ -141,8 +140,8 @@ consoleModule.controller('summaryController', [ selectPojoClass(config); } - restoreSelected(curServCls, $scope.configServer, $scope.tabsServer); - restoreSelected(curCliCls, $scope.configClient, $scope.tabsClient); + restoreSelected($scope.configServer.pojoClass, $scope.configServer, $scope.tabsServer, metadatas); + restoreSelected($scope.configClient.pojoClass, $scope.configClient, $scope.tabsClient, metadatas); } }; @@ -190,7 +189,7 @@ consoleModule.controller('summaryController', [ }; $scope.pojoAvailable = function() { - return $common.isDefined($generatorJava.metadatas) && $generatorJava.metadatas.length > 0; + return $common.isDefined($scope.selectedItem.metadatas) && $scope.selectedItem.metadatas.length > 0; }; $scope.downloadConfiguration = function () { http://git-wip-us.apache.org/repos/asf/ignite/blob/5200031d/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 138aa7b..8e136a7 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 @@ -1328,14 +1328,14 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include if (!key) _.forEach(meta.valueFields, function (valFld) { if (_.findIndex(allFields, function(fld) { - return fld.javaName == valFld.javaName; + return fld.javaFieldName == valFld.javaFieldName; }) < 0) allFields.push(valFld); }); // Generate allFields declaration. _.forEach(allFields, function (field) { - var fldName = field.javaName; + var fldName = field.javaFieldName; res.line('/** Value for ' + fldName + '. */'); @@ -1361,7 +1361,7 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include res.startBlock('public ' + type + '('); _.forEach(allFields, function(field) { - res.line(res.importClass(field.javaType) + ' ' + field.javaName + (fldIx < allFields.length - 1 ? ',' : '')) + res.line(res.importClass(field.javaFieldType) + ' ' + field.javaFieldName + (fldIx < allFields.length - 1 ? ',' : '')) }); res.endBlock(') {'); @@ -1369,7 +1369,7 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include res.startBlock(); _.forEach(allFields, function (field) { - res.line('this.' + field.javaName +' = ' + field.javaName + ';'); + res.line('this.' + field.javaFieldName +' = ' + field.javaFieldName + ';'); }); res.endBlock('}'); @@ -1379,7 +1379,7 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include // Generate getters and setters methods. _.forEach(allFields, function (field) { - var fldName = field.javaName; + var fldName = field.javaFieldName; var fldType = res.importClass(field.javaFieldType); @@ -1425,7 +1425,7 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include _.forEach(allFields, function (field) { res.needEmptyLine = true; - var javaName = field.javaName; + var javaName = field.javaFieldName; res.startBlock('if (' + javaName + ' != null ? !' + javaName + '.equals(that.' + javaName + ') : that.' + javaName + ' != null)'); @@ -1447,7 +1447,7 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include var first = true; _.forEach(allFields, function (field) { - var javaName = field.javaName; + var javaName = field.javaFieldName; if (!first) res.needEmptyLine = true; @@ -1470,14 +1470,14 @@ $generatorJava.javaClassCode = function (meta, key, pkg, useConstructor, include if (allFields.length > 0) { field = allFields[0]; - res.startBlock('return \"' + type + ' [' + field.javaName + '=\" + ' + field.javaName + ' +', type); + res.startBlock('return \"' + type + ' [' + field.javaFieldName + '=\" + ' + field.javaFieldName + ' +', type); for (fldIx = 1; fldIx < allFields.length; fldIx ++) { field = allFields[fldIx]; - var javaName = field.javaName; + var javaName = field.javaFieldName; - res.line('\", ' + javaName + '=\" + ' + field.javaName + ' +'); + res.line('\", ' + javaName + '=\" + ' + field.javaFieldName + ' +'); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/5200031d/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js index 94abf9a..9e55dec 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js @@ -1352,7 +1352,7 @@ $generatorXml.igfsMisc = function(igfs, res) { return res; }; -// Generate cluster config. +// Generate DataSource beans. $generatorXml.generateDataSources = function (datasources, res) { if (!res) res = $generatorCommon.builder(); http://git-wip-us.apache.org/repos/asf/ignite/blob/5200031d/modules/control-center-web/src/main/js/views/configuration/summary.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index a812376..6b3b9a1 100644 --- a/modules/control-center-web/src/main/js/views/configuration/summary.jade +++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade @@ -83,7 +83,6 @@ block content .col-xs-4.col-sm-3.col-md-3 button.select-toggle.form-control(ng-model='configServer.javaClassServer' bs-select bs-options='item.value as item.label for item in javaClassItems' data-sort='false') div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaServer') - +pojos('Server') div(bs-pane title='Dockerfile') .details-row p
