Repository: cayenne Updated Branches: refs/heads/master 39a1f7e39 -> f41f1e9e6
Missing break + code cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f41f1e9e Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f41f1e9e Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f41f1e9e Branch: refs/heads/master Commit: f41f1e9e67d84a13dc6bc893984ff835b0979e66 Parents: 39a1f7e Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue Dec 11 15:29:38 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue Dec 11 15:29:38 2018 +0300 ---------------------------------------------------------------------- .../cayenne/modeler/editor/ObjRelationshipTableModel.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f41f1e9e/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjRelationshipTableModel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjRelationshipTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjRelationshipTableModel.java index 4eba868..90f5a3e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjRelationshipTableModel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjRelationshipTableModel.java @@ -54,7 +54,7 @@ public class ObjRelationshipTableModel extends CayenneTableModel<ObjRelationship this.entity = entity; // order using local comparator - Collections.sort(objectList, new RelationshipComparator()); + objectList.sort(new RelationshipComparator()); } public ObjEntity getEntity() { @@ -200,6 +200,7 @@ public class ObjRelationshipTableModel extends CayenneTableModel<ObjRelationship case REL_TARGET_PATH: relationship.setDbRelationshipPath((String) value); fireTableCellUpdated(row, column); + break; case REL_COMMENT: setComment((String)value, relationship); fireTableRowsUpdated(row, row); @@ -224,7 +225,7 @@ public class ObjRelationshipTableModel extends CayenneTableModel<ObjRelationship private boolean isInherited(int row) { ObjRelationship relationship = getRelationship(row); - return (relationship != null) ? relationship.getSourceEntity() != entity : false; + return (relationship != null) && relationship.getSourceEntity() != entity; } @Override @@ -263,7 +264,7 @@ public class ObjRelationshipTableModel extends CayenneTableModel<ObjRelationship case REL_SEMANTICS: case REL_DELETE_RULE: case REL_TARGET_PATH: - Collections.sort(objectList, new ObjRelationshipTableComparator(sortCol)); + objectList.sort(new ObjRelationshipTableComparator(sortCol)); if (!isAscent) { Collections.reverse(objectList); } @@ -282,7 +283,7 @@ public class ObjRelationshipTableModel extends CayenneTableModel<ObjRelationship } public int compare(ObjRelationship o1, ObjRelationship o2) { - if ((o1 == null && o2 == null) || o1 == o2) { + if (o1 == o2) { return 0; } else if (o1 == null) { return -1;
