Changeset 10662 in josm for trunk/src/org/openstreetmap/josm/data/osm/Way.java
- Timestamp:
- 2016-07-28T01:00:46+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/Way.java
r10656 r10662 9 9 import java.util.List; 10 10 import java.util.Map; 11 import java.util.Objects;12 11 import java.util.Set; 13 12 … … 89 88 for (int i = 0; i < count && count > 2;) { 90 89 Node n = nodes.get(i); 91 if ( Objects.equals(last, n)) {90 if (last == n) { 92 91 nodes.remove(i); 93 92 --count; … … 362 361 boolean locked = writeLock(); 363 362 try { 364 boolean closed = Objects.equals(lastNode(), n) && Objects.equals(firstNode(), n);363 boolean closed = lastNode() == n && firstNode() == n; 365 364 int i; 366 365 List<Node> copy = getNodes(); … … 371 370 if (closed && i > 2) { 372 371 copy.add(copy.get(0)); 373 } else if (i >= 2 && i <= 3 && Objects.equals(copy.get(0), copy.get(i-1))) {372 } else if (i >= 2 && i <= 3 && copy.get(0) == copy.get(i-1)) { 374 373 copy.remove(i-1); 375 374 } … … 402 401 if (closed && i > 2) { 403 402 copy.add(copy.get(0)); 404 } else if (i >= 2 && i <= 3 && Objects.equals(copy.get(0), copy.get(i-1))) {403 } else if (i >= 2 && i <= 3 && copy.get(0) == copy.get(i-1)) { 405 404 copy.remove(i-1); 406 405 } … … 495 494 496 495 Node[] nodes = this.nodes; 497 return nodes.length >= 3 && Objects.equals(nodes[nodes.length-1], nodes[0]);496 return nodes.length >= 3 && nodes[nodes.length-1] == nodes[0]; 498 497 } 499 498 … … 508 507 Node distinctNode = null; 509 508 for (int i = 1; i < nodes.length-1; i++) { 510 if (distinctNode == null && !Objects.equals(nodes[i], nodes[0])) {509 if (distinctNode == null && nodes[i] != nodes[0]) { 511 510 distinctNode = nodes[i]; 512 } else if (distinctNode != null && !Objects.equals(nodes[i], nodes[0]) && !Objects.equals(nodes[i], distinctNode)) {511 } else if (distinctNode != null && nodes[i] != nodes[0] && nodes[i] != distinctNode) { 513 512 return true; 514 513 } … … 551 550 Node[] nodes = this.nodes; 552 551 if (isIncomplete() || nodes.length == 0) return false; 553 return Objects.equals(n, nodes[0]) || Objects.equals(n, nodes[nodes.length -1]);552 return n == nodes[0] || n == nodes[nodes.length -1]; 554 553 } 555 554 … … 564 563 if (isIncomplete() || nodes.length <= 2) return false; 565 564 /* circular ways have only inner nodes, so return true for them! */ 566 if ( Objects.equals(n, nodes[0]) && Objects.equals(n, nodes[nodes.length-1])) return true;565 if (n == nodes[0] && n == nodes[nodes.length-1]) return true; 567 566 for (int i = 1; i < nodes.length - 1; ++i) { 568 if ( Objects.equals(nodes[i], n)) return true;567 if (nodes[i] == n) return true; 569 568 } 570 569 return false;
Note:
See TracChangeset
for help on using the changeset viewer.