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:49:04 UTC
[1/2] cayenne git commit: CAY-2450 Impossible to update Attribute
title at the first attempt after syncing ObjEntity with DbEntity
Repository: cayenne
Updated Branches:
refs/heads/master f048b0e45 -> 5a4507ea4
CAY-2450 Impossible to update Attribute title at the first attempt after syncing ObjEntity with DbEntity
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5541c3ed
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5541c3ed
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5541c3ed
Branch: refs/heads/master
Commit: 5541c3eddedd8066783e3eaa3c4ea9c9402f3629
Parents: 36faff5
Author: Arseni Bulatski <an...@gmail.com>
Authored: Wed Aug 22 14:54:41 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Aug 22 14:54:41 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../modeler/dialog/objentity/ObjAttributeInfoDialog.java | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5541c3ed/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..3523d2d 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-2450 Impossible to update Attribute title at the first attempt after syncing ObjEntity with DbEntity
----------------------------------
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5541c3ed/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
index 2bf61cf..44ae3ca 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
@@ -341,7 +341,9 @@ public class ObjAttributeInfoDialog extends CayenneController implements TreeSel
public boolean setPath(boolean isChange) {
if (isChange()) {
- attributeSaved.setType(view.getTypeComboBox().getSelectedItem().toString());
+ if(view.getTypeComboBox().getSelectedItem() != null) {
+ attributeSaved.setType(view.getTypeComboBox().getSelectedItem().toString());
+ }
attributeSaved.setName(view.getAttributeName().getText());
}
@@ -379,7 +381,8 @@ public class ObjAttributeInfoDialog extends CayenneController implements TreeSel
view.getCurrentPathLabel().setText(pathStr.toString());
if (attribute.getDbAttributePath() != null
- && !embeddableNames.contains(view.getTypeComboBox().getSelectedItem().toString())) {
+ && ((view.getTypeComboBox().getSelectedItem() != null && !embeddableNames.contains(view.getTypeComboBox().getSelectedItem().toString()))
+ || view.getTypeComboBox().getSelectedItem() == null)) {
if (!attribute.getDbAttributePath().equals(attributePath.toString())) {
attributeSaved.setDbAttributePath(attributePath.toString());
[2/2] cayenne git commit: CAY-2450 Modeler: Impossible to update
Attribute title after syncing ObjEntity
Posted by nt...@apache.org.
CAY-2450 Modeler: Impossible to update Attribute title after syncing ObjEntity
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5a4507ea
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5a4507ea
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5a4507ea
Branch: refs/heads/master
Commit: 5a4507ea454967a12a9a57bd48cd0160f9584a4d
Parents: f048b0e 5541c3e
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 16:48:51 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 16:48:51 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../modeler/dialog/objentity/ObjAttributeInfoDialog.java | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a4507ea/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index f8bb706,3523d2d..22445e8
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -20,10 -20,7 +20,11 @@@ Bug Fixes
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
-CAY-2450 Impossible to update Attribute title at the first attempt after syncing ObjEntity with DbEntity
+CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu
++CAY-2450 Modeler: Impossible to update Attribute title after syncing ObjEntity
+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