ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [26/59] [abbrv] incubator-ignite git commit: # IGNITE-32: WIP GUI: added support and checks for "used" fields.
Date Thu, 05 Feb 2015 13:12:32 GMT
# IGNITE-32: WIP GUI: added support and checks for "used" fields.


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

Branch: refs/heads/ignite-54-55
Commit: fb409b3c902d5f701b1f92808f1bb16b9de6ed18
Parents: 626700e
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Feb 3 18:04:44 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Feb 3 18:04:44 2015 +0700

----------------------------------------------------------------------
 .../java/org/apache/ignite/schema/model/PojoDescriptor.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb409b3c/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
index 2b030ce..9ad36cd 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
@@ -241,7 +241,7 @@ public class PojoDescriptor {
         Collection<PojoField> keys = new ArrayList<>();
 
         for (PojoField field : fields)
-            if (field.key())
+            if (field.use() && field.key() )
                 keys.add(field);
 
         return keys;
@@ -252,13 +252,10 @@ public class PojoDescriptor {
      * @return Collection of value fields.
      */
     public Collection<PojoField> valueFields(boolean includeKeys) {
-        if (includeKeys)
-            return fields;
-
         Collection<PojoField> vals = new ArrayList<>();
 
         for (PojoField field : fields)
-            if (!field.key())
+            if (field.use() && (includeKeys || !field.key()))
                 vals.add(field);
 
         return vals;


Mime
View raw message