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/29 11:39:33 UTC
[5/9] cayenne git commit: CAY-2450 Modeler: Impossible to update
Attribute title after syncing ObjEntity
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/9aaad9c2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9aaad9c2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9aaad9c2
Branch: refs/heads/STABLE-4.0
Commit: 9aaad9c21dc5c844e3a33199c79d399abeac062b
Parents: a146cef
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Aug 29 14:15:47 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Aug 29 14:15:47 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/9aaad9c2/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0de5067..be528a3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,6 +15,7 @@ Date:
Bug Fixes:
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 Paste function is not working
CAY-2464 ClassCastException when returning PRUNED_NODE in expression transformer
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9aaad9c2/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 11b4a68..8e4c5f8 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
@@ -354,7 +354,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());
}
@@ -392,7 +394,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());