cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [05/10] cayenne git commit: Prevent adding 'Loading...' node to target tree in db import.
Date Mon, 05 Nov 2018 13:29:02 GMT
Prevent adding 'Loading...' node to target tree in db import.


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

Branch: refs/heads/master
Commit: aa62c101e7748a2fcd5162c7be1f99fc11ab4e35
Parents: f89836f
Author: kkomyak <const1993@gmail.com>
Authored: Mon Nov 5 12:17:10 2018 +0300
Committer: kkomyak <const1993@gmail.com>
Committed: Mon Nov 5 12:17:10 2018 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa62c101/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
index 6019968..109049f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
@@ -228,7 +228,7 @@ public class DbImportTree extends JTree {
             DbImportTreeNode node = !isTransferable ? new DbImportTreeNode(includeTable)
: new TransferableNode(includeTable);
             if (!node.getSimpleNodeName().equals("")) {
 
-                if (includeTable.getIncludeColumns().isEmpty() || includeTable.getExcludeColumns().isEmpty())
{
+                if (includeTable.getIncludeColumns().isEmpty() && includeTable.getExcludeColumns().isEmpty())
{
                     printParams(Collections.singletonList(new IncludeColumn("Loading...")),
node);
                 }
 


Mime
View raw message