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/08/27 13:35:16 UTC
[1/2] cayenne git commit: CAY-2451 ObjEntity: Edit button doesn't
open editor for Relationship
Repository: cayenne
Updated Branches:
refs/heads/master 762dfa386 -> f048b0e45
CAY-2451 ObjEntity: Edit button doesn't open editor for Relationship
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/59ef22bf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/59ef22bf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/59ef22bf
Branch: refs/heads/master
Commit: 59ef22bf3f7e362b62009d426f5dc54528b42f12
Parents: 36faff5
Author: Arseni Bulatski <an...@gmail.com>
Authored: Wed Aug 22 12:42:30 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Aug 22 12:42:30 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59ef22bf/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..a49923e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2451 ObjEntity: "Edit" button doesn't open editor for Relationship
----------------------------------
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59ef22bf/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
index d9af4ae..b312f87 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java
@@ -41,11 +41,12 @@ import org.apache.cayenne.modeler.util.NameGeneratorPreferences;
import org.apache.cayenne.util.DeleteRuleUpdater;
import org.apache.cayenne.util.Util;
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.WindowConstants;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -701,6 +702,7 @@ public class ObjRelationshipInfo extends CayenneController implements TreeSelect
}
if (getStartEntity() == null) {
+ JOptionPane.showMessageDialog(getView(), "Can't map relationship without source DbEntity. Set source DbEntity.");
throw new CayenneRuntimeException("Can't map relationship without source DbEntity.");
}
}
[2/2] cayenne git commit: CAY-2451 Modeler: ObjEntity "Edit" button
doesn't open editor for Relationship
Posted by nt...@apache.org.
CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f048b0e4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f048b0e4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f048b0e4
Branch: refs/heads/master
Commit: f048b0e459120b93ac693dffc8f38eb15ad1213e
Parents: 762dfa3 59ef22b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 16:34:41 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 16:34:41 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f048b0e4/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index 1b4ecf6,a49923e..f8bb706
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -20,9 -20,7 +20,10 @@@ Bug Fixes
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
-CAY-2451 ObjEntity: "Edit" button doesn't open editor for Relationship
+CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu
++CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship
+CAY-2459 Modeler: DataMap paste function is not working
+CAY-2463 Modeler: DB Schema generation doesn't work
----------------------------------
Release: 4.1.M2