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 2016/01/14 09:26:32 UTC
ignite git commit: GNITE-843 Fixed project structure and download -
added filtration by Java built-in types.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 4e11f54f4 -> 978742051
GNITE-843 Fixed project structure and download - added filtration by Java built-in types.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97874205
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97874205
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97874205
Branch: refs/heads/ignite-843-rc2
Commit: 978742051f14b70326856b2e2c92d0fbd5233041
Parents: 4e11f54
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jan 14 15:26:44 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jan 14 15:26:44 2016 +0700
----------------------------------------------------------------------
.../states/configuration/summary/summary.controller.js | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97874205/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index e05da0c..d6e7905 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -18,8 +18,8 @@
import JSZip from 'jszip';
export default [
- '$scope', '$http', '$common', '$loading', '$table', '$filter', 'ConfigurationSummaryResource',
- function($scope, $http, $common, $loading, $table, $filter, Resource) {
+ '$scope', '$http', '$common', '$loading', '$table', '$filter', 'ConfigurationSummaryResource', 'JavaTypes',
+ function($scope, $http, $common, $loading, $table, $filter, Resource, JavaTypes) {
const ctrl = this;
const igniteVersion = '1.5.0.final';
@@ -189,11 +189,10 @@ export default [
_.forEach(cluster.caches, (cache) => {
_.forEach(cache.metadatas, (metadata) => {
if (!$common.isEmptyArray(metadata.keyFields)) {
- const keyType = metadata.keyType;
- const valType = metadata.valueType;
+ if (!JavaTypes.isBuiltInClass(metadata.keyType))
+ addChildren(metadata.keyType);
- addChildren(keyType);
- addChildren(valType);
+ addChildren(metadata.valueType);
}
});
});
@@ -252,7 +251,7 @@ export default [
zip.file('jdbc-drivers/README.txt', $generatorReadme.readmeJdbc().asString());
for (const meta of ctrl.data.metadatas) {
- if (meta.keyClass)
+ if (meta.keyClass && !JavaTypes.isBuiltInClass(meta.keyType))
zip.file(srcPath + meta.keyType.replace(/\./g, '/') + '.java', meta.keyClass);
zip.file(srcPath + meta.valueType.replace(/\./g, '/') + '.java', meta.valueClass);