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/10/23 13:03:32 UTC
[1/3] cayenne git commit: CAY-2490 Added db entities from other
datamaps. Added renderer.
Repository: cayenne
Updated Branches:
refs/heads/master 45d522869 -> a620461a4
CAY-2490 Added db entities from other datamaps. Added renderer.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/97e7baad
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/97e7baad
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/97e7baad
Branch: refs/heads/master
Commit: 97e7baadf6f74b3de5b8ef1d057cbc1cbe5d0e90
Parents: 6ff6434
Author: kkomyak <co...@gmail.com>
Authored: Wed Oct 17 13:27:58 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Wed Oct 17 13:45:22 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../dialog/objentity/DbRelationshipTarget.java | 18 +++++++++++++-----
.../objentity/DbRelationshipTargetView.java | 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/97e7baad/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 714a8ff..2ba9595 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -40,6 +40,7 @@ CAY-2472 Clear cached replacement query on mutation in all indirect queries
CAY-2476 Modeller: Fixed wrong behaviour of code generation dialog
CAY-2480 cayenne:cdbgen and cayenne:cgen have identical text in cayenne-maven-plugin
CAY-2484 maven plugins missing in 4.1.M2 release
+CAY-2490 Added dbEntities from other datamaps in dbRelationship dialog.
----------------------------------
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/97e7baad/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTarget.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTarget.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTarget.java
index edf8169..5927e58 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTarget.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTarget.java
@@ -22,12 +22,15 @@ import java.awt.Component;
import java.util.ArrayList;
import java.util.List;
+import javax.swing.DefaultComboBoxModel;
import javax.swing.JOptionPane;
import javax.swing.WindowConstants;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CayenneController;
+import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
public class DbRelationshipTarget extends CayenneController {
@@ -38,7 +41,7 @@ public class DbRelationshipTarget extends CayenneController {
protected List<DbEntity> relTargets;
protected DbEntity source;
- protected ProjectController mediator;
+ protected CayenneController mediator;
protected boolean source1Selected;
protected DbRelationshipTargetView view;
protected boolean toMany;
@@ -54,12 +57,17 @@ public class DbRelationshipTarget extends CayenneController {
this.mediator = mediator;
this.source1 = source1;
this.source2 = source2;
- this.relTargets = new ArrayList<>(source1.getDataMap().getDbEntities());
+
+ EntityResolver resolver = mediator.getEntityResolver();
+ this.relTargets = new ArrayList<>(resolver.getDbEntities());
relTargets.sort(Comparators.getNamedObjectComparator());
+
+ DbEntity[] dbEntities = relTargets.toArray(new DbEntity[0]);
+
+ DefaultComboBoxModel<DbEntity> dbModel = new DefaultComboBoxModel<>(dbEntities);
+ view.targetCombo.setRenderer(CellRenderers.entityListRendererWithIcons(mediator.getCurrentDataMap()));
view.targetCombo.removeAllItems();
- for (DbEntity d : relTargets) {
- view.targetCombo.addItem(d.getName());
- }
+ view.targetCombo.setModel(dbModel);
}
private void initController() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/97e7baad/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
index 68c8c23..209caa0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
@@ -42,7 +42,7 @@ public class DbRelationshipTargetView extends JDialog {
protected JButton cancelButton;
protected JRadioButton source1Button;
protected JRadioButton source2Button;
- protected JComboBox<String> targetCombo;
+ protected JComboBox<DbEntity> targetCombo;
public DbRelationshipTargetView(DbEntity source1, DbEntity source2) {
[2/3] cayenne git commit: CAY-2490 Fixed DbRelationshipTargetView
appearance on OSX.
Posted by nt...@apache.org.
CAY-2490 Fixed DbRelationshipTargetView appearance on OSX.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c6342370
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c6342370
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c6342370
Branch: refs/heads/master
Commit: c6342370cb822aecc45f99efb8ddf25107e4aba4
Parents: 97e7baa
Author: kkomyak <co...@gmail.com>
Authored: Thu Oct 18 10:05:58 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Thu Oct 18 10:05:58 2018 +0300
----------------------------------------------------------------------
.../modeler/dialog/objentity/DbRelationshipTargetView.java | 4 +++-
.../modeler/dialog/objentity/ObjRelationshipInfoView.java | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c6342370/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
index 209caa0..4272085 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
@@ -22,6 +22,7 @@ import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
import org.apache.cayenne.modeler.util.PanelFactory;
import org.apache.cayenne.modeler.util.WidgetFactory;
@@ -45,7 +46,8 @@ public class DbRelationshipTargetView extends JDialog {
protected JComboBox<DbEntity> targetCombo;
public DbRelationshipTargetView(DbEntity source1, DbEntity source2) {
-
+ super(Application.getFrame());
+
widgetFactory = new DefaultWidgetFactory();
// create widgets
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c6342370/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoView.java
index b960f7d..96fb522 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoView.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.modeler.dialog.objentity;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
import org.apache.cayenne.modeler.util.MultiColumnBrowser;
@@ -65,6 +66,7 @@ public class ObjRelationshipInfoView extends JDialog{
ProjectController mediator;
public ObjRelationshipInfoView(final ProjectController mediator) {
+ super(Application.getFrame());
this.mediator = mediator;
[3/3] cayenne git commit: Merge PR #335
Posted by nt...@apache.org.
Merge PR #335
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a620461a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a620461a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a620461a
Branch: refs/heads/master
Commit: a620461a4169e961d558e0bfee3c05967ff4b917
Parents: 45d5228 c634237
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Oct 23 15:59:25 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Oct 23 15:59:25 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../dialog/objentity/DbRelationshipTarget.java | 18 +++++++++++++-----
.../objentity/DbRelationshipTargetView.java | 6 ++++--
.../dialog/objentity/ObjRelationshipInfoView.java | 2 ++
4 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a620461a/RELEASE-NOTES.txt
----------------------------------------------------------------------