Context Navigation

Changeset 34822 in osm for applications/editors

Timestamp:

2019-01-13T19:23:48+01:00 (5 years ago)

Author:

gerdp

Message:

revert changes to equals methods made in r34812 (pmd complains about new version, errorprone about the previous, no iea which is better)
fix remaining checkstyle issue

Location:

Files:

r34817	r34822
81	81	List<Command> commands = new ArrayList<>();
82	82	for (Entry<Relation, String> entry : relations.entrySet()) {
83		Relation rel = entry.getKey();
	83	Relation rel = entry.getKey();
84	84	Relation r = new Relation(rel);
85	85	boolean changed = false;

r34812	r34822
80	80	if (this == obj)
81	81	return true;
82		if (!super.equals(obj) \|\| ~~!(obj instanceof ConnectedMatch~~))
	82	if (!super.equals(obj) \|\| getClass() != obj.getClass())
83	83	return false;
84	84	ConnectedMatch other = (ConnectedMatch) obj;

r34812	r34822
62	62	if (this == obj)
63	63	return true;
64		if (!super.equals(obj) \|\| ~~!(obj instanceof InsideMatch~~))
	64	if (!super.equals(obj) \|\| getClass() != obj.getClass())
65	65	return false;
66	66	InsideMatch other = (InsideMatch) obj;

r34812	r34822
70	70	if (this == obj)
71	71	return true;
72		if (!super.equals(obj) \|\| ~~!(obj instanceof IntersectingMatch~~))
	72	if (!super.equals(obj) \|\| getClass() != obj.getClass())
73	73	return false;
74	74	IntersectingMatch other = (IntersectingMatch) obj;

r34812	r34822
54	54	if (this == obj)
55	55	return true;
56		if (~~!(obj instanceof RangeMatch~~))
	56	if (obj == null \|\| getClass() != obj.getClass())
57	57	return false;
58	58	RangeMatch other = (RangeMatch) obj;

Note: See TracChangeset for help on using the changeset viewer.