You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/11/05 13:44:01 UTC

cayenne git commit: CAY-2491 cleanup

Repository: cayenne
Updated Branches:
  refs/heads/master c18c0e31f -> 50d04b380


CAY-2491 cleanup


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

Branch: refs/heads/master
Commit: 50d04b380ee73e80d4ccac9a7a443214e7e8e667
Parents: c18c0e3
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Nov 5 16:43:57 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Nov 5 16:43:57 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/50d04b38/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 2bb51b3..141c948 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
@@ -230,7 +230,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 (isTransferable && includeTable.getIncludeColumns().isEmpty() && includeTable.getExcludeColumns().isEmpty()) {
                     printParams(Collections.singletonList(new IncludeColumn("Loading...")), node);
                 }