Repository: cayenne Updated Branches: refs/heads/master adcbf1322 -> feafb1b54
Fix NPE Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/feafb1b5 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/feafb1b5 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/feafb1b5 Branch: refs/heads/master Commit: feafb1b542c87dca1723fd2a05178982c4b02ba5 Parents: adcbf13 Author: Nikita Timofeev <[email protected]> Authored: Wed Sep 19 14:13:59 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Wed Sep 19 14:13:59 2018 +0300 ---------------------------------------------------------------------- .../modeler/dialog/objentity/ObjAttributeInfoDialog.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/feafb1b5/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 c63fafc..46ff9b0 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 @@ -61,6 +61,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; public class ObjAttributeInfoDialog extends CayenneController implements TreeSelectionListener { @@ -411,9 +412,10 @@ public class ObjAttributeInfoDialog extends CayenneController implements TreeSel boolean isOverrideTableChange = ((OverrideEmbeddableAttributeTableModel) view.getOverrideAttributeTable() .getModel()).isAttributeOverrideChange(); - return isOverrideTableChange || !attribute.getName().equals(view.getAttributeName().getText()) - || (attribute.getType() == null && view.getTypeComboBox().getSelectedItem().toString() != null) - || !attribute.getType().equals(view.getTypeComboBox().getSelectedItem().toString()); + return isOverrideTableChange + || !attribute.getName().equals(view.getAttributeName().getText()) + || (attribute.getType() == null && view.getTypeComboBox().getSelectedItem() != null) + || !Objects.equals(attribute.getType(), view.getTypeComboBox().getSelectedItem()); } public void saveMapping() {
