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 2017/05/11 12:49:16 UTC
[1/4] cayenne git commit: CAY-2291 ObjEntity > ObjRelationship
Inspector > New DbRelationship: Impossible to create 1:1 relationship
Repository: cayenne
Updated Branches:
refs/heads/master e0fe30731 -> 045c96223
CAY-2291 ObjEntity > ObjRelationship Inspector > New DbRelationship: Impossible to create 1:1 relationship
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a1fccd3d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a1fccd3d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a1fccd3d
Branch: refs/heads/master
Commit: a1fccd3d7b88d7517a7df13eb67bfa8c5a65ac71
Parents: 652004e
Author: Anton Dreka <dr...@gmail.com>
Authored: Wed May 10 17:44:20 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Wed May 10 17:44:20 2017 +0300
----------------------------------------------------------------------
.../apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a1fccd3d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java
index 4559ab6..f266db8 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java
@@ -103,7 +103,9 @@ public class DefaultObjectNameGenerator implements ObjectNameGenerator {
List<DbJoin> joins = first.getJoins();
if (joins.isEmpty()) {
- throw new IllegalArgumentException("No joins for relationship. Can't generate a name");
+ // In case, when uses EditRelationship button, relationship doesn't exist => it doesn't have joins
+ // and just return targetName
+ return stemmed(last.getTargetEntityName());
}
DbJoin join1 = joins.get(0);
[2/4] cayenne git commit: CAY-2288 Tools > Migrate Database Schema:
Options: Add any arrow sign to Direction column to make sure it's a dropdown
list
Posted by nt...@apache.org.
CAY-2288 Tools > Migrate Database Schema: Options: Add any arrow sign to Direction column to make sure it's a dropdown list
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/17ec08c6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/17ec08c6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/17ec08c6
Branch: refs/heads/master
Commit: 17ec08c618490964cf89d590f3e30765eb55f454
Parents: 09b0fdb
Author: Anton Dreka <dr...@gmail.com>
Authored: Thu May 11 13:08:25 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Thu May 11 13:08:25 2017 +0300
----------------------------------------------------------------------
.../db/merge/MergerTokenSelectorController.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/17ec08c6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
index 66f7cae..9591910 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
@@ -24,11 +24,13 @@ import org.apache.cayenne.dbsync.merge.token.MergerToken;
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.util.CayenneController;
+import org.apache.cayenne.modeler.util.ModelerUtil;
import org.apache.cayenne.swing.BindingBuilder;
import org.apache.cayenne.swing.ObjectBinding;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
@@ -161,12 +163,24 @@ public class MergerTokenSelectorController extends CayenneController {
view.getTokens().setModel(model);
TableColumnModel columnModel = view.getTokens().getColumnModel();
-
+
// dropdown for direction column
JComboBox directionCombo = Application.getWidgetFactory().createComboBox(dirs, false);
directionCombo.setEditable(false);
TableColumn directionColumn = columnModel.getColumn(
MergerTokenTableModel.COL_DIRECTION);
+
+ directionColumn.setCellRenderer(new DefaultTableCellRenderer() {
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ setHorizontalTextPosition(SwingConstants.LEFT);
+ setIcon(ModelerUtil.buildIcon("icon-arrow-open.png"));
+ return this;
+ }
+ });
+
directionColumn.setCellEditor(new DefaultCellEditor(directionCombo));
columnModel.getColumn(MergerTokenTableModel.COL_SELECT).setPreferredWidth(50);
[3/4] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/210' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/210' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/63419230
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/63419230
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/63419230
Branch: refs/heads/master
Commit: 6341923090c8bfa24428d26332dc84d9bc40eee0
Parents: e0fe307 a1fccd3
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu May 11 15:46:35 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu May 11 15:46:35 2017 +0300
----------------------------------------------------------------------
.../apache/cayenne/dbsync/naming/DefaultObjectNameGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/211' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/211' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/045c9622
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/045c9622
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/045c9622
Branch: refs/heads/master
Commit: 045c96223531da1e816ee54ff1d26c1320ef10df
Parents: 6341923 17ec08c
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu May 11 15:46:54 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu May 11 15:46:54 2017 +0300
----------------------------------------------------------------------
.../db/merge/MergerTokenSelectorController.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------