This is an automated email from the ASF dual-hosted git repository.
abulatski pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new c016b19 CAY-2550 Modeler: ObjAttribute inspector modifies wrong
columns in attribute table
new 6ddc784 Merge PR #369
c016b19 is described below
commit c016b198ec2565cd74f9bdf75b4b8fba003b0776
Author: Arseni Bulatski <ancars...@gmail.com>
AuthorDate: Thu Mar 7 15:46:33 2019 +0300
CAY-2550 Modeler: ObjAttribute inspector modifies wrong columns in
attribute table
---
RELEASE-NOTES.txt | 7 +++++++
.../dialog/objentity/ObjAttributeInfoDialog.java | 24 +++++++++++-----------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b21ec22..94df294 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -8,6 +8,13 @@ To browse individual bug reports check out project issue
tracker:
https://issues.apache.org/jira/browse/CAY
----------------------------------
+Release: 4.1.B2
+Date:
+----------------------------------
+Bug Fixes:
+CAY-2550 Modeler: ObjAttribute inspector modifies wrong columns in attribute
table
+
+----------------------------------
Release: 4.1.B1
Date: March 7, 2019
----------------------------------
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 71355fb..7c33198 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
@@ -388,7 +388,7 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
attributeSaved.setDbAttributePath(attributePath.toString());
if
(!attribute.getDbAttributePath().equals(attributePath.toString()) && isChange) {
-
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 3);
+
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 2);
}
return true;
}
@@ -398,7 +398,7 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
attributeSaved.setDbAttributePath(attributePath.toString());
if (attributePath.length() == 0) {
-
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 3);
+
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 2);
return false;
}
return true;
@@ -429,14 +429,14 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
if (attribute instanceof EmbeddedAttribute) {
changeAttributeObject();
} else {
-
model.setUpdatedValueAt(attributeSaved.getName(), row, 1);
-
model.setUpdatedValueAt(attributeSaved.getType(), row, 2);
+
model.setUpdatedValueAt(attributeSaved.getName(), row, 0);
+
model.setUpdatedValueAt(attributeSaved.getType(), row, 1);
}
-
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 3);
+
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 2);
} else {
-
model.setUpdatedValueAt(attributeSaved.getName(), row, 1);
-
model.setUpdatedValueAt(attributeSaved.getType(), row, 2);
+
model.setUpdatedValueAt(attributeSaved.getName(), row, 0);
+
model.setUpdatedValueAt(attributeSaved.getType(), row, 1);
}
} else {
if ((attributeSaved instanceof EmbeddedAttribute &&
!(attribute instanceof EmbeddedAttribute))
@@ -450,14 +450,14 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
compareAndSetOverrideInEmbeddedAttribute(attributeSaved, overrides,
currentOverrAttr);
}
-
model.setUpdatedValueAt(attributeSaved.getName(), row, 1);
-
model.setUpdatedValueAt(attributeSaved.getType(), row, 2);
-
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 3);
+
model.setUpdatedValueAt(attributeSaved.getName(), row, 0);
+
model.setUpdatedValueAt(attributeSaved.getType(), row, 1);
+
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 2);
}
if (attributeSaved instanceof EmbeddedAttribute &&
attribute instanceof EmbeddedAttribute) {
-
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 3);
+
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 2);
if
(embeddableModel.isAttributeOverrideChange()) {
Map<String, String> overrides;
overrides = ((EmbeddedAttribute)
attribute).getAttributeOverrides();
@@ -479,7 +479,7 @@ public class ObjAttributeInfoDialog extends
CayenneController implements TreeSel
}
if (attributeSaved instanceof EmbeddedAttribute) {
attributeSaved.setDbAttributePath(null);
-
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 3);
+
model.setUpdatedValueAt(attributeSaved.getDbAttributePath(), row, 2);
}
model.getEntity().removeAttribute(attribute.getName());
