ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: GNITE-843 Minor.
Date Wed, 13 Jan 2016 11:03:04 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 b3324fa58 -> 84c5e8f7f


GNITE-843 Minor.


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

Branch: refs/heads/ignite-843-rc2
Commit: 84c5e8f7f88f9c9298b6ffdc8ce0d17f782ca4ed
Parents: b3324fa
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Jan 13 18:03:16 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Jan 13 18:03:16 2016 +0700

----------------------------------------------------------------------
 .../directives/ui-ace-pojos/ui-ace-pojos.controller.js  |  4 +++-
 .../src/main/js/app/modules/JavaTypes/index.js          | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/84c5e8f7/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
index f0d844a..c53f0de 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
@@ -62,7 +62,9 @@ export default ['$scope', 'IgniteUiAceOnLoad', 'JavaTypes', function($scope,
onL
         if (!value || !ctrl.metadatas.length)
             return;
 
-        ctrl.class = ctrl.class || ctrl.metadatas[0].keyType || ctrl.metadatas[0].valueType;
+        const keyType = ctrl.metadatas[0].keyType;
+
+        ctrl.class = ctrl.class || (JavaTypes.isBuildInClass(keyType) ? null : keyType) ||
ctrl.metadatas[0].valueType;
     };
 
     // Update pojos data.

http://git-wip-us.apache.org/repos/asf/ignite/blob/84c5e8f7/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js b/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
index bdaf1f6..5be11bb 100644
--- a/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/JavaTypes/index.js
@@ -19,16 +19,16 @@ import angular from 'angular';
 
 angular
     .module('ignite-console.JavaTypes', [])
-    .provider('JavaTypes', function () {
+    .provider('JavaTypes', function() {
         // Java built-in short class names.
         const _classes = [
             'BigDecimal', 'Boolean', 'Byte', 'Date', 'Double', 'Float', 'Integer', 'Long',
'Short', 'String', 'Time', 'Timestamp', 'UUID'
         ];
 
-        const _types = [
-            'BigDecimal', 'boolean', 'Boolean', 'byte', 'Byte', 'Date', 'double', 'Double',
'float', 'Float',
-            'int', 'Integer', 'long', 'Long', 'short', 'Short', 'String', 'Time', 'Timestamp',
'UUID'
-        ];
+        // TODO use later const _types = [
+        //    'BigDecimal', 'boolean', 'Boolean', 'byte', 'Byte', 'Date', 'double', 'Double',
'float', 'Float',
+        //    'int', 'Integer', 'long', 'Long', 'short', 'Short', 'String', 'Time', 'Timestamp',
'UUID'
+        // ];
 
         // Java built-in full class names.
         const _fullNameClasses = [
@@ -37,7 +37,7 @@ angular
             'java.sql.Time', 'java.sql.Timestamp', 'java.util.UUID'
         ];
 
-        this.$get = [function () {
+        this.$get = [function() {
             return {
                 /**
                  * @param cls Class name to check.


Mime
View raw message