cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skolbac...@apache.org
Subject [1/8] cayenne git commit: rename table columns
Date Mon, 07 Dec 2015 15:31:40 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master ee4f50658 -> 9baef19b7


rename table columns


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

Branch: refs/heads/master
Commit: 7bf68c6014ca93043edccadaccf414e357e1af28
Parents: ee4f506
Author: AlexandrShestak <shestakalexandr@mail.ru>
Authored: Tue Nov 24 12:03:11 2015 +0300
Committer: Savva Kolbachev <s.kolbachev@gmail.com>
Committed: Mon Dec 7 13:21:40 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/7bf68c60/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
index 45f9eba..e95e0a6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
@@ -87,9 +87,9 @@ public class DbJoinTableModel extends CayenneTableModel {
 
     public String getColumnName(int column) {
         if (column == SOURCE)
-            return "Source";
+            return relationship.getSourceEntity().getName();
         else if (column == TARGET)
-            return "Target";
+            return relationship.getTargetEntity().getName();
         else
             return "";
     }


Mime
View raw message