Repository: ignite Updated Branches: refs/heads/ignite-843 d4ef7f5a4 -> 27ba64abe
IGNITE-843 WIP preview java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27ba64ab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27ba64ab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27ba64ab Branch: refs/heads/ignite-843 Commit: 27ba64abe1b194be7d4d01e2bc5ef0e1bf1d36af Parents: d4ef7f5 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Aug 26 21:40:37 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Aug 26 21:40:37 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 4 ++-- .../src/main/js/routes/generator/generator-java.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba64ab/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index 134ddd2..b1ce78a 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -283,8 +283,8 @@ controlCenterModule.controller('cachesController', [ $scope.preview.generalJava = $generatorJava.cacheGeneral(val, varName).join(''); $scope.preview.memoryJava = $generatorJava.cacheMemory(val, varName).join(''); - $scope.preview.queryJava = $generatorJava.cacheMetadatas(qryMeta, null, $generatorJava.cacheQuery(val, varName)).join(''); - $scope.preview.storeJava = $generatorJava.cacheMetadatas(null, storeMeta, $generatorJava.cacheStore(val, varName)).join(''); + $scope.preview.queryJava = $generatorJava.cacheMetadatas(qryMeta, null, varName, $generatorJava.cacheQuery(val, varName)).join(''); + $scope.preview.storeJava = $generatorJava.cacheMetadatas(null, storeMeta, varName, $generatorJava.cacheStore(val, varName)).join(''); $scope.preview.concurrencyJava = $generatorJava.cacheConcurrency(val, varName).join(''); $scope.preview.rebalanceJava = $generatorJava.cacheRebalance(val, varName).join(''); $scope.preview.serverNearCacheJava = $generatorJava.cacheServerNearCache(val, varName).join(''); http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba64ab/modules/control-center-web/src/main/js/routes/generator/generator-java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js index e9fc41c..17e5baf 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js @@ -890,7 +890,7 @@ $generatorJava.cacheStore = function (cache, varName, res) { }; // Generate cache type metadata configs. -$generatorJava.cacheMetadatas = function (qryMeta, storeMeta, res) { +$generatorJava.cacheMetadatas = function (qryMeta, storeMeta, varName, res) { if (!res) res = $generatorCommon.builder(); @@ -1019,7 +1019,7 @@ $generatorJava.cache = function(cache, varName, res) { $generatorJava.cacheStatistics(cache, varName, res); - $generatorJava.cacheMetadatas(cache.queryMetadata, cache.storeMetadata, res); + $generatorJava.cacheMetadatas(cache.queryMetadata, cache.storeMetadata, varName, res); }; // Generate cluster caches. @@ -1027,8 +1027,6 @@ $generatorJava.clusterCaches = function (cluster, res) { if (!res) res = $generatorCommon.builder(); - $generatorJava._declareVariable(res, true, varName, 'org.apache.ignite.configuration.CacheConfiguration'); - var caches = cluster.caches; if (caches && caches.length > 0) { @@ -1039,9 +1037,11 @@ $generatorJava.clusterCaches = function (cluster, res) { _.forEach(caches, function (cache) { res.emptyLineIfNeeded(); - var varName = $generatorJava._toJavaName('cache', cache.name); + var cacheName = $generatorJava._toJavaName('cache', cache.name); + + $generatorJava._declareVariable(res, true, cacheName, 'org.apache.ignite.configuration.CacheConfiguration'); - $generatorJava.cache(cache, varName, res); + $generatorJava.cache(cache, cacheName, res); names.push(cacheName);
